Changeset 15679 for platform/apache/mod_checksum_filter

Timestamp:

07/11/08 18:18:40 (5 years ago)

Author:

yappo

Message:

app server から受け取ったコンテンツbodyのサイズをerror_logに吐き出す

Files:

• platform/apache/mod_checksum_filter/mod_checksum_filter.c (modified) (4 diffs)

platform/apache/mod_checksum_filter/mod_checksum_filter.c

@@ -253 +253 @@
     /* reading stream completed */
 
+    rv = apr_brigade_pflatten(ctx->bb, &content_body, &content_length, r->pool);
+    if (rv != APR_SUCCESS) {
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
+                      "mod_checksum_filter: apr_brigade_pflatten() failed");
+        return create_error_brigade(f, ctx->bb);
+    }
+
     /* check request env */
     checksum_request = apr_table_get(r->headers_out, "X-CheckSum-Request");
     if (!checksum_request) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                      "mod_checksum_filter: not checksum request");
+                      "mod_checksum_filter: not checksum request (%dbytes)", content_length);
         return create_error_brigade(f, ctx->bb);
     }
@@ -275 +282 @@
     if (apr_strnatcmp(checksum_request, request_sha1) != 0) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                      "mod_checksum_filter: bad checksum request %s != %s",
-                      checksum_request, request_sha1);
+                      "mod_checksum_filter: bad checksum request %s != %s (%dbytes)",
+                      checksum_request, request_sha1, content_length);
         return create_error_brigade(f, ctx->bb);
     }
@@ -284 +291 @@
     if (!checksum_response) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                      "mod_checksum_filter: not checksum response");
+                      "mod_checksum_filter: not checksum response (%dbytes)", content_length);
         return create_error_brigade(f, ctx->bb);
     }
     apr_table_unset(r->headers_out, "X-CheckSum-Response");
 
-    rv = apr_brigade_pflatten(ctx->bb, &content_body, &content_length, r->pool);
-    if (rv != APR_SUCCESS) {
-        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
-                      "mod_checksum_filter: apr_brigade_pflatten() failed");
-        return create_error_brigade(f, ctx->bb);
-    }
     apr_sha1_base64(content_body, content_length, response_sha1);
     strip_last_equal(response_sha1);
@@ -300 +301 @@
     if (apr_strnatcmp(checksum_response, response_sha1) != 0) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
-                      "mod_checksum_filter: bad checksum response %s != %s",
-                      checksum_response, response_sha1);
+                      "mod_checksum_filter: bad checksum response %s != %s (%dbytes)",
+                      checksum_response, response_sha1, content_length);
         return create_error_brigade(f, ctx->bb);
     }