httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1204560 - /httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c
Date Mon, 21 Nov 2011 15:55:10 GMT
Author: jim
Date: Mon Nov 21 15:55:10 2011
New Revision: 1204560

URL: http://svn.apache.org/viewvc?rev=1204560&view=rev
Log:
Merge r1204556 from trunk:

check return status
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c

Modified: httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c?rev=1204560&r1=1204559&r2=1204560&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/ajp_header.c Mon Nov 21 15:55:10 2011
@@ -683,6 +683,11 @@ apr_status_t ajp_read_header(apr_socket_
     }
     ajp_msg_log(r, *msg, "ajp_read_header: ajp_ilink_receive packet dump");
     rc = ajp_msg_peek_uint8(*msg, &result);
+    if (rc != APR_SUCCESS) {
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                      "ajp_read_header: ajp_msg_peek_uint8 failed");
+        return rc;
+    }
     ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r,
                "ajp_read_header: ajp_ilink_received %s (0x%02x)",
                ajp_type_str(result), result);



Mime
View raw message