* don't restart "default output handler"

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index 36211805e9781c3937997b0609301ce4c0cc1bcd..8690d9b54d309be5fe7875bb7e056c87797c8dbd 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -15,6 +15,7 @@
 
 /* $Id$ */
 
+#define _WINSOCKAPI_
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H
@@ -146,6 +147,8 @@ static int check_tzone(char *tzone);
 
 static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen);
 
+static int http_ob_stack_get(php_ob_buffer *, php_ob_buffer **);
+
 /* {{{ HAVE_CURL */
 #ifdef HTTP_HAVE_CURL
 #define http_curl_initbuf(m) _http_curl_initbuf((m) TSRMLS_CC)
@@ -202,7 +205,8 @@ static int http_sort_q(const void *a, const void *b TSRMLS_DC)
 static inline char *_http_etag(char **new_etag, const void *data_ptr,
        const size_t data_len, const http_send_mode data_mode TSRMLS_DC)
 {
-       char ssb_buf[127], digest[16];
+       char ssb_buf[127];
+       unsigned char digest[16];
        PHP_MD5_CTX ctx;
 
        PHP_MD5Init(&ctx);
@@ -289,8 +293,7 @@ static STATUS _http_send_chunk(const void *data, const size_t begin,
                break;
 
                case SEND_DATA:
-                       return len == php_body_write(
-                               Z_STRVAL_P((zval *) data) + begin, len TSRMLS_CC)
+                       return len == php_body_write(((char *)data) + begin, len TSRMLS_CC)
                                ? SUCCESS : FAILURE;
                break;
 
@@ -834,6 +837,21 @@ static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen)
 }
 /* }}} */
 
+/* {{{ static STATUS http_ob_stack_get(php_ob_buffer *, php_ob_buffer **) */
+static STATUS http_ob_stack_get(php_ob_buffer *o, php_ob_buffer **s)
+{
+       static int i = 0;
+       php_ob_buffer *b = emalloc(sizeof(php_ob_buffer));
+       b->handler_name = estrdup(o->handler_name);
+       b->buffer = estrndup(o->buffer, o->text_length);
+       b->text_length = o->text_length;
+       b->chunk_size = o->chunk_size;
+       b->erase = o->erase;
+       s[i++] = b;
+       return SUCCESS;
+}
+/* }}} */
+
 /* }}} internals */
 
 /* {{{ public API */
@@ -1094,6 +1112,44 @@ PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len,
 }
 /* }}} */
 
+/* {{{ STATUS http_start_ob_handler(php_output_handler_func_t, char *, uint, zend_bool) */
+PHP_HTTP_API STATUS _http_start_ob_handler(php_output_handler_func_t handler_func,
+       char *handler_name, uint chunk_size, zend_bool erase TSRMLS_DC)
+{
+       php_ob_buffer **stack;
+       int count, i;
+
+       if (count = OG(ob_nesting_level)) {
+               stack = ecalloc(sizeof(php_ob_buffer), count);
+
+               if (count > 1) {
+                       zend_stack_apply_with_argument(&OG(ob_buffers), ZEND_STACK_APPLY_BOTTOMUP,
+                               (int (*)(void *elem, void *)) http_ob_stack_get, stack);
+               }
+
+               if (count > 0) {
+                       http_ob_stack_get(&OG(active_ob_buffer), stack);
+               }
+
+               while (OG(ob_nesting_level)) {
+                       php_end_ob_buffer(0, 0 TSRMLS_CC);
+               }
+       }
+
+       php_ob_set_internal_handler(handler_func, chunk_size, handler_name, erase TSRMLS_CC);
+
+       for (i = 0; i < count; i++) {
+               php_ob_buffer *s = stack[i];
+               if (strcmp(s->handler_name, "default output handler")) {
+                       php_start_ob_buffer_named(s->handler_name, s->chunk_size, s->erase TSRMLS_CC);
+               }
+               php_body_write(s->buffer, s->text_length TSRMLS_CC);
+       }
+
+       return SUCCESS;
+}
+/* }}} */
+
 /* {{{ int http_modified_match(char *, int) */
 PHP_HTTP_API int _http_modified_match(const char *entry, const time_t t TSRMLS_DC)
 {
@@ -1168,6 +1224,11 @@ PHP_HTTP_API STATUS _http_send_etag(const char *etag,
        ret = http_send_header(etag_header);
        efree(etag_header);
 
+       if (!etag_len){
+               php_error_docref(NULL TSRMLS_CC,E_ERROR,
+                       "Sending empty Etag (previous: %s)\n", HTTP_G(etag));
+               return FAILURE;
+       }
        /* remember */
        if (HTTP_G(etag)) {
                efree(HTTP_G(etag));
@@ -1519,7 +1580,6 @@ PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const siz
 PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
        const http_send_mode data_mode TSRMLS_DC)
 {
-       char *new_etag = NULL;
        int is_range_request = http_is_range_request();
 
        if (!data_ptr) {
@@ -1528,24 +1588,24 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
 
        /* etag handling */
        if (HTTP_G(etag_started)) {
-               new_etag = (char *) emalloc(33);
-
-               /* never ever use the output to compute the ETag if http_send() is used */
+               char *etag = ecalloc(33, 1);
+               /* interrupt */
                HTTP_G(etag_started) = 0;
+               /* never ever use the output to compute the ETag if http_send() is used */
                php_end_ob_buffer(0, 0 TSRMLS_CC);
-               if (NULL == http_etag(&new_etag, data_ptr, data_size, data_mode)) {
-                       efree(new_etag);
+               if (NULL == http_etag(&etag, data_ptr, data_size, data_mode)) {
+                       efree(etag);
                        return FAILURE;
                }
 
                /* send 304 Not Modified if etag matches */
-               if ((!is_range_request) && http_etag_match("HTTP_IF_NONE_MATCH", new_etag)) {
-                       efree(new_etag);
+               if ((!is_range_request) && http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
+                       efree(etag);
                        return http_send_status(304);
                }
 
-               http_send_etag(new_etag, 32);
-               efree(new_etag);
+               http_send_etag(etag, 32);
+               efree(etag);
        }
 
        /* send 304 Not Modified if last-modified matches*/
@@ -1612,7 +1672,7 @@ PHP_HTTP_API STATUS _http_send_data(const zval *zdata TSRMLS_DC)
                return FAILURE;
        }
 
-       return http_send(zdata, Z_STRLEN_P(zdata), SEND_DATA);
+       return http_send(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata), SEND_DATA);
 }
 /* }}} */