* Fixed crashes with repeated registering/unregisitering of request methods (noticed...

[m6w6/ext-http] / php_http_request_method_api.h

diff --git a/php_http_request_method_api.h b/php_http_request_method_api.h
index e93803a466b149a17f1c373f7ef922e07931cf82..f867d636ab6c142aeffe9153416b364f43c96831 100644 (file)
--- a/php_http_request_method_api.h
+++ b/php_http_request_method_api.h
@@ -54,15 +54,7 @@ typedef enum _http_request_method_t {
 } http_request_method;
 
 #define HTTP_MIN_REQUEST_METHOD (HTTP_NO_REQUEST_METHOD + 1)
-#define HTTP_CUSTOM_REQUEST_METHOD_START HTTP_MAX_REQUEST_METHOD
-
-typedef struct _http_request_method_entry_t {
-       char *name;
-       char *cnst;
-} http_request_method_entry;
-
 #define HTTP_STD_REQUEST_METHOD(m) ((m > HTTP_NO_REQUEST_METHOD) && (m < HTTP_MAX_REQUEST_METHOD))
-#define HTTP_CUSTOM_REQUEST_METHOD(m) (m - HTTP_MAX_REQUEST_METHOD)
 
 extern PHP_MINIT_FUNCTION(http_request_method);
 extern PHP_RINIT_FUNCTION(http_request_method);
@@ -72,7 +64,7 @@ extern PHP_RSHUTDOWN_FUNCTION(http_request_method);
 PHP_HTTP_API const char *_http_request_method_name(http_request_method m TSRMLS_DC);
 
 #define http_request_method_exists(u, l, c) _http_request_method_exists((u), (l), (c) TSRMLS_CC)
-PHP_HTTP_API int _http_request_method_exists(zend_bool by_name, http_request_method id, const char *name TSRMLS_DC);
+PHP_HTTP_API int _http_request_method_exists(int by_name, http_request_method id, const char *name TSRMLS_DC);
 
 #define http_request_method_register(m, l) _http_request_method_register((m), (l) TSRMLS_CC)
 PHP_HTTP_API int _http_request_method_register(const char *method, int method_name_len TSRMLS_DC);