swift 2.31.1__py2.py3-none-any.whl → 2.32.1__py2.py3-none-any.whl

swift/locale/zh_CN/LC_MESSAGES/swift.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: swift VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2022-05-27 18:57+0000\n"
+"POT-Creation-Date: 2023-06-27 13:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,40 +21,6 @@ msgstr ""
 "X-Generator: Zanata 4.3.3\n"
 "Language-Team: Chinese (China)\n"
 
-msgid ""
-"\n"
-"user quit"
-msgstr ""
-"\n"
-"用户退出"
-
-#, python-format
-msgid "%(success)s successes, %(failure)s failures"
-msgstr "%(success)s成功，%(failure)s失败"
-
-#, python-format
-msgid "%s already started..."
-msgstr "%s已启动..."
-
-#, python-format
-msgid "%s does not exist"
-msgstr "%s不存在"
-
-#, python-format
-msgid "%s: Connection reset by peer"
-msgstr "%s：已由同级重置连接"
-
-#, python-format
-msgid ""
-"Attempted to replicate %(count)d dbs in %(time).5f seconds (%(rate).5f/s)"
-msgstr "%(time).5f seconds (%(rate).5f/s)尝试复制%(count)d dbs"
-
-msgid "Beginning replication run"
-msgstr "开始运行复制"
-
-msgid "Broker error trying to rollback locked connection"
-msgstr "服务器错误并尝试去回滚已经锁住的链接"
-
 #, python-format
 msgid "Can not access the file %s."
 msgstr "无法访问文件%s"
@@ -63,45 +29,10 @@ msgstr "无法访问文件%s"
 msgid "Can not load profile data from %s."
 msgstr "无法从%s下载分析数据"
 
-msgid "Connection refused"
-msgstr "连接被拒绝"
-
-msgid "Connection timeout"
-msgstr "连接超时"
-
 #, python-format
 msgid "Data download error: %s"
 msgstr "数据下载错误：%s"
 
-msgid "ERROR Failed to get my own IPs?"
-msgstr "错误 无法获得我方IPs?"
-
-#, python-format
-msgid "ERROR Remote drive not mounted %s"
-msgstr "错误 远程驱动器无法挂载 %s"
-
-msgid "ERROR auditing"
-msgstr "错误 审计"
-
-#, python-format
-msgid "ERROR reading HTTP response from %s"
-msgstr "读取HTTP错误 响应来源%s"
-
-#, python-format
-msgid "ERROR reading db %s"
-msgstr "错误 读取db %s"
-
-#, python-format
-msgid "ERROR rsync failed with %(code)s: %(args)s"
-msgstr "错误 rsync失败 %(code)s: %(args)s"
-
-#, python-format
-msgid "ERROR syncing %(file)s with node %(node)s"
-msgstr "错误 同步 %(file)s 和 节点%(node)s"
-
-msgid "ERROR trying to replicate"
-msgstr "尝试复制时发生错误"
-
 msgid "Error listing devices"
 msgstr "设备列表时出现错误"
 
@@ -127,151 +58,29 @@ msgstr "检索recon data时出现错误"
 msgid "Error: An error occurred"
 msgstr "错误：一个错误发生了"
 
-msgid "Error: missing config path argument"
-msgstr "错误：设置路径信息丢失"
-
-#, python-format
-msgid "Error: unable to locate %s"
-msgstr "错误：无法查询到 %s"
-
 #, python-format
 msgid "Following CNAME chain for  %(given_domain)s to %(found_domain)s"
 msgstr "跟随CNAME链从%(given_domain)s到%(found_domain)s"
 
-msgid "Found configs:"
-msgstr "找到配置"
-
-msgid "Host unreachable"
-msgstr "无法连接到主机"
-
-#, python-format
-msgid "Invalid X-Container-Sync-To format %r"
-msgstr "无效的X-Container-Sync-To格式%r"
-
-#, python-format
-msgid "Invalid host %r in X-Container-Sync-To"
-msgstr "X-Container-Sync-To中无效主机%r"
-
-#, python-format
-msgid "Invalid pending entry %(file)s: %(entry)s"
-msgstr "不可用的等待输入%(file)s: %(entry)s"
-
-#, python-format
-msgid ""
-"Invalid scheme %r in X-Container-Sync-To, must be \"//\", \"http\", or "
-"\"https\"."
-msgstr ""
-"在X-Container-Sync-To中%r是无效的方案，须为\"//\", \"http\", or \"https\"。"
-
 #, python-format
 msgid "Mapped %(given_domain)s to %(found_domain)s"
 msgstr "集合%(given_domain)s到%(found_domain)s"
 
