From: Nick Kew <niq@apache.org>
Date: Tue, 31 Mar 2009 09:32:14 +0000 (+0000)
Subject: http://marc.info/?l=apache-httpd-dev&m=123845333914309&w=2
X-Git-Tag: 2.3.3~744
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1026b83608f65d5a73d1781e8c878a84c0e4393d;p=thirdparty%2Fapache%2Fhttpd.git

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 ef2bf3894cd..f58752434df 100644
--- 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 682b2ab7de8..14678ec310e 100644
--- 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)) {