X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_method_api.c;h=be19f492ce9832609e4028e9c83a8724d2283862;hp=39c9aceb526a489bcce1d11c581d030e66dac131;hb=d5b4a39bf319a580eb7310afb691c81e44e52d71;hpb=fcf85b3a8cb603e8673058ad6f7c845e8c378060

diff --git a/http_request_method_api.c b/http_request_method_api.c
index 39c9ace..be19f49 100644
--- a/http_request_method_api.c
+++ b/http_request_method_api.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -35,7 +32,7 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 
 /* {{{ char *http_request_methods[] */
 static const char *const http_request_methods[] = {
-	"UNKOWN",
+	"UNKNOWN",
 	/* HTTP/1.1 */
 	"GET",
 	"HEAD",
@@ -71,7 +68,7 @@ static const char *const http_request_methods[] = {
 };
 /* }}} */
 
-STATUS _http_request_method_global_init(INIT_FUNC_ARGS)
+PHP_MINIT_FUNCTION(http_request_method)
 {
 	/* HTTP/1.1 */
 	HTTP_LONG_CONSTANT("HTTP_METH_GET", HTTP_GET);
@@ -108,6 +105,17 @@ STATUS _http_request_method_global_init(INIT_FUNC_ARGS)
 	return SUCCESS;
 }
 
+PHP_RSHUTDOWN_FUNCTION(http_request_method)
+{
+	int i, c = zend_hash_num_elements(&HTTP_G(request).methods.custom);
+	
+	for (i = 0; i < c; ++i) {
+		http_request_method_unregister(HTTP_MAX_REQUEST_METHOD + i);
+	}
+	
+	return SUCCESS;
+}
+
 /* {{{ char *http_request_method_name(http_request_method) */
 PHP_HTTP_API const char *_http_request_method_name(http_request_method m TSRMLS_DC)
 {
@@ -125,8 +133,8 @@ PHP_HTTP_API const char *_http_request_method_name(http_request_method m TSRMLS_
 }
 /* }}} */
 
-/* {{{ unsigned long http_request_method_exists(zend_bool, unsigned long, char *) */
-PHP_HTTP_API unsigned long _http_request_method_exists(zend_bool by_name, unsigned long id, const char *name TSRMLS_DC)
+/* {{{ ulong http_request_method_exists(zend_bool, ulong, char *) */
+PHP_HTTP_API ulong _http_request_method_exists(zend_bool by_name, ulong id, const char *name TSRMLS_DC)
 {
 	if (by_name) {
 		unsigned i;
@@ -154,30 +162,29 @@ PHP_HTTP_API unsigned long _http_request_method_exists(zend_bool by_name, unsign
 }
 /* }}} */
 
-/* {{{ unsigned long http_request_method_register(char *) */
-PHP_HTTP_API unsigned long _http_request_method_register(const char *method_name TSRMLS_DC)
+/* {{{ ulong http_request_method_register(char *) */
+PHP_HTTP_API ulong _http_request_method_register(const char *method_name, size_t method_name_len TSRMLS_DC)
 {
 	zval array;
 	char *http_method, *method;
-	int i, method_len = strlen(method_name);
-	unsigned long meth_num = HTTP_G(request).methods.custom.nNextFreeElement + HTTP_MAX_REQUEST_METHOD;
+	ulong i, meth_num = HTTP_G(request).methods.custom.nNextFreeElement + HTTP_MAX_REQUEST_METHOD;
 
-	method = emalloc(method_len + 1);
-	for (i = 0; i < method_len; ++i) {
+	method = emalloc(method_name_len + 1);
+	for (i = 0; i < method_name_len; ++i) {
 		method[i] = toupper(method_name[i]);
 	}
-	method[method_len] = '\0';
+	method[method_name_len] = '\0';
 	
 	INIT_ZARR(array, &HTTP_G(request).methods.custom);
-	add_next_index_stringl(&array, method, method_len, 0);
+	add_next_index_stringl(&array, method, method_name_len, 0);
 
-	method_len = spprintf(&http_method, 0, "HTTP_METH_%s", method);
-	zend_register_long_constant(http_method, method_len + 1, meth_num, CONST_CS, http_module_number TSRMLS_CC);
+	method_name_len = spprintf(&http_method, 0, "HTTP_METH_%s", method);
+	zend_register_long_constant(http_method, method_name_len + 1, meth_num, CONST_CS, http_module_number TSRMLS_CC);
 	efree(http_method);
 	
 #if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) && !defined(WONKY)
-	method_len = spprintf(&http_method, 0, "METH_%s", method);
-	zend_declare_class_constant_long(http_request_object_ce, http_method, method_len, meth_num TSRMLS_CC);
+	method_name_len = spprintf(&http_method, 0, "METH_%s", method);
+	zend_declare_class_constant_long(http_request_object_ce, http_method, method_name_len, meth_num TSRMLS_CC);
 	efree(http_method);
 #endif
 
@@ -186,7 +193,7 @@ PHP_HTTP_API unsigned long _http_request_method_register(const char *method_name
 /* }}} */
 
 /* {{{ STATUS http_request_method_unregister(usngigned long) */
-PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_DC)
+PHP_HTTP_API STATUS _http_request_method_unregister(ulong method TSRMLS_DC)
 {
 	zval **zmethod;
 	char *http_method;