httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r209394 - in /httpd/httpd/branches/1.3.x/src: main/http_protocol.c modules/proxy/mod_proxy.c
Date Wed, 06 Jul 2005 02:51:56 GMT
Author: wrowe
Date: Tue Jul  5 19:51:54 2005
New Revision: 209394

URL: http://svn.apache.org/viewcvs?rev=209394&view=rev
Log:

  Minor cleanup - use NOERRNO logging, more proper body test and
  log origin server TRACE denied.

Modified:
    httpd/httpd/branches/1.3.x/src/main/http_protocol.c
    httpd/httpd/branches/1.3.x/src/modules/proxy/mod_proxy.c

Modified: httpd/httpd/branches/1.3.x/src/main/http_protocol.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/1.3.x/src/main/http_protocol.c?rev=209394&r1=209393&r2=209394&view=diff
==============================================================================
--- httpd/httpd/branches/1.3.x/src/main/http_protocol.c (original)
+++ httpd/httpd/branches/1.3.x/src/main/http_protocol.c Tue Jul  5 19:51:54 2005
@@ -1687,9 +1687,12 @@
     conf = ap_get_module_config(r->server->module_config, &core_module);
 
     if (conf->trace_enable == AP_TRACE_DISABLE) {
-	ap_table_setn(r->notes, "error-notes",
-                      "TRACE denied by server configuration");
-        return HTTP_FORBIDDEN;
+        ap_table_setn(r->notes, "error-notes",
+                      "TRACE forbidden by server configuration");
+        ap_table_setn(r->notes, "verbose-error-to", "*");
+        ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r,
+                      "TRACE forbidden by server configuration");
+	return HTTP_FORBIDDEN;
     }
 
     if (conf->trace_enable == AP_TRACE_EXTENDED)
@@ -2112,7 +2115,7 @@
     }
 
     if ((r->read_body == REQUEST_NO_BODY) &&
-        (r->read_chunked || (r->remaining > 0))) {
+        && (r->read_length || r->read_chunked || r->remaining)) {
         ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                     "%s with body is not allowed for %s", r->method, r->uri);
         return HTTP_REQUEST_ENTITY_TOO_LARGE;

Modified: httpd/httpd/branches/1.3.x/src/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/1.3.x/src/modules/proxy/mod_proxy.c?rev=209394&r1=209393&r2=209394&view=diff
==============================================================================
--- httpd/httpd/branches/1.3.x/src/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/branches/1.3.x/src/modules/proxy/mod_proxy.c Tue Jul  5 19:51:54 2005
@@ -292,7 +292,7 @@
             ap_table_setn(r->notes, "error-notes",
                            "TRACE forbidden by server configuration");
             ap_table_setn(r->notes, "verbose-error-to", "*");
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r,
                           "proxy: TRACE forbidden by server configuration");
             return HTTP_FORBIDDEN;
         }
@@ -306,7 +306,7 @@
             ap_table_setn(r->notes, "error-notes",
                            "TRACE with request body is not allowed");
             ap_table_setn(r->notes, "verbose-error-to", "*");
-            ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
+            ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r,
                           "proxy: TRACE with request body is not allowed");
             return HTTP_REQUEST_ENTITY_TOO_LARGE;
         }



Mime
View raw message