X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=ee8fba4e987df6ff8b0664a83dfa7095b3012a4f;hp=4b611e037d964ee7122aaa970de514073b5418c9;hb=3177ba2e5ef642f38c01568afcaa547df65f3e74;hpb=781c90c0447166dd52ef881ae15751fa466c32fb
diff --git a/http_functions.c b/http_functions.c
index 4b611e0..ee8fba4 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -18,17 +18,14 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-
#include "php.h"
+
+#include "SAPI.h"
#include "php_ini.h"
#include "ext/standard/info.h"
#include "ext/session/php_session.h"
#include "ext/standard/php_string.h"
-#include "SAPI.h"
-
-#include "phpstr/phpstr.h"
-
#include "php_http.h"
#include "php_http_std_defs.h"
#include "php_http_api.h"
@@ -42,6 +39,8 @@
#include "php_http_send_api.h"
#include "php_http_url_api.h"
+#include "phpstr/phpstr.h"
+
ZEND_EXTERN_MODULE_GLOBALS(http)
/* {{{ proto string http_date([int timestamp])
@@ -203,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;
}
@@ -416,7 +415,7 @@ PHP_FUNCTION(ob_etaghandler)
* Use with http_send() API.
*
* Example:
- *
+ *
*
- *
+ *
*/
PHP_FUNCTION(http_throttle)
{
@@ -460,7 +459,7 @@ PHP_FUNCTION(http_redirect)
size_t query_len = 0;
zend_bool session = 0, permanent = 0;
zval *params = NULL;
- char *query, *url, *URI,
+ char *query = NULL, *url = NULL, *URI,
LOC[HTTP_URI_MAXLEN + sizeof("Location: ")],
RED[HTTP_URI_MAXLEN * 2 + sizeof("Redirecting to %s?%s.\n")];
@@ -475,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");
}
}
@@ -498,8 +497,10 @@ PHP_FUNCTION(http_redirect)
}
efree(URI);
- if ((SUCCESS == http_send_header(LOC)) && (SUCCESS == http_send_status((permanent ? 301 : 302)))) {
- php_body_write(RED, strlen(RED) TSRMLS_CC);
+ if ((SUCCESS == http_send_header_string(LOC)) && (SUCCESS == http_send_status((permanent ? 301 : 302)))) {
+ if (SG(request_info).request_method && strcmp(SG(request_info).request_method, "HEAD")) {
+ PHPWRITE(RED, strlen(RED));
+ }
RETURN_TRUE;
}
RETURN_FALSE;
@@ -606,26 +607,25 @@ PHP_FUNCTION(http_chunked_decode)
*/
PHP_FUNCTION(http_split_response)
{
- zval *zresponse, *zbody, *zheaders;
+ char *response, *body;
+ int response_len;
+ size_t body_len;
+ zval *zheaders;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zresponse) != SUCCESS) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &response, &response_len) != SUCCESS) {
RETURN_FALSE;
}
- convert_to_string(zresponse);
-
- MAKE_STD_ZVAL(zbody);
MAKE_STD_ZVAL(zheaders);
array_init(zheaders);
- if (SUCCESS != http_split_response(zresponse, zheaders, zbody)) {
- http_error(E_WARNING, HTTP_E_PARSE, "Could not parse HTTP response");
+ if (SUCCESS != http_split_response(response, response_len, Z_ARRVAL_P(zheaders), &body, &body_len)) {
RETURN_FALSE;
}
array_init(return_value);
add_index_zval(return_value, 0, zheaders);
- add_index_zval(return_value, 1, zbody);
+ add_index_stringl(return_value, 1, body, body_len, 0);
}
/* }}} */
@@ -643,7 +643,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;
}
@@ -652,6 +651,7 @@ PHP_FUNCTION(http_parse_headers)
/* {{{ proto array http_get_request_headers(void)
*
+ * Get a list of incoming HTTP headers.
*/
PHP_FUNCTION(http_get_request_headers)
{
@@ -662,6 +662,43 @@ PHP_FUNCTION(http_get_request_headers)
}
/* }}} */
+/* {{{ proto string http_get_request_body(void)
+ *
+ * Get the raw request body (e.g. POST or PUT data).
+ */
+PHP_FUNCTION(http_get_request_body)
+{
+ char *body;
+ size_t length;
+
+ NO_ARGS;
+
+ if (SUCCESS == http_get_request_body(&body, &length)) {
+ RETURN_STRINGL(body, (int) length, 0);
+ } else {
+ RETURN_NULL();
+ }
+}
+/* }}} */
+
+/* {{{ proto bool http_match_request_header(string header, string value[, bool match_case = false])
+ *
+ * Match an incoming HTTP header.
+ */
+PHP_FUNCTION(http_match_request_header)
+{
+ char *header, *value;
+ int header_len, value_len;
+ 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;
+ }
+
+ RETURN_BOOL(http_match_request_header_ex(header, value, match_case));
+}
+/* }}} */
+
/* {{{ HAVE_CURL */
#ifdef HTTP_HAVE_CURL
@@ -700,7 +737,6 @@ PHP_FUNCTION(http_get_request_headers)
* - timeout: int, seconds the request may take
* - connecttimeout: int, seconds the connect may take
* - onprogress: mixed, progress callback
- * - ondebug: mixed, debug callback
*
*
* The optional third parameter will be filled with some additional information
@@ -825,7 +861,6 @@ PHP_FUNCTION(http_post_data)
} else {
RETVAL_FALSE;
}
- http_request_body_dtor(&body);
}
/* }}} */
@@ -868,6 +903,9 @@ PHP_FUNCTION(http_post_fields)
/* {{{ proto string http_put_file(string url, string file[, array options[, array &info]])
*
+ * Performs an HTTP PUT request, uploading file.
+ * Returns the HTTP response as string.
+ * See http_get() for a full list of available options.
*/
PHP_FUNCTION(http_put_file)
{
@@ -912,6 +950,9 @@ PHP_FUNCTION(http_put_file)
/* {{{ proto string http_put_stream(string url, resource stream[, array options[, array &info]])
*
+ * Performs an HTTP PUT request, uploading stream.
+ * Returns the HTTP response as string.
+ * See http_get() for a full list of available options.
*/
PHP_FUNCTION(http_put_stream)
{
@@ -950,12 +991,9 @@ PHP_FUNCTION(http_put_stream)
}
/* }}} */
-/* {{{ proto bool http_request()
- */
-/* }}} */
-
/* {{{ proto long http_request_method_register(string method)
*
+ * Register a custom request method.
*/
PHP_FUNCTION(http_request_method_register)
{
@@ -976,12 +1014,11 @@ PHP_FUNCTION(http_request_method_register)
/* {{{ proto bool http_request_method_unregister(mixed method)
*
+ * Unregister a previously registered custom request method.
*/
PHP_FUNCTION(http_request_method_unregister)
{
zval *method;
- zend_bool numeric;
- unsigned long existing;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &method)) {
RETURN_FALSE;
@@ -1013,6 +1050,7 @@ PHP_FUNCTION(http_request_method_unregister)
/* {{{ proto long http_request_method_exists(mixed method)
*
+ * Check if a request method is registered (or available by default).
*/
PHP_FUNCTION(http_request_method_exists)
{
@@ -1044,6 +1082,7 @@ PHP_FUNCTION(http_request_method_exists)
/* {{{ proto string http_request_method_name(long method)
*
+ * Get the literal string representation of a standard or registered request method.
*/
PHP_FUNCTION(http_request_method_name)
{
@@ -1086,18 +1125,18 @@ PHP_FUNCTION(http_auth_basic)
realm = "Restricted";
}
- if (SUCCESS != http_auth_credentials(&suser, &spass)) {
- http_auth_header("Basic", realm);
+ if (SUCCESS != http_auth_basic_credentials(&suser, &spass)) {
+ http_auth_basic_header(realm);
RETURN_FALSE;
}
if (strcasecmp(suser, user)) {
- http_auth_header("Basic", realm);
+ http_auth_basic_header(realm);
RETURN_FALSE;
}
if (strcmp(spass, pass)) {
- http_auth_header("Basic", realm);
+ http_auth_basic_header(realm);
RETURN_FALSE;
}
@@ -1139,8 +1178,8 @@ PHP_FUNCTION(http_auth_basic_cb)
realm = "Restricted";
}
- if (SUCCESS != http_auth_credentials(&user, &pass)) {
- http_auth_header("Basic", realm);
+ if (SUCCESS != http_auth_basic_credentials(&user, &pass)) {
+ http_auth_basic_header(realm);
RETURN_FALSE;
}
{
@@ -1163,7 +1202,7 @@ PHP_FUNCTION(http_auth_basic_cb)
efree(zparams[1]);
if (!result) {
- http_auth_header("Basic", realm);
+ http_auth_basic_header(realm);
}
RETURN_BOOL(result);
@@ -1188,7 +1227,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;
}
@@ -1215,7 +1254,7 @@ PHP_FUNCTION(http_build_query)
PHP_FUNCTION(http_test)
{
- RETURN_NULL();
+ RETURN_BOOL(HTTP_G(only_exceptions));
}
/*
@@ -1226,3 +1265,4 @@ PHP_FUNCTION(http_test)
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
+