-#, python-format
-msgid "No %s running"
-msgstr "无%s账号运行"
-
-#, python-format
-msgid "No permission to signal PID %d"
-msgstr "无权限发送信号PID%d"
-
-#, python-format
-msgid "No policy with index %s"
-msgstr "没有具备索引 %s 的策略"
-
-#, python-format
-msgid "No realm key for %r"
-msgstr "%r权限key不存在"
-
-msgid "Params, queries, and fragments not allowed in X-Container-Sync-To"
-msgstr "在X-Container-Sync-To中，变量，查询和碎片不被允许"
-
-msgid "Path required in X-Container-Sync-To"
-msgstr "在X-Container-Sync-To中路径是必须的"
-
 #, python-format
 msgid "Profiling Error: %s"
 msgstr "分析代码时出现错误：%s"
 
-#, python-format
-msgid "Quarantining DB %s"
-msgstr "隔离DB%s"
-
 #, python-format
 msgid "Ratelimit sleep log: %(sleep)s for %(account)s/%(container)s/%(object)s"
 msgstr "流量控制休眠日志：%(sleep)s for %(account)s/%(container)s/%(object)s"
 
-#, python-format
-msgid "Removed %(remove)d dbs"
-msgstr "删除%(remove)d dbs"
-
-#, python-format
-msgid "Removing pid file %(pid_file)s with wrong pid %(pid)d"
-msgstr "移除 pid 文件 %(pid_file)s 失败，pid %(pid)d 不正确"
-
-#, python-format
-msgid "Removing pid file %s with invalid pid"
-msgstr "正在移除带有无效 pid 的 pid 文件 %s"
-
-#, python-format
-msgid "Removing stale pid file %s"
-msgstr "移除原有pid文件%s"
-
-msgid "Replication run OVER"
-msgstr "复制运行结束"
-
 #, python-format
 msgid "Returning 497 because of blacklisting: %s"
 msgstr "返回497因为黑名单：%s"
 
-#, python-format
-msgid "Running %s once"
-msgstr "运行%s一次"
-
-#, python-format
-msgid "Skipping %s as it is not mounted"
-msgstr "挂载失败 跳过%s"
-
-#, python-format
-msgid "Starting %s"
-msgstr "启动%s"
-
 msgid "The file type are forbidden to access!"
 msgstr "该文件类型被禁止访问！"
 
-msgid "UNCAUGHT EXCEPTION"
-msgstr "未捕获的异常"
-
-#, python-format
-msgid "Unable to locate %s in libc.  Leaving as a no-op."
-msgstr "无法查询到%s 保留为no-op"
-
-#, python-format
-msgid "Unable to locate config for %s"
-msgstr "找不到 %s 的配置"
-
-msgid ""
-"Unable to locate fallocate, posix_fallocate in libc.  Leaving as a no-op."
-msgstr "无法查询到fallocate， posix_fallocate。保存为no-op"
-
-#, python-format
-msgid "Unable to read config from %s"
-msgstr "无法从%s读取设置"
-
-msgid ""
-"WARNING: SSL should only be enabled for testing purposes. Use external SSL "
-"termination for a production deployment."
-msgstr "警告：SSL仅可以做测试使用。产品部署时请使用外连SSL终端"
-
-msgid "WARNING: Unable to modify file descriptor limit.  Running as non-root?"
-msgstr "警告：无法修改文件描述限制。是否按非root运行？"
-
-msgid "WARNING: Unable to modify max process limit.  Running as non-root?"
-msgstr "警告：无法修改最大运行极限，是否按非root运行？"
-
-msgid "WARNING: Unable to modify memory limit.  Running as non-root?"
-msgstr "警告：无法修改内存极限，是否按非root运行？"
-
 msgid "Warning: Cannot ratelimit without a memcached client"
 msgstr "警告：缺失缓存客户端 无法控制流量 "
 

swift/locale/zh_TW/LC_MESSAGES/swift.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: swift VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2022-05-27 18:57+0000\n"
+"POT-Creation-Date: 2023-06-27 13:31+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,40 +20,6 @@ msgstr ""
 "X-Generator: Zanata 4.3.3\n"
 "Language-Team: Chinese (Taiwan)\n"
 
