branch off v1 as R_1_7

[m6w6/ext-http] / http_cache_api.c

diff --git a/http_cache_api.c b/http_cache_api.c
index dab555238c98cfb82509f75d3d453e8967b7cf40..b6bc23714bd292882716ae66692118290b66095e 100644 (file)
--- a/http_cache_api.c
+++ b/http_cache_api.c
@@ -6,29 +6,22 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#      include "config.h"
-#endif
-#include "php.h"
+#define HTTP_WANT_SAPI
+#include "php_http.h"
 
-#include "SAPI.h"
-#include "php_streams.h"
 #include "php_output.h"
+#include "php_streams.h"
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_cache_api.h"
-#include "php_http_send_api.h"
 #include "php_http_date_api.h"
-
-ZEND_EXTERN_MODULE_GLOBALS(http);
+#include "php_http_send_api.h"
 
 /* {{{ char *http_etag(void *, size_t, http_send_mode) */
 PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC)
@@ -52,9 +45,9 @@ PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_m
                        return NULL;
                } else {
                        size_t ssb_len;
-                       char ssb_buf[128] = {0};
+                       char ssb_buf[128];
                        
-                       ssb_len = snprintf(ssb_buf, 127, "%ld=%ld=%ld", (long) ssb.sb.st_mtime, 
+                       ssb_len = snprintf(ssb_buf, sizeof(ssb_buf), "%ld=%ld=%ld", (long) ssb.sb.st_mtime, 
                                                                                                                        (long) ssb.sb.st_ino, 
                                                                                                                        (long) ssb.sb.st_size);
                        http_etag_update(ctx, ssb_buf, ssb_len);
@@ -70,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 time(NULL);
+       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;
        }
@@ -86,13 +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;
 }
@@ -105,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,22 +182,33 @@ PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len,
 PHP_HTTP_API STATUS _http_start_ob_etaghandler(TSRMLS_D)
 {
        /* already running? */
+#ifdef PHP_OUTPUT_NEWAPI
+    STATUS rv;
+
+    if (php_output_handler_conflict(ZEND_STRL("ob_etaghandler"), ZEND_STRL("ob_etaghandler") TSRMLS_CC)) {
+        return FAILURE;
+    }
+#else
        if (php_ob_handler_used("ob_etaghandler" TSRMLS_CC)) {
                http_error(HE_WARNING, HTTP_E_RUNTIME, "ob_etaghandler can only be used once");
                return FAILURE;
        }
-       
-       HTTP_G(etag).started = 1;
-       return php_start_ob_buffer_named("ob_etaghandler", HTTP_G(send).buffer_size, 1 TSRMLS_CC);
+#endif
+       HTTP_G->etag.started = 1;
+#ifdef PHP_OUTPUT_NEWAPI
+    return php_output_start_internal(ZEND_STRL("ob_etaghandler"), _http_ob_etaghandler, HTTP_G->send.buffer_size, 0 TSRMLS_CC);
+#else
+       return php_start_ob_buffer_named("ob_etaghandler", HTTP_G->send.buffer_size, 0 TSRMLS_CC);
+#endif
 }
 
 PHP_HTTP_API zend_bool _http_interrupt_ob_etaghandler(TSRMLS_D)
 {
-       if (HTTP_G(etag).started) {
-               HTTP_G(etag).started = 0;
-               if (HTTP_G(etag).ctx) {
-                       efree(HTTP_G(etag).ctx);
-                       HTTP_G(etag).ctx = NULL;
+       if (HTTP_G->etag.started) {
+               HTTP_G->etag.started = 0;
+               if (HTTP_G->etag.ctx) {
+                       efree(HTTP_G->etag.ctx);
+                       HTTP_G->etag.ctx = NULL;
                }
                return 1;
        }
@@ -216,26 +224,28 @@ void _http_ob_etaghandler(char *output, uint output_len,
        *handled_output = estrndup(output, output_len);
        
        /* are we supposed to run? */
-       if (HTTP_G(etag).started) {
+       if (HTTP_G->etag.started) {
                /* initialize the etag context */
                if (mode & PHP_OUTPUT_HANDLER_START) {
-                       HTTP_G(etag).ctx = http_etag_init();
+                       HTTP_G->etag.ctx = http_etag_init();
                }
                
                /* update */
-               http_etag_update(HTTP_G(etag).ctx, output, output_len);
+               http_etag_update(HTTP_G->etag.ctx, output, output_len);
                
                /* finish */
                if (mode & PHP_OUTPUT_HANDLER_END) {
                        char *sent_header = NULL;
-                       char *etag = http_etag_finish(HTTP_G(etag).ctx);
+                       char *etag = http_etag_finish(HTTP_G->etag.ctx);
                        
-                       HTTP_G(etag).ctx = NULL;
+                       HTTP_G->etag.ctx = NULL;
                        
                        http_send_cache_control(HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL));
                        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);
                        }