diff options
| author | Alistair Coles <alistair.coles@hpe.com> | 2016-06-07 15:11:22 +0100 |
|---|---|---|
| committer | Alistair Coles <alistair.coles@hpe.com> | 2016-06-07 15:11:22 +0100 |
| commit | 73ca61afbe525713606c9d0e4586ed937f5280bc (patch) | |
| tree | fcf09bd34b1bf672e3bc1b6b4513583195d436df | |
| parent | ce0e16bcc56a3123490db9ca2978633815aa51c6 (diff) | |
| download | swift-73ca61afbe525713606c9d0e4586ed937f5280bc.tar.gz | |
crypto - remove unnecessary changes
Removes some changes that are no longer needed but
were left over when other code got removed.
Change-Id: I17bd5e84b750ef2a7318a3fae098a2fabe585329
| -rw-r--r-- | swift/common/constraints.py | 1 | ||||
| -rw-r--r-- | swift/common/wsgi.py | 2 | ||||
| -rw-r--r-- | swift/proxy/controllers/obj.py | 2 | ||||
| -rw-r--r-- | test/unit/common/middleware/helpers.py | 2 |
4 files changed, 2 insertions, 5 deletions
diff --git a/swift/common/constraints.py b/swift/common/constraints.py index a575e5eb2..aa00f930c 100644 --- a/swift/common/constraints.py +++ b/swift/common/constraints.py @@ -38,7 +38,6 @@ CONTAINER_LISTING_LIMIT = 10000 ACCOUNT_LISTING_LIMIT = 10000 MAX_ACCOUNT_NAME_LENGTH = 256 MAX_CONTAINER_NAME_LENGTH = 256 -ETAG_LENGTH = 32 VALID_API_VERSIONS = ["v1", "v1.0"] EXTRA_HEADER_COUNT = 0 diff --git a/swift/common/wsgi.py b/swift/common/wsgi.py index d78dec011..6676d3835 100644 --- a/swift/common/wsgi.py +++ b/swift/common/wsgi.py @@ -1101,7 +1101,7 @@ def make_env(env, method=None, path=None, agent='Swift', query_string=None, 'swift.trans_id', 'swift.authorize_override', 'swift.authorize', 'HTTP_X_USER_ID', 'HTTP_X_PROJECT_ID', 'HTTP_REFERER', 'swift.orig_req_method', 'swift.log_info', - 'swift.infocache', 'swift.metadata.checked'): + 'swift.infocache'): if name in env: newenv[name] = env[name] if method: diff --git a/swift/proxy/controllers/obj.py b/swift/proxy/controllers/obj.py index 2629ff765..6eefa4f25 100644 --- a/swift/proxy/controllers/obj.py +++ b/swift/proxy/controllers/obj.py @@ -1793,7 +1793,7 @@ def trailing_metadata(policy, client_obj_hasher, fragment_archive_index): return { # etag and size values are being added twice here. - # The container update header is used to update the container db + # The container override header is used to update the container db # with these values as they represent the correct etag and size for # the whole object and not just the FA. # The object sysmeta headers will be saved on each FA of the object. diff --git a/test/unit/common/middleware/helpers.py b/test/unit/common/middleware/helpers.py index 5e181ff25..373b3b54d 100644 --- a/test/unit/common/middleware/helpers.py +++ b/test/unit/common/middleware/helpers.py @@ -122,8 +122,6 @@ class FakeSwift(object): env['swift.callback.update_footers'](footers) req_headers.update(footers) etag = md5(input).hexdigest() - req_headers.setdefault('Etag', etag) - req_headers.setdefault('Content-Length', len(input)) headers.setdefault('Etag', etag) headers.setdefault('Content-Length', len(input)) |