-msgid ""
-"\n"
-"user quit"
-msgstr ""
-"\n"
-"使用者退出"
-
-#, python-format
-msgid "%(success)s successes, %(failure)s failures"
-msgstr "%(success)s 個成功，%(failure)s 個失敗"
-
-#, python-format
-msgid "%s already started..."
-msgstr "%s 已啟動..."
-
-#, python-format
-msgid "%s does not exist"
-msgstr "%s 不存在"
-
-#, python-format
-msgid "%s: Connection reset by peer"
-msgstr "%s：已由對等項目重設連線"
-
-#, python-format
-msgid ""
-"Attempted to replicate %(count)d dbs in %(time).5f seconds (%(rate).5f/s)"
-msgstr "已嘗試在 %(time).5f 秒內抄寫 %(count)d 個資料庫 (%(rate).5f/s)"
-
-msgid "Beginning replication run"
-msgstr "正在開始抄寫執行"
-
-msgid "Broker error trying to rollback locked connection"
-msgstr "嘗試回復已鎖定的連線時發生分配管理系統錯誤"
-
 #, python-format
 msgid "Can not access the file %s."
 msgstr "無法存取檔案 %s。"
@@ -62,45 +28,10 @@ msgstr "無法存取檔案 %s。"
 msgid "Can not load profile data from %s."
 msgstr "無法從 %s 中載入設定檔資料。"
 
-msgid "Connection refused"
-msgstr "連線遭拒"
-
-msgid "Connection timeout"
-msgstr "連線逾時"
-
 #, python-format
 msgid "Data download error: %s"
 msgstr "資料下載錯誤：%s"
 
-msgid "ERROR Failed to get my own IPs?"
-msgstr "錯誤：無法取得我自己的 IP？"
-
-#, python-format
-msgid "ERROR Remote drive not mounted %s"
-msgstr "錯誤：未裝載遠端磁碟機 %s"
-
-msgid "ERROR auditing"
-msgstr "審核時發生錯誤"
-
-#, python-format
-msgid "ERROR reading HTTP response from %s"
-msgstr "從 %s 讀取 HTTP 回應時發生錯誤"
-
-#, python-format
-msgid "ERROR reading db %s"
-msgstr "讀取資料庫 %s 時發生錯誤"
-
-#, python-format
-msgid "ERROR rsync failed with %(code)s: %(args)s"
-msgstr "錯誤：遠端同步失敗，%(code)s：%(args)s"
-
-#, python-format
-msgid "ERROR syncing %(file)s with node %(node)s"
-msgstr "同步 %(file)s 與節點 %(node)s 時發生錯誤"
-
-msgid "ERROR trying to replicate"
-msgstr "嘗試抄寫時發生錯誤"
-
 msgid "Error listing devices"
 msgstr "列出裝置時發生錯誤"
 
@@ -126,152 +57,29 @@ msgstr "擷取 recon 資料時發生錯誤"
 msgid "Error: An error occurred"
 msgstr "錯誤：發生錯誤"
 
-msgid "Error: missing config path argument"
-msgstr "錯誤：遺漏配置路徑引數"
-
-#, python-format
-msgid "Error: unable to locate %s"
-msgstr "錯誤：找不到 %s"
-
 #, python-format
 msgid "Following CNAME chain for  %(given_domain)s to %(found_domain)s"
 msgstr "遵循 %(given_domain)s 到 %(found_domain)s 的 CNAME 鏈"
 
-msgid "Found configs:"
-msgstr "找到配置："
-
-msgid "Host unreachable"
-msgstr "無法抵達主機"
-
-#, python-format
-msgid "Invalid X-Container-Sync-To format %r"
-msgstr "無效的 X-Container-Sync-To 格式 %r"
-
-#, python-format
-msgid "Invalid host %r in X-Container-Sync-To"
-msgstr "X-Container-Sync-To 中的主機 %r 無效"
-
-#, python-format
-msgid "Invalid pending entry %(file)s: %(entry)s"
-msgstr "無效的擱置項目 %(file)s：%(entry)s"
-
-#, python-format
-msgid ""
-"Invalid scheme %r in X-Container-Sync-To, must be \"//\", \"http\", or "
-"\"https\"."
-msgstr ""
-"X-Container-Sync-To 中的架構 %r 無效，必須是 \"//\"、\"http\" 或\"https\"。"
-
 #, python-format
 msgid "Mapped %(given_domain)s to %(found_domain)s"
 msgstr "已將 %(given_domain)s 對映至 %(found_domain)s"
 
