X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_request_method_api.h;h=98787b65a81f6c17fff3eee9756d88180eba5f5a;hp=88f79d53423c687c1832a42c35cc86d9e51896a8;hb=refs%2Fheads%2Fv1.7.x;hpb=edc84b40eb2c5be04492fa98fec5833a030782eb

diff --git a/php_http_request_method_api.h b/php_http_request_method_api.h
index 88f79d5..98787b6 100644
--- a/php_http_request_method_api.h
+++ b/php_http_request_method_api.h
@@ -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-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -15,7 +15,9 @@
 #ifndef PHP_HTTP_REQUEST_METHOD_API_H
 #define PHP_HTTP_REQUEST_METHOD_API_H
 
-typedef enum {
+typedef enum _http_request_method_t {
+	/* force the enum to be signed */
+	HTTP_NEG_REQUEST_METHOD	=-1,
 	HTTP_NO_REQUEST_METHOD	= 0,
 	/* HTTP/1.1 */
 	HTTP_GET				= 1,
@@ -51,23 +53,24 @@ typedef enum {
 	HTTP_MAX_REQUEST_METHOD	= 28
 } http_request_method;
 
+#define HTTP_MIN_REQUEST_METHOD (HTTP_NO_REQUEST_METHOD + 1)
 #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);
 extern PHP_RSHUTDOWN_FUNCTION(http_request_method);
 
 #define http_request_method_name(m) _http_request_method_name((m) TSRMLS_CC)
 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 ulong _http_request_method_exists(zend_bool by_name, ulong 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 ulong _http_request_method_register(const char *method, size_t method_name_len TSRMLS_DC);
+PHP_HTTP_API int _http_request_method_register(const char *method, int method_name_len TSRMLS_DC);
 
 #define http_request_method_unregister(mn) _http_request_method_unregister((mn) TSRMLS_CC)
-PHP_HTTP_API STATUS _http_request_method_unregister(ulong method TSRMLS_DC);
+PHP_HTTP_API STATUS _http_request_method_unregister(int method TSRMLS_DC);
 
 #endif