- example fixup

[m6w6/ext-http] / http_response_object.c

diff --git a/http_response_object.c b/http_response_object.c
index e60b555b78818a20489507c8fb828d5a633897f2..7de10dce104bd3e245a5ee0026fa59e969881ca7 100644 (file)
--- a/http_response_object.c
+++ b/http_response_object.c
@@ -38,6 +38,10 @@
 #include "php_http_cache_api.h"
 #include "php_http_headers_api.h"
 
+#ifdef HTTP_HAVE_MHASH
+#      include <mhash.h>
+#endif
+
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
 #define GET_STATIC_PROP(n)                     *GET_STATIC_PROP_EX(http_response_object_ce, n)
@@ -220,11 +224,11 @@ static inline void _http_response_object_declare_default_properties(TSRMLS_D)
        DCL_STATIC_PROP(PRIVATE, bool, sent, 0);
        DCL_STATIC_PROP(PRIVATE, bool, catch, 0);
        DCL_STATIC_PROP(PRIVATE, long, mode, -1);
+       DCL_STATIC_PROP(PRIVATE, long, stream, 0);
+       DCL_STATIC_PROP_N(PRIVATE, file);
+       DCL_STATIC_PROP_N(PRIVATE, data);
        DCL_STATIC_PROP(PROTECTED, bool, cache, 0);
        DCL_STATIC_PROP(PROTECTED, bool, gzip, 0);
-       DCL_STATIC_PROP(PROTECTED, long, stream, 0);
-       DCL_STATIC_PROP_N(PROTECTED, file);
-       DCL_STATIC_PROP_N(PROTECTED, data);
        DCL_STATIC_PROP_N(PROTECTED, eTag);
        DCL_STATIC_PROP(PROTECTED, long, lastModified, 0);
        DCL_STATIC_PROP_N(PROTECTED, cacheControl);
@@ -232,12 +236,31 @@ static inline void _http_response_object_declare_default_properties(TSRMLS_D)
        DCL_STATIC_PROP_N(PROTECTED, contentDisposition);
        DCL_STATIC_PROP(PROTECTED, long, bufferSize, HTTP_SENDBUF_SIZE);
        DCL_STATIC_PROP(PROTECTED, double, throttleDelay, 0.0);
-       DCL_STATIC_PROP_N(PROTECTED, headers);
+
+       DCL_CONST(long, "ETAG_MD5", HTTP_ETAG_MD5);
+       DCL_CONST(long, "ETAG_SHA1", HTTP_ETAG_SHA1);
+       
+#ifdef HTTP_HAVE_MHASH
+       {
+               int l, i, c = mhash_count();
+               
+               for (i = 0; i < c; ++i) {
+                       char const_name[256] = {0};
+                       const char *hash_name = mhash_get_hash_name_static(i);
+                       
+                       if (hash_name) {
+                               l = snprintf(const_name, 255, "ETAG_MHASH_%s", hash_name);
+                               zend_declare_class_constant_long(ce, const_name, l, i TSRMLS_CC);
+                       }
+               }
+       }
+#endif
 }
 
 static void _http_grab_response_headers(void *data, void *arg TSRMLS_DC)
 {
-       phpstr_appendf(PHPSTR(arg), "%s\r\n", ((sapi_header_struct *)data)->header);
+       phpstr_appendl(PHPSTR(arg), ((sapi_header_struct *)data)->header);
+       phpstr_appends(PHPSTR(arg), HTTP_CRLF);
 }
 
 /* ### USERLAND ### */
@@ -477,7 +500,6 @@ 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)
 {
@@ -998,14 +1020,9 @@ PHP_METHOD(HttpResponse, send)
  */
 PHP_METHOD(HttpResponse, capture)
 {
-       zval do_catch;
-
        NO_ARGS;
 
-       INIT_PZVAL(&do_catch);
-       ZVAL_LONG(&do_catch, 1);
-
-       SET_STATIC_PROP(catch, &do_catch);
+       UPD_STATIC_PROP(long, catch, 1);
 
        php_end_ob_buffers(0 TSRMLS_CC);
        php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC);