X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http.c;h=f5f66a7f846e599421edc7035669f15b3cd7dcb5;hb=5aa958980652d72433ba8e9e500b8dfd123d56a1;hp=14b25bcf49ab67e3cc2a52cdc554aa8af0a5527f;hpb=b2e9ffe535660f5de2ec850ddc0dd6e99a34724d;p=m6w6%2Fext-http

diff --git a/http.c b/http.c
index 14b25bc..f5f66a7 100644
--- 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-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -29,7 +29,7 @@
 #include "php_http_api.h"
 #include "php_http_send_api.h"
 #include "php_http_cache_api.h"
-#include "php_http_headers_api.h"
+#include "php_http_send_api.h"
 #include "php_http_message_api.h"
 #include "php_http_request_method_api.h"
 #ifdef HTTP_HAVE_CURL
@@ -129,6 +129,9 @@ static zend_module_dep http_module_dep[] = {
 #	endif
 #	ifdef HTTP_HAVE_EXT_HASH
 	ZEND_MOD_REQUIRED("hash")
+#	endif
+#	ifdef HAVE_PHP_SESSION
+	ZEND_MOD_REQUIRED("session")
 #	endif
 	{NULL, NULL, NULL, 0}
 };
@@ -167,7 +170,6 @@ static void http_globals_init_once(zend_http_globals *G)
 static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC)
 {
 	G->send.buffer_size = HTTP_SENDBUF_SIZE;
-	zend_hash_init(&G->request.methods.custom, 0, NULL, ZVAL_PTR_DTOR, 0);
 }
 
 #define http_globals_free(g) _http_globals_free((g) TSRMLS_CC)
@@ -175,7 +177,6 @@ static inline void _http_globals_free(zend_http_globals *G TSRMLS_DC)
 {
 	STR_SET(G->send.content_type, NULL);
 	STR_SET(G->send.unquoted_etag, NULL);
-	zend_hash_destroy(&G->request.methods.custom);
 }
 /* }}} */
 
@@ -216,9 +217,9 @@ PHP_INI_BEGIN()
 #endif
 	HTTP_PHP_INI_ENTRY("http.force_exit", "1", PHP_INI_ALL, OnUpdateBool, force_exit)
 #ifdef HTTP_HAVE_ZLIB
-	HTTP_PHP_INI_ENTRY("http.ob_inflate_auto", "0", PHP_INI_ALL, OnUpdateBool, send.inflate.start_auto)
+	HTTP_PHP_INI_ENTRY("http.ob_inflate_auto", "0", PHP_INI_PERDIR, OnUpdateBool, send.inflate.start_auto)
 	HTTP_PHP_INI_ENTRY("http.ob_inflate_flags", "0", PHP_INI_ALL, OnUpdateLong, send.inflate.start_flags)
-	HTTP_PHP_INI_ENTRY("http.ob_deflate_auto", "0", PHP_INI_ALL, OnUpdateBool, send.deflate.start_auto)
+	HTTP_PHP_INI_ENTRY("http.ob_deflate_auto", "0", PHP_INI_PERDIR, OnUpdateBool, send.deflate.start_auto)
 	HTTP_PHP_INI_ENTRY("http.ob_deflate_flags", "0", PHP_INI_ALL, OnUpdateLong, send.deflate.start_flags)
 #endif
 PHP_INI_END()
@@ -234,7 +235,7 @@ PHP_MINIT_FUNCTION(http)
 	REGISTER_INI_ENTRIES();
 	
 	if (	(SUCCESS != PHP_MINIT_CALL(http_support))	||
-			(SUCCESS != PHP_MINIT_CALL(http_headers))	||
+			(SUCCESS != PHP_MINIT_CALL(http_send))		||
 #ifdef HTTP_HAVE_CURL
 			(SUCCESS != PHP_MINIT_CALL(http_request))	||
 #endif /* HTTP_HAVE_CURL */
@@ -290,11 +291,13 @@ PHP_RINIT_FUNCTION(http)
 
 	http_globals_init(HTTP_GLOBALS);
 
+	if (	(SUCCESS != PHP_RINIT_CALL(http_request_method))
 #ifdef HTTP_HAVE_ZLIB	
-	if (SUCCESS != PHP_RINIT_CALL(http_encoding)) {
+		||	(SUCCESS != PHP_RINIT_CALL(http_encoding))
+#endif
+	) {
 		return FAILURE;
 	}
-#endif
 	
 	return SUCCESS;
 }
@@ -305,14 +308,11 @@ PHP_RSHUTDOWN_FUNCTION(http)
 {
 	STATUS status = SUCCESS;
 	
-	if (
+	if (	(SUCCESS != PHP_RSHUTDOWN_CALL(http_request_method))
 #ifdef HTTP_HAVE_ZLIB
-		(SUCCESS != PHP_RSHUTDOWN_CALL(http_encoding)) ||
+		||	(SUCCESS != PHP_RSHUTDOWN_CALL(http_encoding))
 #endif
-#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
-		(SUCCESS != PHP_RSHUTDOWN_CALL(http_request_method)) ||
-#endif
-	0) {
+	) {
 		status = FAILURE;
 	}
 	
@@ -338,6 +338,10 @@ PHP_MINFO_FUNCTION(http)
 			"HttpRequest, "
 			"HttpRequestPool, "
 #	endif
+#	ifdef HTTP_HAVE_ZLIB
+			"HttpDeflateStream, "
+			"HttpInflateStream, "
+#	endif
 #	ifndef WONKY
 			"HttpResponse"
 #	endif
@@ -371,19 +375,20 @@ PHP_MINFO_FUNCTION(http)
 	php_info_print_table_start();
 	php_info_print_table_colspan_header(2, "Request Methods");
 	{
-		unsigned i;
-		HashPosition pos;
-		zval **custom_method;
+		int i;
+		getGlobals(G);
+		struct _entry {char *name; char *cnst;} *entry;
 		phpstr *known_request_methods = phpstr_new();
 		phpstr *custom_request_methods = phpstr_new();
 
-		for (i = HTTP_NO_REQUEST_METHOD+1; i < HTTP_MAX_REQUEST_METHOD; ++i) {
+		for (i = HTTP_MIN_REQUEST_METHOD; i < HTTP_MAX_REQUEST_METHOD; ++i) {
 			phpstr_appendl(known_request_methods, http_request_method_name(i));
 			phpstr_appends(known_request_methods, ", ");
 		}
-		FOREACH_HASH_VAL(pos, &HTTP_G(request).methods.custom, custom_method) {
-			phpstr_append(custom_request_methods, Z_STRVAL_PP(custom_method), Z_STRLEN_PP(custom_method));
-			phpstr_appends(custom_request_methods, ", ");
+		for (i = 0; i < G->request.methods.custom.count; ++i) {
+			if ((entry = ((struct _entry **) G->request.methods.custom.entries)[i])) {
+				phpstr_appendf(custom_request_methods, "%s, ", entry->name);
+			}
 		}
 
 		phpstr_append(known_request_methods, PHPSTR_VAL(custom_request_methods), PHPSTR_LEN(custom_request_methods));