- flush

diff --git a/config.w32 b/config.w32
index 23a2dd1ec3e78600fde5ac81d9533f2a770a5467..8822ef4fac041c9ce6126f7ce871fadfdb49f8db 100644 (file)
--- a/config.w32
+++ b/config.w32
@@ -17,6 +17,10 @@ if (PHP_HTTP != "no") {
                "/I\"" + configure_module_dirname + "/phpstr\"");
        ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http");
        AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support");
+       
+       if (PHP_DEBUG != "no") {
+               ADD_FLAG("CFLAGS_HTTP", "/W3");
+       }
 
        MHASH_LIB = PHP_DEBUG != "no" ? "libmhash-staticd.lib":"libmhash-static.lib";
        if (CHECK_HEADER_ADD_INCLUDE('mhash.h', 'CFLAGS_HTTP') &&

diff --git a/funcsummary.php b/funcsummary.php
index 1867f5afa8f566b201ce03ad169c746a5fe3de47..f4830e022223a79d2211c7b9f62fadc247b3e2ad 100644 (file)
--- a/funcsummary.php
+++ b/funcsummary.php
@@ -132,10 +132,6 @@ foreach (array_slice($_SERVER['argv'], 1) as $fp) {
                                        printf("<h%d id=\"%s\">%s</h%d>\n", 2, $m[4][$i], $p, 2);
                                }
                                print ff($m[3][$i]) ."\n";
-                               /*
-                printf("<h%d id=\"%s\">%s</h%d>\n%s\n", 
-                    $o?3:2, $o?$n[1].'_'.$n[2]:$m[4][$i], $p, $o?3:2, ff($m[3][$i]));
-               */
             }
             print "<hr noshade>\n";
         }

diff --git a/package2.xml b/package2.xml
index 27c1da0aa409dc712a20dbfc7218a22a1bca15e1..0417d511070dd3ce2ef5fa2a97771c14235a0850 100644 (file)
--- a/package2.xml
+++ b/package2.xml
@@ -44,7 +44,7 @@
 - Renamed http_absolute_uri() to http_build_uri() (complements with http_build_query())
 - Changed the signature of the negotiator to fill the second parameter with the results array
 
-* Fixed unexpected warnings on request shutdown when etag caching is enabled
+* Fixed several ETag issues
 ]]></notes>
  <contents>
   <dir name="/">
@@ -128,6 +128,15 @@
     <file role="test" name="chunked_decode_002.phpt"/>
     <file role="test" name="date_001.phpt"/>
     <file role="test" name="date_002.phpt"/>
+    <file role="test" name="etag_mode_001.phpt"/>
+    <file role="test" name="etag_mode_002.phpt"/>
+    <file role="test" name="etag_mode_003.phpt"/>
+    <file role="test" name="etag_mode_004.phpt"/>
+    <file role="test" name="etag_mode_011.phpt"/>
+    <file role="test" name="etag_mode_012.phpt"/>
+    <file role="test" name="etag_mode_013.phpt"/>
+    <file role="test" name="etag_mode_014.phpt"/>
+    <file role="test" name="etag_mode_crc.phpt"/>
     <file role="test" name="get_request_data_001.phpt"/>
     <file role="test" name="HttpMessage_001.phpt"/>
     <file role="test" name="HttpRequestPool_001.phpt"/>