- simplify http_send_header API

[m6w6/ext-http] / http_cache_api.c

diff --git a/http_cache_api.c b/http_cache_api.c
index 4e1473a7f4345d3f0018ea44f4e786af39ee84b5..43540b39de06a17d3bbf125e77cb51eeb7748cdd 100644 (file)
--- a/http_cache_api.c
+++ b/http_cache_api.c
@@ -61,6 +61,7 @@ STATUS _http_cache_exit_ex(char *cache_token, zend_bool etag, zend_bool free_tok
 /* {{{ 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)
 {
+       php_stream_statbuf ssb;
        char ssb_buf[128] = {0};
        unsigned char digest[16];
        PHP_MD5_CTX ctx;
@@ -76,19 +77,26 @@ PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_m
 
                case SEND_RSRC:
                {
-                       php_stream_statbuf ssb;
+                       if (php_stream_stat((php_stream *) data_ptr, &ssb)) {
+                               efree(new_etag);
+                               return NULL;
+                       }
 
-            if (php_stream_stat((php_stream *) data_ptr, &ssb)) {
-                return NULL;
-            }
                        snprintf(ssb_buf, 127, "%ld=%ld=%ld", ssb.sb.st_mtime, ssb.sb.st_ino, ssb.sb.st_size);
                        PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf));
                }
                break;
 
                default:
-                       efree(new_etag);
-                       return NULL;
+               {
+                       if (php_stream_stat_path(Z_STRVAL_P((zval *) data_ptr), &ssb)) {
+                               efree(new_etag);
+                               return NULL;
+                       }
+
+                       snprintf(ssb_buf, 127, "%ld=%ld=%ld", ssb.sb.st_mtime, ssb.sb.st_ino, ssb.sb.st_size);
+                       PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf));
+               }
                break;
        }
 
@@ -229,7 +237,7 @@ PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len,
                /* just do that if desired */
                if (HTTP_G(etag).started) {
                        make_digest(etag, digest);
-                       http_send_header("Cache-Control: " HTTP_DEFAULT_CACHECONTROL);
+                       http_send_cache_control(HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL));
                        http_send_etag(etag, 32);
 
                        if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {