build and file maintenance

[m6w6/ext-http] / php_http_env_response.c

diff --git a/php_http_env_response.c b/php_http_env_response.c
index 40fa9412ce4008500fdab33fc213243c510fe451..cc739df2aff199e2e20c39d25afdfc82f36e6d4e 100644 (file)
--- a/php_http_env_response.c
+++ b/php_http_env_response.c
@@ -6,12 +6,10 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id $ */
-
 #include "php_http.h"
 
 #include <main/SAPI.h>
@@ -61,7 +59,7 @@ static void set_option(zval *options, const char *name_str, size_t name_len, int
                }
        }
 }
-static zval *get_option(zval *options, const char *name_str, size_t name_len TSRMLS_CC)
+static zval *get_option(zval *options, const char *name_str, size_t name_len TSRMLS_DC)
 {
        zval *val, **valptr;
 
@@ -70,7 +68,7 @@ static zval *get_option(zval *options, const char *name_str, size_t name_len TSR
                val = zend_read_property(Z_OBJCE_P(options), options, name, name_len, 0 TSRMLS_CC);
                efree(name);
        } else {
-               if (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), name_str, name_len + 1, (void *) &valptr)) {
+               if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(options), name_str, name_len + 1, (void *) &valptr)) {
                        val = *valptr;
                } else {
                        val = NULL;
@@ -167,7 +165,7 @@ PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_last_mod
                zval_ptr_dtor(&zlm);
        }
 
