svn commit: r760379 - in /httpd/httpd/trunk: CHANGES server/util_script.c

[ni...@apache.org]

Author: niq
Date: Tue Mar 31 09:32:14 2009
New Revision: 760379

URL: http://svn.apache.org/viewvc?rev=760379&view=rev
Log:
http://marc.info/?l=apache-httpd-dev&m=123845333914309&w=2

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/util_script.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=760379&r1=760378&r2=760379&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Mar 31 09:32:14 2009
@@ -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]

Modified: httpd/httpd/trunk/server/util_script.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_script.c?rev=760379&r1=760378&r2=760379&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_script.c (original)
+++ httpd/httpd/trunk/server/util_script.c Tue Mar 31 09:32:14 2009
@@ -462,10 +462,6 @@
             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)) {