-#, python-format
-msgid "No %s running"
-msgstr "沒有 %s 在執行中"
-
-#, python-format
-msgid "No permission to signal PID %d"
-msgstr "沒有信號 PID %d 的許可權"
-
-#, python-format
-msgid "No policy with index %s"
-msgstr "沒有具有索引 %s 的原則"
-
-#, python-format
-msgid "No realm key for %r"
-msgstr "沒有 %r 的範圍金鑰"
-
-msgid "Params, queries, and fragments not allowed in X-Container-Sync-To"
-msgstr "X-Container-Sync-To 中不容許參數、查詢及片段"
-
-msgid "Path required in X-Container-Sync-To"
-msgstr "X-Container-Sync-To 中需要路徑"
-
 #, python-format
 msgid "Profiling Error: %s"
 msgstr "側寫錯誤：%s"
 
-#, python-format
-msgid "Quarantining DB %s"
-msgstr "正在隔離資料庫 %s"
-
 #, python-format
 msgid "Ratelimit sleep log: %(sleep)s for %(account)s/%(container)s/%(object)s"
 msgstr "%(account)s/%(container)s/%(object)s 的 ratelimit 休眠日誌：%(sleep)s"
 
-#, python-format
-msgid "Removed %(remove)d dbs"
-msgstr "已移除 %(remove)d 個資料庫"
-
-#, python-format
-msgid "Removing pid file %(pid_file)s with wrong pid %(pid)d"
-msgstr "正在移除具有錯誤 PID %(pid)d 的 PID 檔 %(pid_file)s"
-
-#, python-format
-msgid "Removing pid file %s with invalid pid"
-msgstr "正在移除具有無效 PID 的 PID 檔 %s"
-
-#, python-format
-msgid "Removing stale pid file %s"
-msgstr "正在移除過時 PID 檔案 %s"
-
-msgid "Replication run OVER"
-msgstr "抄寫執行結束"
-
 #, python-format
 msgid "Returning 497 because of blacklisting: %s"
 msgstr "由於黑名單，正在傳回 497：%s"
 
-#, python-format
-msgid "Running %s once"
-msgstr "正在執行 %s 一次"
-
-#, python-format
-msgid "Skipping %s as it is not mounted"
-msgstr "正在跳過 %s，原因是它未裝載"
-
-#, python-format
-msgid "Starting %s"
-msgstr "正在啟動 %s"
-
 msgid "The file type are forbidden to access!"
 msgstr "此檔案類型禁止存取！"
 
-msgid "UNCAUGHT EXCEPTION"
-msgstr "未捕捉的異常狀況"
-
-#, python-format
-msgid "Unable to locate %s in libc.  Leaving as a no-op."
-msgstr "在 libc 中找不到 %s。保留為 no-op。"
-
-#, python-format
-msgid "Unable to locate config for %s"
-msgstr "找不到 %s 的配置"
-
-msgid ""
-"Unable to locate fallocate, posix_fallocate in libc.  Leaving as a no-op."
-msgstr "在 libc 中找不到 fallocate、posix_fallocate。保留為 no-op。"
-
-#, python-format
-msgid "Unable to read config from %s"
-msgstr "無法從 %s 讀取配置"
-
-msgid ""
-"WARNING: SSL should only be enabled for testing purposes. Use external SSL "
-"termination for a production deployment."
-msgstr ""
-"警告：應該僅啟用 SSL 以用於測試目的。使用外部SSL 終止以進行正式作業部署。"
-
-msgid "WARNING: Unable to modify file descriptor limit.  Running as non-root?"
-msgstr "警告：無法修改檔案描述子限制。以非 root 使用者身分執行？"
-
-msgid "WARNING: Unable to modify max process limit.  Running as non-root?"
-msgstr "警告：無法修改處理程序數上限限制。以非 root 使用者身分執行？"
-
-msgid "WARNING: Unable to modify memory limit.  Running as non-root?"
-msgstr "警告：無法修改記憶體限制。以非 root 使用者身分執行？"
-
 msgid "Warning: Cannot ratelimit without a memcached client"
 msgstr "警告：無法在沒有 memcached 用戶端的情況下限制速率"
 

swift/obj/diskfile.py

@@ -167,24 +167,36 @@ def _encode_metadata(metadata):
     return dict(((encode_str(k), encode_str(v)) for k, v in metadata.items()))
 
 
