httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1075064 - in /httpd/httpd/trunk/modules/proxy: ajp_link.c ajp_msg.c
Date Sun, 27 Feb 2011 14:38:17 GMT
Author: trawick
Date: Sun Feb 27 14:38:17 2011
New Revision: 1075064

URL: http://svn.apache.org/viewvc?rev=1075064&view=rev
Log:
axe some useless or debug-inhibiting error checking

Modified:
    httpd/httpd/trunk/modules/proxy/ajp_link.c
    httpd/httpd/trunk/modules/proxy/ajp_msg.c

Modified: httpd/httpd/trunk/modules/proxy/ajp_link.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/ajp_link.c?rev=1075064&r1=1075063&r2=1075064&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/ajp_link.c (original)
+++ httpd/httpd/trunk/modules/proxy/ajp_link.c Sun Feb 27 14:38:17 2011
@@ -24,12 +24,6 @@ apr_status_t ajp_ilink_send(apr_socket_t
     apr_status_t status;
     apr_size_t   length;
 
-    if (sock == NULL) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-                      "ajp_ilink_send(): NULL socket provided");
-        return AJP_EINVAL;
-    }
-
     ajp_msg_end(msg);
 
     length = msg->len;
@@ -83,12 +77,6 @@ apr_status_t ajp_ilink_receive(apr_socke
     apr_size_t   hlen;
     apr_size_t   blen;
 
-    if (sock == NULL) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-                      "ajp_ilink_receive(): NULL socket provided");
-        return AJP_EINVAL;
-    }
-
     hlen = msg->header_len;
 
     status = ilink_read(sock, msg->buf, hlen);

Modified: httpd/httpd/trunk/modules/proxy/ajp_msg.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/ajp_msg.c?rev=1075064&r1=1075063&r2=1075064&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/ajp_msg.c (original)
+++ httpd/httpd/trunk/modules/proxy/ajp_msg.c Sun Feb 27 14:38:17 2011
@@ -506,28 +506,9 @@ apr_status_t ajp_msg_create(apr_pool_t *
 {
     ajp_msg_t *msg = (ajp_msg_t *)apr_pcalloc(pool, sizeof(ajp_msg_t));
 
-    if (!msg) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-                      "ajp_msg_create(): can't allocate AJP message memory");
-        return APR_ENOPOOL;
-    }
-
     msg->server_side = 0;
 
     msg->buf = (apr_byte_t *)apr_palloc(pool, size);
-
-    /* XXX: This should never happen
-     * In case if the OS cannont allocate 8K of data
-     * we are in serious trouble
-     * No need to check the alloc return value, cause the
-     * core dump is probably the best solution anyhow.
-     */
-    if (msg->buf == NULL) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-                      "ajp_msg_create(): can't allocate AJP message memory");
-        return APR_ENOPOOL;
-    }
-
     msg->len = 0;
     msg->header_len = AJP_HEADER_LEN;
     msg->max_size = size;
@@ -545,12 +526,6 @@ apr_status_t ajp_msg_create(apr_pool_t *
  */
 apr_status_t ajp_msg_copy(ajp_msg_t *smsg, ajp_msg_t *dmsg)
 {
-    if (dmsg == NULL) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-                     "ajp_msg_copy(): destination msg is null");
-        return AJP_EINVAL;
-    }
-
     if (smsg->len > smsg->max_size) {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
                      "ajp_msg_copy(): destination buffer too "



Mime
View raw message