http://marc.info/?l=apache-httpd-dev&m=123845333914309&w=2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@760379 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index ef2bf3894cddb3fbe182b5ce629a8bc876d3edea..f58752434dfd8114a3ddde45154f4c32bc8b96e4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,6 @@
 
 Changes with Apache 2.3.3
 
-  *) script support: avoid possibly sending contents with a 204 or 304
-     response.  PR 40953 [Nick Kew]
-
   *) ab: Fix a 100% CPU loop on platforms where a failed non-blocking connect
      returns EINPROGRESS and a subsequent poll() returns only POLLERR.
      Observed on HP-UX.  [Eric Covener]

diff --git a/server/util_script.c b/server/util_script.c
index 682b2ab7de8d51f56f5bd10d2129059ceb6b8a0e..14678ec310ec01e5cdd29014c9bedc6f5d8ce30f 100644 (file)
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -462,10 +462,6 @@ AP_DECLARE(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
             if ((cgi_status == HTTP_UNSET) && (r->method_number == M_GET)) {
                 cond_status = ap_meets_conditions(r);
             }
-            else if ((cgi_status == HTTP_NO_CONTENT) ||
-                     (cgi_status == HTTP_NOT_MODIFIED)) {
-                r->header_only = 1; /* discard any body */
-            }
             apr_table_overlap(r->err_headers_out, merge,
                 APR_OVERLAP_TABLES_MERGE);
             if (!apr_is_empty_table(cookie_table)) {