Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tornadoweb/tornado
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: tornadoweb/tornado
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: branch6.4
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 6 files changed
  • 2 contributors

Commits on Nov 22, 2024

  1. httputil: Fix quadratic performance of cookie parsing 

    Maliciously-crafted cookies can cause Tornado to
spend an unreasonable amount of CPU time and block
the event loop.

This change replaces the quadratic algorithm with
a more efficient one. The implementation is copied
from the Python 3.13 standard library (the
previous one was from Python 3.5).

Fixes CVE-2024-52804
See CVE-2024-7592 for a similar vulnerability in cpython.

Thanks to github.com/kexinoh for the report.
    @bdarnell
    bdarnell committed Nov 22, 2024
    3 Configuration menu
    Copy the full SHA
    d5ba4a1 View commit details
    Browse the repository at this point in the history

  2. Fix tests with Twisted 24.7.0 

    `twisted.internet.defer.returnValue` was needed on Python 2, but on
Python 3 a simple `return` statement works fine.  Twisted 24.7.0
deprecated the former, causing
`tornado.test.twisted_test.ConvertDeferredTest.test_success` to fail.
    @cjwatson @bdarnell
    cjwatson authored and bdarnell committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    bc7df6b View commit details
    Browse the repository at this point in the history

  3. Bump version to 6.4.2

    @bdarnell
    bdarnell committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    a5ecfab View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3446 from bdarnell/cookie-quadratic-6.4 

    httputil: Fix quadratic performance of cookie parsing
    @bdarnell
    bdarnell authored Nov 22, 2024
    Configuration menu
    Copy the full SHA
    27b3252 View commit details
    Browse the repository at this point in the history
Loading