X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_method_api.c;h=d9d3370c41c79f49fc14d54055f48293bced853d;hp=1d73ddda5b4a447acea1b2f7ea54ebdfe4d9485a;hb=9c3bc2cb7b5217a91a8defbbe7c5c20f33938d59;hpb=2f39230d83bdf816dcae52c7e5a1b019347f0e7b

diff --git a/http_request_method_api.c b/http_request_method_api.c
index 1d73ddd..d9d3370 100644
--- a/http_request_method_api.c
+++ b/http_request_method_api.c
@@ -103,6 +103,20 @@ PHP_RINIT_FUNCTION(http_request_method)
 {
 	HTTP_G->request.methods.custom.entries = ecalloc(1, sizeof(http_request_method_entry *));
 	
+	if (HTTP_G->request.methods.custom.ini && *HTTP_G->request.methods.custom.ini) {
+		HashPosition pos;
+		HashTable methods;
+		zval **data;
+	
+		zend_hash_init(&methods, 0, NULL, ZVAL_PTR_DTOR, 0);
+		http_parse_params(HTTP_G->request.methods.custom.ini, HTTP_PARAMS_DEFAULT, &methods);
+		FOREACH_HASH_VAL(pos, &methods, data) {
+			if (Z_TYPE_PP(data) == IS_STRING) {
+				http_request_method_register(Z_STRVAL_PP(data), Z_STRLEN_PP(data));
+			}
+		}
+		zend_hash_destroy(&methods);
+	}
 	return SUCCESS;
 }
 
@@ -177,7 +191,7 @@ PHP_HTTP_API int _http_request_method_register(const char *method_name, int meth
 	char *http_method, *method, *mconst;
 	http_request_method_entry **ptr = HTTP_G->request.methods.custom.entries;
 	
-	if (!isalpha(*method_name)) {
+	if (!HTTP_IS_CTYPE(alpha, *method_name)) {
 		http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Request method does not start with a character (%s)", method_name);
 		return 0;
 	}
@@ -197,13 +211,13 @@ PHP_HTTP_API int _http_request_method_register(const char *method_name, int meth
 				break;
 			
 			default:
-				if (!isalnum(method_name[i])) {
+				if (!HTTP_IS_CTYPE(alnum, method_name[i])) {
 					efree(method);
 					efree(mconst);
 					http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Request method contains illegal characters (%s)", method_name);
 					return 0;
 				}
-				mconst[i] = method[i] = toupper(method_name[i]);
+				mconst[i] = method[i] = HTTP_TO_CTYPE(upper, method_name[i]);
 				break;
 		}
 	}
@@ -246,7 +260,7 @@ PHP_HTTP_API STATUS _http_request_method_unregister(int method TSRMLS_DC)
 	if (	(HTTP_CUSTOM_REQUEST_METHOD(method) < 0) ||
 			(HTTP_CUSTOM_REQUEST_METHOD(method) > HTTP_G->request.methods.custom.count) ||
 			(!ptr[HTTP_CUSTOM_REQUEST_METHOD(method)])) {
-		http_error_ex(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Custom request method with id %lu does not exist", method);
+		http_error_ex(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Custom request method with id %d does not exist", method);
 		return FAILURE;
 	}