Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/main' into default-ssl-verify-…
…flags

Signed-off-by: William Woodruff <william@yossarian.net>
  • Loading branch information
woodruffw committed Mar 4, 2024
commit cef69504507c24c54bcfd8afa2941f524b555670
11 changes: 11 additions & 0 deletions Doc/whatsnew/3.13.rst
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,17 @@ Other Language Changes

(Contributed by Victor Stinner in :gh:`114570`.)

* Allow controlling Expat >=2.6.0 reparse deferral (CVE-2023-52425)
by adding five new methods:

* :meth:`xml.etree.ElementTree.XMLParser.flush`
* :meth:`xml.etree.ElementTree.XMLPullParser.flush`
* :meth:`xml.parsers.expat.xmlparser.GetReparseDeferralEnabled`
* :meth:`xml.parsers.expat.xmlparser.SetReparseDeferralEnabled`
* :meth:`!xml.sax.expatreader.ExpatParser.flush`

(Contributed by Sebastian Pipping in :gh:`115623`.)

* The :func:`ssl.create_default_context` API now includes
:data:`ssl.VERIFY_X509_PARTIAL_CHAIN` and :data:`ssl.VERIFY_X509_STRICT`
in its default flags.
Comment thread
gpshead marked this conversation as resolved.
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.