-def _decode_metadata(metadata):
+def _decode_metadata(metadata, metadata_written_by_py3):
     """
     Given a metadata dict from disk, convert keys and values to native strings.
 
     :param metadata: a dict
+    :param metadata_written_by_py3:
     """
     if six.PY2:
-        def to_str(item):
+        def to_str(item, is_name=False):
+            # For years, py2 and py3 handled non-ascii metadata differently;
+            # see https://bugs.launchpad.net/swift/+bug/2012531
+            if metadata_written_by_py3 and not is_name:
+                # do our best to read new-style data replicated from a py3 node
+                item = item.decode('utf8').encode('latin1')
             if isinstance(item, six.text_type):
                 return item.encode('utf8')
             return item
     else:
-        def to_str(item):
+        def to_str(item, is_name=False):
+            # For years, py2 and py3 handled non-ascii metadata differently;
+            # see https://bugs.launchpad.net/swift/+bug/2012531
+            if not metadata_written_by_py3 and isinstance(item, bytes) \
+                    and not is_name:
+                # do our best to read old py2 data
+                item = item.decode('latin1')
             if isinstance(item, six.binary_type):
                 return item.decode('utf8', 'surrogateescape')
             return item
 
-    return dict(((to_str(k), to_str(v)) for k, v in metadata.items()))
+    return {to_str(k): to_str(v, k == b'name') for k, v in metadata.items()}
 
 
 def read_metadata(fd, add_missing_checksum=False):
@@ -238,6 +250,7 @@ def read_metadata(fd, add_missing_checksum=False):
                 "stored checksum='%s', computed='%s'" % (
                     fd, metadata_checksum, computed_checksum))
 
+    metadata_written_by_py3 = (b'_codecs\nencode' in metadata[:32])
     # strings are utf-8 encoded when written, but have not always been
     # (see https://bugs.launchpad.net/swift/+bug/1678018) so encode them again
     # when read
@@ -245,7 +258,7 @@ def read_metadata(fd, add_missing_checksum=False):
         metadata = pickle.loads(metadata)
     else:
         metadata = pickle.loads(metadata, encoding='bytes')
-    return _decode_metadata(metadata)
+    return _decode_metadata(metadata, metadata_written_by_py3)
 
 
 def write_metadata(fd, metadata, xattr_size=65536):
