tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/ajp/proxy proxy_http.c
Date Fri, 06 Aug 2004 14:12:22 GMT
mturk       2004/08/06 07:12:22

  Modified:    ajp/proxy proxy_http.c
  Log:
  Always use the cleanup. Do not close the socket directly.
  
  Revision  Changes    Path
  1.4       +2 -6      jakarta-tomcat-connectors/ajp/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/proxy_http.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- proxy_http.c	6 Aug 2004 14:05:45 -0000	1.3
  +++ proxy_http.c	6 Aug 2004 14:12:22 -0000	1.4
  @@ -795,9 +795,7 @@
               len = ap_getline(buffer, sizeof(buffer), rp, 0);
           }
           if (len <= 0) {
  -            apr_socket_close(backend->sock);
  -            backend->sock = NULL;
  -//            backend->connection = NULL;
  +            ap_proxy_http_cleanup(NULL, r, backend);
               ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "proxy: error reading status line from remote "
                             "server %s", backend->hostname);
  @@ -819,9 +817,7 @@
                * if the status line was > 8192 bytes
                */
               else if ((buffer[5] != '1') || (len >= sizeof(buffer)-1)) {
  -                apr_socket_close(backend->sock);
  -//                backend->connection = NULL;
  -                backend->sock = NULL;
  +                ap_proxy_http_cleanup(NULL, r, backend);
                   return ap_proxyerror(r, HTTP_BAD_GATEWAY,
                   apr_pstrcat(p, "Corrupt status line returned by remote "
                               "server: ", buffer, NULL));
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message