- ditch warnings

[m6w6/ext-http] / http_response_object.c

diff --git a/http_response_object.c b/http_response_object.c
index d21225a3c6f6f8399ca4b2f2db54c8ae0cea0b72..84e979c7610992381283cf730836765a6d2dace6 100644 (file)
--- a/http_response_object.c
+++ b/http_response_object.c
@@ -21,7 +21,10 @@
 #endif
 #include "php.h"
 
 #endif
 #include "php.h"
 

-#ifdef ZEND_ENGINE_2
+#include "missing.h"
+
+/* broken static properties in PHP 5.0 */
+#if defined(ZEND_ENGINE_2) && !defined(WONKY)

 
 #include "SAPI.h"
 #include "php_ini.h"
 
 #include "SAPI.h"
 #include "php_ini.h"


@@ -34,8 +37,6 @@
 #include "php_http_send_api.h"
 #include "php_http_cache_api.h"
 
 #include "php_http_send_api.h"
 #include "php_http_cache_api.h"
 

-#include "missing.h"
-

 ZEND_EXTERN_MODULE_GLOBALS(http);
 
 #define GET_STATIC_PROP(n)                     *GET_STATIC_PROP_EX(http_response_object_ce, n)
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
 #define GET_STATIC_PROP(n)                     *GET_STATIC_PROP_EX(http_response_object_ce, n)


@@ -88,6 +89,11 @@ HTTP_BEGIN_ARGS(setContentType, 1)
        HTTP_ARG_VAL(content_type, 0)
 HTTP_END_ARGS;
 
        HTTP_ARG_VAL(content_type, 0)
 HTTP_END_ARGS;
 

+HTTP_BEGIN_ARGS(guessContentType, 1)
+       HTTP_ARG_VAL(magic_file, 0)
+       HTTP_ARG_VAL(magic_mode, 0)
+HTTP_END_ARGS;
+

 HTTP_EMPTY_ARGS(getContentDisposition, 0);
 HTTP_BEGIN_ARGS(setContentDisposition, 1)
        HTTP_ARG_VAL(filename, 0)
 HTTP_EMPTY_ARGS(getContentDisposition, 0);
 HTTP_BEGIN_ARGS(setContentDisposition, 1)
        HTTP_ARG_VAL(filename, 0)


@@ -142,8 +148,6 @@ HTTP_EMPTY_ARGS(getRequestBody, 0);
 #define http_response_object_declare_default_properties() _http_response_object_declare_default_properties(TSRMLS_C)
 static inline void _http_response_object_declare_default_properties(TSRMLS_D);
 
 #define http_response_object_declare_default_properties() _http_response_object_declare_default_properties(TSRMLS_C)
 static inline void _http_response_object_declare_default_properties(TSRMLS_D);
 

-HashTable http_response_statics;
-

 zend_class_entry *http_response_object_ce;
 zend_function_entry http_response_object_fe[] = {
 
 zend_class_entry *http_response_object_ce;
 zend_function_entry http_response_object_fe[] = {
 


@@ -161,6 +165,8 @@ zend_function_entry http_response_object_fe[] = {
 
        HTTP_RESPONSE_ME(setContentType, ZEND_ACC_PUBLIC)
        HTTP_RESPONSE_ME(getContentType, ZEND_ACC_PUBLIC)
 
        HTTP_RESPONSE_ME(setContentType, ZEND_ACC_PUBLIC)
        HTTP_RESPONSE_ME(getContentType, ZEND_ACC_PUBLIC)

+       
+       HTTP_RESPONSE_ME(guessContentType, ZEND_ACC_PUBLIC)

 
        HTTP_RESPONSE_ME(setCache, ZEND_ACC_PUBLIC)
        HTTP_RESPONSE_ME(getCache, ZEND_ACC_PUBLIC)
 
        HTTP_RESPONSE_ME(setCache, ZEND_ACC_PUBLIC)
        HTTP_RESPONSE_ME(getCache, ZEND_ACC_PUBLIC)


@@ -194,7 +200,7 @@ zend_function_entry http_response_object_fe[] = {
        HTTP_RESPONSE_ALIAS(getRequestHeaders, http_get_request_headers)
        HTTP_RESPONSE_ALIAS(getRequestBody, http_get_request_body)
 
        HTTP_RESPONSE_ALIAS(getRequestHeaders, http_get_request_headers)
        HTTP_RESPONSE_ALIAS(getRequestBody, http_get_request_body)
 

-       {NULL, NULL, NULL}
+       EMPTY_FUNCTION_ENTRY

 };
 
 void _http_response_object_init(INIT_FUNC_ARGS)
 };
 
 void _http_response_object_init(INIT_FUNC_ARGS)


@@ -290,7 +296,7 @@ PHP_METHOD(HttpResponse, getHeader)
                array_init(return_value);
                array_copy(headers, return_value);
        } else if (SUCCESS == zend_hash_find(Z_ARRVAL_P(headers), name, name_len + 1, (void **) &header)) {
                array_init(return_value);
                array_copy(headers, return_value);
        } else if (SUCCESS == zend_hash_find(Z_ARRVAL_P(headers), name, name_len + 1, (void **) &header)) {

-               RETURN_ZVAL(*header, ZVAL_PTR_DTOR, 1);
+               RETURN_ZVAL(*header, 1, 0);

        } else {
                RETURN_NULL();
        }
        } else {
                RETURN_NULL();
        }