@@ -2357,7 +2370,7 @@ class BaseDiskFileReader(object):
                 self._logger.error(
                     'ERROR DiskFile %(data_file)s'
                     ' close failure: %(exc)s : %(stack)s',
-                    {'exc': e, 'stack': ''.join(traceback.format_stack()),
+                    {'exc': e, 'stack': ''.join(traceback.format_exc()),
                      'data_file': self._data_file})
             finally:
                 fp, self._fp = self._fp, None

swift/obj/server.py

@@ -56,7 +56,7 @@ from swift.common.swob import HTTPAccepted, HTTPBadRequest, HTTPCreated, \
     HTTPPreconditionFailed, HTTPRequestTimeout, HTTPUnprocessableEntity, \
     HTTPClientDisconnect, HTTPMethodNotAllowed, Request, Response, \
     HTTPInsufficientStorage, HTTPForbidden, HTTPException, HTTPConflict, \
-    HTTPServerError, wsgi_to_bytes, wsgi_to_str, normalize_etag
+    HTTPServerError, bytes_to_wsgi, wsgi_to_bytes, wsgi_to_str, normalize_etag
 from swift.obj.diskfile import RESERVED_DATAFILE_META, DiskFileRouter
 from swift.obj.expirer import build_task_obj
 
@@ -150,6 +150,8 @@ class ObjectController(BaseStorageServer):
         self.slow = int(conf.get('slow', 0))
         self.keep_cache_private = \
             config_true_value(conf.get('keep_cache_private', 'false'))
+        self.keep_cache_slo_manifest = \
+            config_true_value(conf.get('keep_cache_slo_manifest', 'false'))
 
         default_allowed_headers = '''
             content-disposition,
@@ -678,7 +680,8 @@ class ObjectController(BaseStorageServer):
                 list(self.allowed_headers))
             for header_key in headers_to_copy:
                 if header_key in request.headers:
-                    header_caps = header_key.title()
+                    header_caps = bytes_to_wsgi(
+                        wsgi_to_bytes(header_key).title())
                     metadata[header_caps] = request.headers[header_key]
             orig_delete_at = int(orig_metadata.get('X-Delete-At') or 0)
             if orig_delete_at != new_delete_at:
@@ -927,7 +930,8 @@ class ObjectController(BaseStorageServer):
             list(self.allowed_headers))
         for header_key in headers_to_copy:
             if header_key in request.headers:
-                header_caps = header_key.title()
+                header_caps = bytes_to_wsgi(
+                    wsgi_to_bytes(header_key).title())
                 metadata[header_caps] = request.headers[header_key]
         return metadata
 
@@ -1096,9 +1100,19 @@ class ObjectController(BaseStorageServer):
                     request.headers.pop('Range', None)
                 obj_size = int(metadata['Content-Length'])
                 file_x_ts = Timestamp(metadata['X-Timestamp'])
-                keep_cache = (self.keep_cache_private or
-                              ('X-Auth-Token' not in request.headers and
-                               'X-Storage-Token' not in request.headers))
+                keep_cache = (
+                    self.keep_cache_private
+                    or (
+                        "X-Auth-Token" not in request.headers
+                        and "X-Storage-Token" not in request.headers
+                    )
+                    or (
+                        self.keep_cache_slo_manifest
+                        and config_true_value(
+                            metadata.get("X-Static-Large-Object")
+                        )
+                    )
+                )
                 conditional_etag = resolve_etag_is_at_header(request, metadata)
                 response = Response(
                     app_iter=disk_file.reader(keep_cache=keep_cache),

swift/obj/ssync_receiver.py

@@ -45,8 +45,8 @@ def decode_missing(line):
     parts = line.decode('ascii').split()
     result['object_hash'] = urllib.parse.unquote(parts[0])
     t_data = urllib.parse.unquote(parts[1])
-    result['ts_data'] = Timestamp(t_data)
-    result['ts_meta'] = result['ts_ctype'] = result['ts_data']
+    result['ts_data'] = ts_data = Timestamp(t_data)
+    result['ts_meta'] = result['ts_ctype'] = ts_data
     result['durable'] = True  # default to True in case this key isn't sent
     if len(parts) > 2:
         # allow for a comma separated list of k:v pairs to future-proof
@@ -54,9 +54,17 @@ def decode_missing(line):
         for item in [subpart for subpart in subparts if ':' in subpart]:
             k, v = item.split(':')
             if k == 'm':
-                result['ts_meta'] = Timestamp(t_data, delta=int(v, 16))
+                v, _, o = v.partition('__')
+                # ignore ts_data offset when calculating ts_meta
+                result['ts_meta'] = Timestamp(ts_data.normal,
+                                              delta=int(v, 16),
+                                              offset=int(o or '0', 16))
             elif k == 't':
-                result['ts_ctype'] = Timestamp(t_data, delta=int(v, 16))
+                v, _, o = v.partition('__')
+                # ignore ts_data offset when calculating ts_ctype
+                result['ts_ctype'] = Timestamp(Timestamp(ts_data).normal,
+                                               delta=int(v, 16),
+                                               offset=int(o or '0', 16))
             elif k == 'durable':
                 result['durable'] = utils.config_true_value(v)
     return result
@@ -380,7 +388,8 @@ class Receiver(object):
             raise SsyncClientDisconnected
         if line.strip() != b':MISSING_CHECK: START':
             raise Exception(
-                'Looking for :MISSING_CHECK: START got %r' % line[:1024])
+                'Looking for :MISSING_CHECK: START got %r'
+                % utils.cap_length(line, 1024))
         object_hashes = []
         nlines = 0
         while True:
@@ -442,7 +451,8 @@ class Receiver(object):
             # Guess they hung up waiting for us to process the missing check
             raise SsyncClientDisconnected
         if line.strip() != b':UPDATES: START':
-            raise Exception('Looking for :UPDATES: START got %r' % line[:1024])
+            raise Exception('Looking for :UPDATES: START got %r'
+                            % utils.cap_length(line, 1024))
         successes = 0
         failures = 0
         updates = 0
@@ -466,9 +476,9 @@ class Receiver(object):
                 line = line.strip()
                 if not line:
                     break
-                header, value = swob.bytes_to_wsgi(line).split(':', 1)
-                header = header.strip().lower()
-                value = value.strip()
+                header, value = line.split(b':', 1)
+                header = swob.bytes_to_wsgi(header.strip().lower())
+                value = swob.bytes_to_wsgi(value.strip())
                 subreq.headers[header] = value
                 if header not in ('etag', 'x-backend-no-commit'):
                     # we'll use X-Backend-Replication-Headers to force the