-       ums = php_parse_date(header, NULL TSRMLS_CC);
+       ums = php_parse_date(header, NULL);
        efree(header);
 
        if (ums > 0 && ums <= lm) {
@@ -180,7 +178,6 @@ PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_last_mod
 static size_t output(void *context, const char *buf, size_t len TSRMLS_DC)
 {
        php_http_env_response_t *r = context;
-       TSRMLS_FETCH_FROM_CTX(r->ts);
 
        PHPWRITE(buf, len);
 
@@ -363,7 +360,7 @@ static STATUS php_http_env_response_send_head(php_http_env_response_t *r)
                                ret = php_http_env_set_response_header_format(206, 1 TSRMLS_CC, "Content-Range: bytes %ld-%ld/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), r->content.length);
                        }
                } else {
-                       php_http_boundary(r->range.boundary, sizeof(r->range.boundary));
+                       php_http_boundary(r->range.boundary, sizeof(r->range.boundary) TSRMLS_CC);
                        ret = php_http_env_set_response_header_format(206, 1 TSRMLS_CC, "Content-Type: multipart/byteranges; boundary=%s", r->range.boundary);
                }
        } else {
@@ -393,6 +390,7 @@ static STATUS php_http_env_response_send_head(php_http_env_response_t *r)
                                switch (Z_LVAL_P(zdisposition_copy)) {
                                        case PHP_HTTP_CONTENT_DISPOSITION_NONE:
                                                ret = php_http_env_set_response_header_value(0, ZEND_STRL("Content-Disposition"), NULL, 1 TSRMLS_CC);
+                                               break;
                                        case PHP_HTTP_CONTENT_DISPOSITION_INLINE:
                                                tmp = "inline";
                                                break;
@@ -450,13 +448,13 @@ static STATUS php_http_env_response_send_head(php_http_env_response_t *r)
                                                zend_hash_internal_pointer_reset(result);
                                                if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(result, &key_str, &key_len, NULL, 0, NULL)) {
                                                        if (!strcmp(key_str, "gzip")) {
-                                                               if (!(r->content.encoder = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_deflate_ops(), PHP_HTTP_DEFLATE_TYPE_GZIP))) {
+                                                               if (!(r->content.encoder = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_deflate_ops(), PHP_HTTP_DEFLATE_TYPE_GZIP TSRMLS_CC))) {
                                                                        ret = FAILURE;
                                                                } else if (SUCCESS == (ret = php_http_env_set_response_header(0, ZEND_STRL("Content-Encoding: gzip"), 1 TSRMLS_CC))) {
                                                                        r->content.encoding = estrndup(key_str, key_len - 1);
                                                                }
                                                        } else if (!strcmp(key_str, "deflate")) {
-                                                               if (!(r->content.encoder = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_deflate_ops(), PHP_HTTP_DEFLATE_TYPE_ZLIB))) {
+                                                               if (!(r->content.encoder = php_http_encoding_stream_init(NULL, php_http_encoding_stream_get_deflate_ops(), PHP_HTTP_DEFLATE_TYPE_ZLIB TSRMLS_CC))) {
                                                                        ret = FAILURE;
                                                                } else if (SUCCESS == (ret = php_http_env_set_response_header(0, ZEND_STRL("Content-Encoding: deflate"), 1 TSRMLS_CC))) {
                                                                        r->content.encoding = estrndup(key_str, key_len - 1);
@@ -489,14 +487,15 @@ static STATUS php_http_env_response_send_head(php_http_env_response_t *r)
                        return ret;
                }
 
-               switch (php_http_env_is_response_cached_by_etag(options, ZEND_STRL("If-None-Match"))) {
+               switch (php_http_env_is_response_cached_by_etag(options, ZEND_STRL("If-None-Match") TSRMLS_CC)) {
                        case PHP_HTTP_CACHE_MISS:
                                break;
 
                        case PHP_HTTP_CACHE_NO:
-                               if (PHP_HTTP_CACHE_HIT != php_http_env_is_response_cached_by_last_modified(options, ZEND_STRL("If-Modified-Since"))) {
+                               if (PHP_HTTP_CACHE_HIT != php_http_env_is_response_cached_by_last_modified(options, ZEND_STRL("If-Modified-Since") TSRMLS_CC)) {
                                        break;
                                }
+                               /*  fallthrough */
 
                        case PHP_HTTP_CACHE_HIT:
                                ret = php_http_env_set_response_code(304 TSRMLS_CC);
@@ -530,6 +529,7 @@ static STATUS php_http_env_response_send_body(php_http_env_response_t *r)
 {
        STATUS ret = SUCCESS;
        zval *zbody;
+       TSRMLS_FETCH_FROM_CTX(r->ts);
 
        if (r->done) {
                return ret;
@@ -609,6 +609,7 @@ static STATUS php_http_env_response_send_body(php_http_env_response_t *r)
 PHP_HTTP_API STATUS php_http_env_response_send(php_http_env_response_t *r)
 {
        zval *zbody;
+       TSRMLS_FETCH_FROM_CTX(r->ts);
 
        /* check for ranges */
        if (    (zbody = get_option(r->options, ZEND_STRL("body") TSRMLS_CC))
@@ -663,6 +664,8 @@ PHP_HTTP_API STATUS php_http_env_response_send(php_http_env_response_t *r)
                                                }
                                                break;
                                        }
+
+                                       break;
                        }
                }
        } else if (zbody) {
@@ -787,7 +790,7 @@ PHP_METHOD(HttpEnvResponse, setContentDisposition)
                if (file_len) {
                        add_assoc_stringl_ex(arr, ZEND_STRS("filename"), file_str, file_len, 1);
                }
-               zend_update_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL("contentDisposition"), arr);
+               zend_update_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL("contentDisposition"), arr TSRMLS_CC);
                zval_ptr_dtor(&arr);
        }
 }
@@ -850,7 +853,7 @@ PHP_METHOD(HttpEnvResponse, isCachedByEtag)
        char *header_name_str = NULL;
        int header_name_len = 0;
 
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!", &header_name_str, &header_name_len)) {
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) {
                if (!header_name_str || !header_name_len) {
                        header_name_str = "If-None-Match";
                        header_name_len = lenof("If-None-Match");
@@ -892,7 +895,7 @@ PHP_METHOD(HttpEnvResponse, send)
 
 PHP_MINIT_FUNCTION(http_env_response)
 {
-       PHP_HTTP_REGISTER_CLASS(http\\env, Response, http_env_response, php_http_message_class_entry, 0);
+       PHP_HTTP_REGISTER_CLASS(http\\Env, Response, http_env_response, php_http_message_class_entry, 0);
 
        zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CONTENT_DISPOSITION_NONE"), PHP_HTTP_CONTENT_DISPOSITION_NONE TSRMLS_CC);
        zend_declare_class_constant_long(php_http_env_response_class_entry, ZEND_STRL("CONTENT_DISPOSITION_INLINE"), PHP_HTTP_CONTENT_DISPOSITION_INLINE TSRMLS_CC);