- curl folks seem to have identified the MSVC quirks regarding DST offsets

[m6w6/ext-http] / http_cache_api.c

diff --git a/http_cache_api.c b/http_cache_api.c
index 582c3ccd455d764b26fcec0134ec58dff88080ea..f7f0c816e23a67ef4b55c2e1134a8fb36b900812 100644 (file)
--- a/http_cache_api.c
+++ b/http_cache_api.c
@@ -63,9 +63,8 @@ PHP_HTTP_API time_t _http_last_modified(const void *data_ptr, http_send_mode dat
 {
        php_stream_statbuf ssb;
 
-       switch (data_mode)
-       {
-               case SEND_DATA: return HTTP_GET_REQUEST_TIME();
+       switch (data_mode) {
+               case SEND_DATA: return HTTP_G->request.time;
                case SEND_RSRC: return php_stream_stat((php_stream *) data_ptr, &ssb) ? 0 : ssb.sb.st_mtime;
                default:                return php_stream_stat_path((char *) data_ptr, &ssb) ? 0 : ssb.sb.st_mtime;
        }
@@ -79,14 +78,16 @@ PHP_HTTP_API zend_bool _http_match_last_modified_ex(const char *entry, time_t t,
        zval *zmodified;
        char *modified, *chr_ptr;
 
-       HTTP_GSC(zmodified, entry, !enforce_presence);
+       if (!(zmodified = http_get_server_var(entry, 1))) {
+               return !enforce_presence;
+       }
 
        modified = estrndup(Z_STRVAL_P(zmodified), Z_STRLEN_P(zmodified));
        if ((chr_ptr = strrchr(modified, ';'))) {
                chr_ptr = 0;
        }
        
-       retval = (t <= http_parse_date(modified));
+       retval = (t <= http_parse_date_ex(modified, 1));
        efree(modified);
        return retval;
 }
@@ -99,7 +100,9 @@ PHP_HTTP_API zend_bool _http_match_etag_ex(const char *entry, const char *etag,
        char *quoted_etag;
        zend_bool result;
 
-       HTTP_GSC(zetag, entry, !enforce_presence);
+       if (!(zetag = http_get_server_var_ex(entry, strlen(entry)+1, 1))) {
+               return !enforce_presence;
+       }
 
        if (NULL != strchr(Z_STRVAL_P(zetag), '*')) {
                return 1;
@@ -185,7 +188,7 @@ PHP_HTTP_API STATUS _http_start_ob_etaghandler(TSRMLS_D)
        }
        
        HTTP_G->etag.started = 1;
-       return php_start_ob_buffer_named("ob_etaghandler", HTTP_G->send.buffer_size, 1 TSRMLS_CC);
+       return php_start_ob_buffer_named("ob_etaghandler", HTTP_G->send.buffer_size, 0 TSRMLS_CC);
 }
 
 PHP_HTTP_API zend_bool _http_interrupt_ob_etaghandler(TSRMLS_D)
@@ -230,6 +233,8 @@ void _http_ob_etaghandler(char *output, uint output_len,
                        http_send_etag_ex(etag, strlen(etag), &sent_header);
                        
                        if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
+                               /* force exit; ob within ob does not work */
+                               HTTP_G->force_exit = 1;
                                http_exit_ex(304, sent_header, etag, 0);
                        }