X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=737ae323ff6d7207faa6c2a93bab79e3fb47d852;hp=a46d02883b1dc9bc5d2487bc9a54c4ee2a020b06;hb=9a35b7682fede86cb0167d21a67fea38a6e85181;hpb=64b8eb68455c36e7e153014deaf52a6f9d2de39c

diff --git a/http_functions.c b/http_functions.c
index a46d028..737ae32 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -202,7 +202,7 @@ PHP_FUNCTION(http_send_status)
 		RETURN_FALSE;
 	}
 	if (status < 100 || status > 510) {
-		http_error_ex(E_WARNING, HTTP_E_HEADER, "Invalid HTTP status code (100-510): %d", status);
+		http_error_ex(HE_WARNING, HTTP_E_HEADER, "Invalid HTTP status code (100-510): %d", status);
 		RETURN_FALSE;
 	}
 
@@ -474,7 +474,7 @@ PHP_FUNCTION(http_redirect)
 			array_init(params);
 		}
 		if (add_assoc_string(params, PS(session_name), PS(id), 1) != SUCCESS) {
-			http_error(E_WARNING, HTTP_E_ENCODE, "Could not append session information");
+			http_error(HE_WARNING, HTTP_E_RUNTIME, "Could not append session information");
 		}
 	}
 
@@ -618,7 +618,6 @@ PHP_FUNCTION(http_split_response)
 	array_init(zheaders);
 
 	if (SUCCESS != http_split_response(response, response_len, Z_ARRVAL_P(zheaders), &body, &body_len)) {
-		http_error(E_WARNING, HTTP_E_PARSE, "Could not parse HTTP response");
 		RETURN_FALSE;
 	}
 
@@ -642,7 +641,6 @@ PHP_FUNCTION(http_parse_headers)
 
 	array_init(return_value);
 	if (SUCCESS != http_parse_headers(header, return_value)) {
-		http_error(E_WARNING, HTTP_E_PARSE, "Could not parse HTTP headers");
 		zval_dtor(return_value);
 		RETURN_FALSE;
 	}
@@ -689,7 +687,7 @@ PHP_FUNCTION(http_match_request_header)
 {
 	char *header, *value;
 	int header_len, value_len;
-	zend_bool match_case = 0, result = 0;
+	zend_bool match_case = 0;
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|b", &header, &header_len, &value, &value_len, &match_case)) {
 		RETURN_FALSE;
@@ -737,7 +735,6 @@ PHP_FUNCTION(http_match_request_header)
  *  - timeout:          int, seconds the request may take
  *  - connecttimeout:   int, seconds the connect may take
  *  - onprogress:       mixed, progress callback
- *  - ondebug:          mixed, debug callback
  * </pre>
  *
  * The optional third parameter will be filled with some additional information
@@ -1228,7 +1225,7 @@ PHP_FUNCTION(http_build_query)
 	}
 
 	if (Z_TYPE_P(formdata) != IS_ARRAY && Z_TYPE_P(formdata) != IS_OBJECT) {
-		http_error(E_WARNING, HTTP_E_PARAM, "Parameter 1 expected to be Array or Object.  Incorrect value given.");
+		http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Parameter 1 expected to be Array or Object.  Incorrect value given.");
 		RETURN_FALSE;
 	}
 
@@ -1255,7 +1252,7 @@ PHP_FUNCTION(http_build_query)
 
 PHP_FUNCTION(http_test)
 {
-	RETURN_NULL();
+	RETURN_BOOL(HTTP_G(only_exceptions));
 }
 
 /*
@@ -1266,3 +1263,4 @@ PHP_FUNCTION(http_test)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
+