X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_request_method_api.h;h=98787b65a81f6c17fff3eee9756d88180eba5f5a;hp=4fcf2be649ca4f02f0745edca508fcce28e41ba8;hb=refs%2Fheads%2Fv1.7.x;hpb=32e91737086db53bb1fd9ed9f79d693c43ec459f diff --git a/php_http_request_method_api.h b/php_http_request_method_api.h index 4fcf2be..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-2006, Michael Wallner | + | Copyright (c) 2004-2010, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -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, @@ -52,15 +54,7 @@ typedef enum { } 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 { - 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); @@ -70,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);