@@ -335,7 +341,7 @@ PHP_METHOD(HttpResponse, getCache)
 
 /* {{{ proto static bool HttpResponse::setGzip(bool gzip)
  *
 
 /* {{{ proto static bool HttpResponse::setGzip(bool gzip)
  *

- * Enable on-thy-fly gzipping of the sent entity. NOT IMPLEMENTED YET.
+ * Enable on-thy-fly gzipping of the sent entity.

  */
 PHP_METHOD(HttpResponse, setGzip)
 {
  */
 PHP_METHOD(HttpResponse, setGzip)
 {


@@ -441,6 +447,52 @@ PHP_METHOD(HttpResponse, getContentType)
 }
 /* }}} */
 
 }
 /* }}} */
 

+/* {{{ proto static string HttpResponse::guessContentType(string magic_file[, long magic_mode])
+ *
+ * Attempts to guess the content type of supplied payload through libmagic.
+ * See docs/KnownIssues.txt! 
+ */
+PHP_METHOD(HttpResponse, guessContentType)
+{
+       char *magic_file, *ct = NULL;
+       int magic_file_len;
+       long magic_mode = 0;
+       
+       RETVAL_NULL();
+       
+       SET_EH_THROW_HTTP();
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &magic_file, &magic_file_len, &magic_mode)) {
+               switch (Z_LVAL_P(GET_STATIC_PROP(mode))) {
+                       case SEND_DATA:
+                       {
+                               zval *data = GET_STATIC_PROP(data);
+                               ct = http_guess_content_type(magic_file, magic_mode, Z_STRVAL_P(data), Z_STRLEN_P(data), SEND_DATA);
+                       }
+                       break;
+                       
+                       case SEND_RSRC:
+                       {
+                               php_stream *s;
+                               zval *z = GET_STATIC_PROP(stream);
+                               z->type = IS_RESOURCE;
+                               php_stream_from_zval(s, &z);
+                               ct = http_guess_content_type(magic_file, magic_mode, s, 0, SEND_RSRC);
+                       }
+                       break;
+                       
+                       default:
+                               ct = http_guess_content_type(magic_file, magic_mode, Z_STRVAL_P(GET_STATIC_PROP(file)), 0, -1);
+                       break;
+               }
+               if (ct) {
+                       UPD_STATIC_PROP(string, contentType, ct);
+                       RETVAL_STRING(ct, 0);
+               }
+       }
+       SET_EH_NORMAL();
+}
+/* }}} */
+

 /* {{{ proto static bool HttpResponse::setContentDisposition(string filename[, bool inline = false])
  *
  * Set the Content-Disposition of the sent entity.  This setting aims to suggest
 /* {{{ proto static bool HttpResponse::setContentDisposition(string filename[, bool inline = false])
  *
  * Set the Content-Disposition of the sent entity.  This setting aims to suggest


@@ -650,18 +702,23 @@ PHP_METHOD(HttpResponse, setStream)
 {
        zval *the_stream;
        php_stream *the_real_stream;
 {
        zval *the_stream;
        php_stream *the_real_stream;

+       php_stream_statbuf ssb;

 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &the_stream)) {
                RETURN_FALSE;
        }
 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &the_stream)) {
                RETURN_FALSE;
        }

-       zend_list_addref(Z_LVAL_P(the_stream));
+       

        php_stream_from_zval(the_real_stream, &the_stream);
        php_stream_from_zval(the_real_stream, &the_stream);

+       if (php_stream_stat(the_real_stream, &ssb)) {
+               RETURN_FALSE;
+       }

 
        if (    (SUCCESS != UPD_STATIC_PROP(long, stream, Z_LVAL_P(the_stream))) ||
                        (SUCCESS != UPD_STATIC_PROP(long, mode, SEND_RSRC))) {
                RETURN_FALSE;
        }
 
        if (    (SUCCESS != UPD_STATIC_PROP(long, stream, Z_LVAL_P(the_stream))) ||
                        (SUCCESS != UPD_STATIC_PROP(long, mode, SEND_RSRC))) {
                RETURN_FALSE;
        }

-
+       zend_list_addref(Z_LVAL_P(the_stream));
+       

        if (!(Z_LVAL_P(GET_STATIC_PROP(lastModified)) > 0)) {
                UPD_STATIC_PROP(long, lastModified, http_last_modified(the_real_stream, SEND_RSRC));
        }
        if (!(Z_LVAL_P(GET_STATIC_PROP(lastModified)) > 0)) {
                UPD_STATIC_PROP(long, lastModified, http_last_modified(the_real_stream, SEND_RSRC));
        }


@@ -697,11 +754,16 @@ PHP_METHOD(HttpResponse, setFile)
 {
        char *the_file;
        int file_len;
 {
        char *the_file;
        int file_len;

+       php_stream_statbuf ssb;

 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &the_file, &file_len)) {
                RETURN_FALSE;
        }
        
 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &the_file, &file_len)) {
                RETURN_FALSE;
        }
        

+       if (php_stream_stat_path(the_file, &ssb)) {
+               RETURN_FALSE;
+       }
+       

        if (    (SUCCESS != UPD_STATIC_PROP(string, file, the_file)) ||
                        (SUCCESS != UPD_STATIC_PROP(long, mode, -1))) {
                RETURN_FALSE;
        if (    (SUCCESS != UPD_STATIC_PROP(string, file, the_file)) ||
                        (SUCCESS != UPD_STATIC_PROP(long, mode, -1))) {
                RETURN_FALSE;


@@ -777,7 +839,6 @@ PHP_METHOD(HttpResponse, send)
 
                MAKE_STD_ZVAL(the_data);
                php_ob_get_buffer(the_data TSRMLS_CC);
 
                MAKE_STD_ZVAL(the_data);
                php_ob_get_buffer(the_data TSRMLS_CC);

-

                SET_STATIC_PROP(data, the_data);
                ZVAL_LONG(GET_STATIC_PROP(mode), SEND_DATA);
 
                SET_STATIC_PROP(data, the_data);
                ZVAL_LONG(GET_STATIC_PROP(mode), SEND_DATA);
 


@@ -786,6 +847,7 @@ PHP_METHOD(HttpResponse, send)
                        UPD_STATIC_PROP(string, eTag, etag);
                        efree(etag);
                }
                        UPD_STATIC_PROP(string, eTag, etag);
                        efree(etag);
                }

+               zval_ptr_dtor(&the_data);

 
                clean_ob = 1;
        }
 
                clean_ob = 1;
        }


@@ -811,11 +873,11 @@ PHP_METHOD(HttpResponse, send)
                                        zval **data;
 
                                        FOREACH_VAL(*value, data) {
                                        zval **data;
 
                                        FOREACH_VAL(*value, data) {

-                                               http_send_header_ex(name, strlen(name), Z_STRVAL_PP(data), Z_STRLEN_PP(data), first);
+                                               http_send_header_ex(name, strlen(name), Z_STRVAL_PP(data), Z_STRLEN_PP(data), first, NULL);

                                                first = 0;
                                        }
                                } else {
                                                first = 0;
                                        }
                                } else {

-                                       http_send_header_ex(name, strlen(name), Z_STRVAL_PP(value), Z_STRLEN_PP(value), 1);
+                                       http_send_header_ex(name, strlen(name), Z_STRVAL_PP(value), Z_STRLEN_PP(value), 1, NULL);

                                }
                                name = NULL;
                        }
                                }
                                name = NULL;
                        }


@@ -862,7 +924,7 @@ PHP_METHOD(HttpResponse, send)
        {
                zval *cd = GET_STATIC_PROP(contentDisposition);
                if (Z_STRLEN_P(cd)) {
        {
                zval *cd = GET_STATIC_PROP(contentDisposition);
                if (Z_STRLEN_P(cd)) {

-                       http_send_header_ex("Content-Disposition", lenof("Content-Disposition"), Z_STRVAL_P(cd), Z_STRLEN_P(cd), 1);
+                       http_send_header_ex("Content-Disposition", lenof("Content-Disposition"), Z_STRVAL_P(cd), Z_STRLEN_P(cd), 1, NULL);

                }
        }
 
                }
        }
 


@@ -879,7 +941,7 @@ PHP_METHOD(HttpResponse, send)
                        case SEND_DATA:
                        {
                                zval *zdata = GET_STATIC_PROP(data);
                        case SEND_DATA:
                        {
                                zval *zdata = GET_STATIC_PROP(data);

-                               RETURN_SUCCESS(http_send_data(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata)));
+                               RETURN_SUCCESS(http_send_data_ex(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata), 1));

                        }
 
                        case SEND_RSRC:
                        }
 
                        case SEND_RSRC:


@@ -888,12 +950,12 @@ PHP_METHOD(HttpResponse, send)
                                zval *the_stream = GET_STATIC_PROP(stream);
                                the_stream->type = IS_RESOURCE;
                                php_stream_from_zval(the_real_stream, &the_stream);
                                zval *the_stream = GET_STATIC_PROP(stream);
                                the_stream->type = IS_RESOURCE;
                                php_stream_from_zval(the_real_stream, &the_stream);

-                               RETURN_SUCCESS(http_send_stream(the_real_stream));
+                               RETURN_SUCCESS(http_send_stream_ex(the_real_stream, 0, 1));

                        }
 
                        default:
                        {
                        }
 
                        default:
                        {

-                               RETURN_SUCCESS(http_send_file(Z_STRVAL_P(GET_STATIC_PROP(file))));
+                               RETURN_SUCCESS(http_send_file_ex(Z_STRVAL_P(GET_STATIC_PROP(file)), 1));

                        }
                }
        }
                        }
                }
        }


@@ -910,28 +972,24 @@ PHP_METHOD(HttpResponse, send)
  * HttpResponse::setCache(true);
  * HttpResponse::capture();
  * // script follows
  * HttpResponse::setCache(true);
  * HttpResponse::capture();
  * // script follows

- * // note that you need to call
- * HttpResponse::send();
- * // at the end of the script unless 
- * // you use PHP-5.1 or greater

  * ?>
  * </pre>
  */
 PHP_METHOD(HttpResponse, capture)
 {
  * ?>
  * </pre>
  */
 PHP_METHOD(HttpResponse, capture)
 {

-       zval *do_catch;
+       zval do_catch;

 
        NO_ARGS;
 
 
        NO_ARGS;
 

-       MAKE_STD_ZVAL(do_catch);
-       ZVAL_LONG(do_catch, 1);
+       INIT_PZVAL(&do_catch);
+       ZVAL_LONG(&do_catch, 1);

 
 

-       SET_STATIC_PROP(catch, do_catch);
+       SET_STATIC_PROP(catch, &do_catch);

 
        php_end_ob_buffers(0 TSRMLS_CC);
        php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC);
 
 
        php_end_ob_buffers(0 TSRMLS_CC);
        php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC);
 

-#if (PHP_MAJOR_VERSION > 5) || (PHP_MINOR_VERSION > 0)
+#ifndef WONKY

        /* register shutdown function --
                messing around with ob and headers only works in PHP-5.1 or greater */
        {
        /* register shutdown function --
                messing around with ob and headers only works in PHP-5.1 or greater */
        {


@@ -953,7 +1011,7 @@ PHP_METHOD(HttpResponse, capture)
 }
 /* }}} */
 
 }
 /* }}} */
 

-#endif /* ZEND_ENGINE_2 */
+#endif /* ZEND_ENGINE_2 && !WONKY */

 
 /*
  * Local variables:
 
 /*
  * Local variables: