openstack/swift
Code Issues Proposed changes

Merge "Work with latest eventlet (again)"

Browse Source
This commit is contained in:
Zuul 2024-01-18 19:24:37 +00:00 committed by Gerrit Code Review
commit 03b033f70f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
swift/common/http_protocol.py
View File

@ -30,6 +30,7 @@ else:
class SwiftHttpProtocol(wsgi.HttpProtocol): class SwiftHttpProtocol(wsgi.HttpProtocol):
default_request_version = "HTTP/1.0" default_request_version = "HTTP/1.0"
reject_bad_requests = False
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
# See https://github.com/eventlet/eventlet/pull/590 # See https://github.com/eventlet/eventlet/pull/590

4
test/unit/obj/test_server.py
View File

@ -49,7 +49,7 @@ from test.unit import mocked_http_conn, \
from swift.obj import server as object_server from swift.obj import server as object_server
from swift.obj import updater from swift.obj import updater
from swift.obj import diskfile from swift.obj import diskfile
from swift.common import utils, bufferedhttp from swift.common import utils, bufferedhttp, http_protocol
from swift.common.header_key_dict import HeaderKeyDict from swift.common.header_key_dict import HeaderKeyDict
from swift.common.utils import hash_path, mkdirs, normalize_timestamp, \ from swift.common.utils import hash_path, mkdirs, normalize_timestamp, \
NullLogger, storage_directory, public, replication, encode_timestamps, \ NullLogger, storage_directory, public, replication, encode_timestamps, \
@ -5302,7 +5302,7 @@ class TestObjectController(BaseTestCase):
listener = listen_zero() listener = listen_zero()
port = listener.getsockname()[1] port = listener.getsockname()[1]
killer = spawn(wsgi.server, listener, self.object_controller, killer = spawn(wsgi.server, listener, self.object_controller,
NullLogger()) NullLogger(), protocol=http_protocol.SwiftHttpProtocol)
sock = connect_tcp(('localhost', port)) sock = connect_tcp(('localhost', port))
fd = sock.makefile('rwb') fd = sock.makefile('rwb')
s = 'PUT /sda1/p/a/c/o HTTP/1.1\r\nHost: localhost\r\n' \ s = 'PUT /sda1/p/a/c/o HTTP/1.1\r\nHost: localhost\r\n' \