- fix PHP4 build

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index eccffd8e0bc7ed4576f5958e7d88db1b41ec35e8..0118e6d1bb279a37733e994bbe592a4153c1c870 100644 (file)
--- a/http.c
+++ b/http.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -31,6 +31,7 @@
 #include "php_http_request_method_api.h"
 #ifdef HTTP_HAVE_CURL
 #      include "php_http_request_api.h"
+#      include "php_http_request_pool_api.h"
 #      include "php_http_request_datashare_api.h"
 #      ifdef HTTP_HAVE_PERSISTENT_HANDLES
 #              include "php_http_persistent_handle_api.h"
@@ -107,6 +108,7 @@ zend_function_entry http_functions[] = {
 #      ifdef HTTP_HAVE_PERSISTENT_HANDLES
        PHP_FE(http_persistent_handles_count, NULL)
        PHP_FE(http_persistent_handles_clean, NULL)
+       PHP_FE(http_persistent_handles_ident, NULL)
 #      endif
        PHP_FE(http_get, http_arg_pass_ref_3)
        PHP_FE(http_head, http_arg_pass_ref_3)
@@ -198,7 +200,6 @@ static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC)
        G->request.time = time(NULL);
 #endif
        G->send.buffer_size = 0;
-       G->send.not_found_404 = 1;
        G->read_post_data = 0;
 }
 
@@ -239,6 +240,13 @@ PHP_INI_MH(http_update_allowed_methods)
        http_check_allowed_methods(new_value, new_value_length);
        return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
 }
+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+PHP_INI_MH(http_update_persistent_handle_ident)
+{
+       HTTP_G->persistent.handles.ident.h = zend_hash_func(new_value, HTTP_G->persistent.handles.ident.l = new_value_length+1);
+       return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
+}
+#endif
 
 #ifndef ZEND_ENGINE_2
 #      define OnUpdateLong OnUpdateInt
@@ -264,6 +272,9 @@ PHP_INI_BEGIN()
        HTTP_PHP_INI_ENTRY("http.send.inflate.start_flags", "0", PHP_INI_ALL, OnUpdateLong, send.inflate.start_flags)
        HTTP_PHP_INI_ENTRY("http.send.deflate.start_auto", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, send.deflate.start_auto)
        HTTP_PHP_INI_ENTRY("http.send.deflate.start_flags", "0", PHP_INI_ALL, OnUpdateLong, send.deflate.start_flags)
+#endif
+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+       HTTP_PHP_INI_ENTRY("http.persistent.handles.ident", "GLOBAL", PHP_INI_ALL, http_update_persistent_handle_ident, persistent.handles.ident.s)
 #endif
        HTTP_PHP_INI_ENTRY("http.send.not_found_404", "1", PHP_INI_ALL, OnUpdateBool, send.not_found_404)
 #ifdef ZEND_ENGINE_2
@@ -289,6 +300,9 @@ PHP_MINIT_FUNCTION(http)
 #ifdef HTTP_HAVE_CURL
 #      ifdef HTTP_HAVE_PERSISTENT_HANDLES
                        (SUCCESS != PHP_MINIT_CALL(http_persistent_handle)) ||
+#              ifdef ZEND_ENGINE_2
+                       (SUCCESS != PHP_MINIT_CALL(http_request_pool)) ||
+#              endif
 #      endif
                        (SUCCESS != PHP_MINIT_CALL(http_request))       ||
 #      ifdef ZEND_ENGINE_2
@@ -431,6 +445,46 @@ PHP_MINFO_FUNCTION(http)
                        "http.chunked_decode, http.chunked_encode, http.deflate, http.inflate"
 #endif
                );
+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+               {
+                       phpstr s;
+                       HashTable *ht;
+                       HashPosition pos1, pos2;
+                       HashKey key1 = initHashKey(0), key2 = initHashKey(0);
+                       zval **val1, **val2;
+                       
+                       if ((ht = http_persistent_handle_statall()) && zend_hash_num_elements(ht)) {
+                               phpstr_init(&s);
+                               
+                               FOREACH_HASH_KEYVAL(pos1, ht, key1, val1) {
+                                       phpstr_append(&s, key1.str, key1.len-1);
+                                       phpstr_appends(&s, " (");
+                                       if (zend_hash_num_elements(Z_ARRVAL_PP(val1))) {
+                                               FOREACH_KEYVAL(pos2, *val1, key2, val2) {
+                                                       phpstr_append(&s, key2.str, key2.len-1);
+                                                       phpstr_appendf(&s, ":%ld, ", Z_LVAL_PP(val2));
+                                               }
+                                               PHPSTR_LEN(&s) -= 2;
+                                       } else {
+                                               phpstr_appends(&s, "0");
+                                       }
+                                       phpstr_appends(&s, "), ");
+                               }
+                               zend_hash_destroy(ht);
+                               FREE_HASHTABLE(ht);
+                               
+                               PHPSTR_LEN(&s) -= 2; /* get rid of last ", " */
+                               phpstr_fix(&s);
+                               
+                               php_info_print_table_row(2, "Persistent Handles", PHPSTR_VAL(&s));
+                               phpstr_dtor(&s);
+                       } else {
+                               php_info_print_table_row(2, "Persistent Handles", "none");
+                       }
+               }
+#else
+               php_info_print_table_row(2, "Persistent Handles", "disabled");
+#endif
        }
        php_info_print_table_end();
        
@@ -448,7 +502,7 @@ PHP_MINFO_FUNCTION(http)
 #else
                php_info_print_table_row(3, "libz", "disabled", "disabled");
 #endif
-#if defined(HTTP_HAVE_MAGIC) && !defined(WONKY)
+#if defined(HTTP_HAVE_MAGIC)
                php_info_print_table_row(3, "libmagic", "unknown", "unknown");
 #else
                php_info_print_table_row(3, "libmagic", "disabled", "disabled");