etc/account-server.conf-sample | 10 5 + 5 - 0 !
etc/container-reconciler.conf-sample | 2 1 + 1 - 0 !
etc/container-server.conf-sample | 12 6 + 6 - 0 !
etc/drive-audit.conf-sample | 2 1 + 1 - 0 !
etc/internal-client.conf-sample | 2 1 + 1 - 0 !
etc/object-expirer.conf-sample | 2 1 + 1 - 0 !
etc/object-server.conf-sample | 12 6 + 6 - 0 !
etc/proxy-server.conf-sample | 22 11 + 11 - 0 !
swift/container/sync.py | 2 1 + 1 - 0 !
9 files changed, 33 insertions(+), 33 deletions(-)

 set log_name for swift services in default configs

doc/source/conf.py | 3 1 + 2 - 0 !
1 file changed, 1 insertion(+), 2 deletions(-)

 disable sphinxcontrib.rsvgconverter extension

swift/common/ring/ring.py | 2 1 + 1 - 0 !
test/unit/common/test_manager.py | 6 3 + 3 - 0 !
2 files changed, 4 insertions(+), 4 deletions(-)

 [patch] get unit tests passing on py39
 They finally got rid of Thread.isAlive, having added Thread.is_alive as
 an alias back in 2.6.
 .
 array.tostring is also gone, though I'm not sure why we didn't use
 tofile to begin with.

etc/proxy-server.conf-sample | 8 7 + 1 - 0 !
1 file changed, 7 insertions(+), 1 deletion(-)

 set default workers value
 Since the package switched to uwsgi and now reads this value, it can't be
 left as "auto" an commented out.

swift/common/utils.py | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 fix eventlet monkey patching with python >= 3.7

test/unit/__init__.py | 4 2 + 2 - 0 !
test/unit/cli/test_container_deleter.py | 4 2 + 2 - 0 !
2 files changed, 4 insertions(+), 4 deletions(-)

 fix __exit__ calls
 The context manager protocol requires that __exit__ be called with three
 args: type, value, and traceback. In some places, we didn't include any
 args at all, leading to test failures during clean-up.

swift/common/utils.py | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 turn off logging.logthreads when monkey-patched
 We've seen proxy-servers lock up while trying to log client disconnects.
 The trouble is that we happen to do this while we're *already*
 trying to log *something else*. If the timing works out particularly
 badly, we end up with a double-call to (an eventlet-patched)
 threading.current_thread(), which needs to enumerate all pthreads, which
 uses a non-re-entrant lock in CPython.
 .
 The most expedient solution seems to be disabling logThreads so we never
 call threading.current_thread().

swift/common/middleware/s3api/etree.py | 2 1 + 1 - 0 !
test/functional/s3api/test_xxe_injection.py | 229 229 + 0 - 0 !
test/unit/common/middleware/s3api/test_multi_delete.py | 40 40 + 0 - 0 !
3 files changed, 270 insertions(+), 1 deletion(-)

 cve-2022-47950: s3api: prevent xxe injections
 Previously, clients could use XML external entities (XXEs) to read
 arbitrary files from proxy-servers and inject the content into the
 request. Since many S3 APIs reflect request content back to the user,
 this could be used to extract any secrets that the swift user could
 read, such as tempauth credentials, keymaster secrets, etc.
 .
 Now, disable entity resolution -- any unknown entities will be replaced
 with an empty string. Without resolving the entities, the request is
 still processed.

Bug: #1998625