From: Jim Jagielski <jim@apache.org>
Date: Mon, 21 Nov 2011 15:55:10 +0000 (+0000)
Subject: Merge r1204556 from trunk:
X-Git-Tag: 2.3.16~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eeabba3f475915f889ec42b1349831c4ae4fddcd;p=apache

Merge r1204556 from trunk:

check return status
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1204560 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/ajp_header.c b/modules/proxy/ajp_header.c
index c40a88a496..0fc8e195ff 100644
--- a/modules/proxy/ajp_header.c
+++ b/modules/proxy/ajp_header.c
@@ -683,6 +683,11 @@ apr_status_t ajp_read_header(apr_socket_t *sock,
     }
     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);