X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_env.c;h=9fd8e59e74b67f7fa15d41e9920ebb44ce5ab511;hp=a0232d201e174141fb0061cf7e8a46040e137735;hb=e0dfcd720b949fe1883e9a5b185d0d255a222707;hpb=a5e1d0cdf87105d3577ca2db9cb2c5c380062c10

diff --git a/php_http_env.c b/php_http_env.c
index a0232d2..9fd8e59 100644
--- a/php_http_env.c
+++ b/php_http_env.c
@@ -587,9 +587,9 @@ PHP_HTTP_BEGIN_ARGS(negotiate, 2)
 	PHP_HTTP_ARG_VAL(result_array, 1)
 PHP_HTTP_END_ARGS;
 
-PHP_HTTP_EMPTY_ARGS(persistentHandlesStat);
+PHP_HTTP_EMPTY_ARGS(statPersistentHandles);
 
-PHP_HTTP_BEGIN_ARGS(persistentHandlesClean, 0)
+PHP_HTTP_BEGIN_ARGS(cleanPersistentHandles, 0)
 	PHP_HTTP_ARG_VAL(name, 0)
 	PHP_HTTP_ARG_VAL(ident, 0)
 PHP_HTTP_END_ARGS;
@@ -611,16 +611,16 @@ zend_function_entry php_http_env_method_entry[] = {
 	PHP_HTTP_ENV_ME(negotiateCharset)
 	PHP_HTTP_ENV_ME(negotiate)
 
-	PHP_HTTP_ENV_ME(persistentHandlesStat)
-	PHP_HTTP_ENV_ME(persistentHandlesClean)
+	PHP_HTTP_ENV_ME(statPersistentHandles)
+	PHP_HTTP_ENV_ME(cleanPersistentHandles)
 
 	EMPTY_FUNCTION_ENTRY
 };
 
 PHP_METHOD(HttpEnv, getRequestHeader)
 {
-	char *header_name_str;
-	int header_name_len;
+	char *header_name_str = NULL;
+	int header_name_len = 0;
 
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &header_name_str, &header_name_len)) {
 		if (header_name_str && header_name_len) {
@@ -810,7 +810,7 @@ PHP_METHOD(HttpEnv, negotiate)
 	}
 }
 
-PHP_METHOD(HttpEnv, persistentHandlesStat)
+PHP_METHOD(HttpEnv, statPersistentHandles)
 {
 	if (SUCCESS == zend_parse_parameters_none()) {
 		object_init(return_value);
@@ -822,12 +822,12 @@ PHP_METHOD(HttpEnv, persistentHandlesStat)
 	RETURN_FALSE;
 }
 
-PHP_METHOD(HttpEnv, persistentHandlesClean)
+PHP_METHOD(HttpEnv, cleanPersistentHandles)
 {
 	char *name_str = NULL, *ident_str = NULL;
 	int name_len = 0, ident_len = 0;
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ss", &name_str, &name_len, &ident_str, &ident_len)) {
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!", &name_str, &name_len, &ident_str, &ident_len)) {
 		php_http_persistent_handle_cleanup(name_str, name_len, ident_str, ident_len TSRMLS_CC);
 	}
 }