X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=63a3423bb52341443cecb476bf8caf2d60926af1;hp=96f327788c081a0e4aac36ed8ee2103d09cf61bc;hb=229730a74c2686bdf501528cbe44a9421ccca61a;hpb=cf9967800843ea01e77b374b4d78fad4bc18a3f6 diff --git a/http_functions.c b/http_functions.c index 96f3277..63a3423 100644 --- a/http_functions.c +++ b/http_functions.c @@ -18,30 +18,33 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif - #include "php.h" + +#include "zend_operators.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" +#if defined(HAVE_PHP_SESSION) && !defined(COMPILE_DL_SESSION) +# include "ext/session/php_session.h" +#endif #include "php_http.h" #include "php_http_std_defs.h" #include "php_http_api.h" -#include "php_http_auth_api.h" -#include "php_http_curl_api.h" +#include "php_http_request_api.h" #include "php_http_cache_api.h" -#include "php_http_curl_api.h" +#include "php_http_request_method_api.h" +#include "php_http_request_api.h" #include "php_http_date_api.h" #include "php_http_headers_api.h" #include "php_http_message_api.h" #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]) @@ -97,11 +100,54 @@ PHP_FUNCTION(http_absolute_uri) } /* }}} */ -/* {{{ proto string http_negotiate_language(array supported[, string default = 'en-US']) +#define HTTP_DO_NEGOTIATE(type, supported, as_array) \ +{ \ + HashTable *result; \ + if (result = http_negotiate_ ##type(supported)) { \ + if (as_array) { \ + Z_TYPE_P(return_value) = IS_ARRAY; \ + Z_ARRVAL_P(return_value) = result; \ + } else { \ + char *key; \ + uint key_len; \ + ulong idx; \ + \ + if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(result, &key, &key_len, &idx, 1, NULL)) { \ + RETVAL_STRINGL(key, key_len-1, 0); \ + } else { \ + RETVAL_NULL(); \ + } \ + zend_hash_destroy(result); \ + } \ + } else { \ + if (as_array) { \ + zval **value; \ + \ + array_init(return_value); \ + \ + FOREACH_VAL(supported, value) { \ + convert_to_string_ex(value); \ + add_assoc_double(return_value, Z_STRVAL_PP(value), 1.0); \ + } \ + } else { \ + zval **value; \ + \ + zend_hash_internal_pointer_reset(Z_ARRVAL_P(supported)); \ + if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(supported), (void **) &value)) { \ + RETVAL_ZVAL(*value, 1, 0); \ + } else { \ + RETVAL_NULL(); \ + } \ + } \ + } \ +} + + +/* {{{ proto string http_negotiate_language(array supported[, bool return_quality_array = false]) * * This function negotiates the clients preferred language based on its * Accept-Language HTTP header. It returns the negotiated language or - * the default language if none match. + * the default language (i.e. first array entry) if none match. * * The qualifier is recognized and languages without qualifier are rated highest. * @@ -128,26 +174,21 @@ PHP_FUNCTION(http_absolute_uri) PHP_FUNCTION(http_negotiate_language) { zval *supported; - char *def = NULL; - int def_len = 0; + zend_bool as_array = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|s", &supported, &def, &def_len) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|b", &supported, &as_array) != SUCCESS) { RETURN_FALSE; } - - if (!def) { - def = "en-US"; - } - - RETURN_STRING(http_negotiate_language(supported, def), 0); + + HTTP_DO_NEGOTIATE(language, supported, as_array); } /* }}} */ -/* {{{ proto string http_negotiate_charset(array supported[, string default = 'iso-8859-1']) +/* {{{ proto string http_negotiate_charset(array supported) * * This function negotiates the clients preferred charset based on its * Accept-Charset HTTP header. It returns the negotiated charset or - * the default charset if none match. + * the default charset (i.e. first array entry) if none match. * * The qualifier is recognized and charset without qualifier are rated highest. * @@ -175,18 +216,13 @@ PHP_FUNCTION(http_negotiate_language) PHP_FUNCTION(http_negotiate_charset) { zval *supported; - char *def = NULL; - int def_len = 0; + zend_bool as_array = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|s", &supported, &def, &def_len) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|b", &supported, &as_array) != SUCCESS) { RETURN_FALSE; } - if (!def) { - def = "iso-8859-1"; - } - - RETURN_STRING(http_negotiate_charset(supported, def), 0); + HTTP_DO_NEGOTIATE(charset, supported, as_array); } /* }}} */ @@ -203,7 +239,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; } @@ -249,7 +285,7 @@ PHP_FUNCTION(http_send_content_type) } if (!ct_len) { - RETURN_SUCCESS(http_send_content_type("application/x-octetstream", sizeof("application/x-octetstream") - 1)); + RETURN_SUCCESS(http_send_content_type("application/x-octetstream", lenof("application/x-octetstream"))); } RETURN_SUCCESS(http_send_content_type(ct, ct_len)); } @@ -296,9 +332,9 @@ PHP_FUNCTION(http_match_modified) } if (for_range) { - RETURN_BOOL(http_modified_match("HTTP_IF_UNMODIFIED_SINCE", t)); + RETURN_BOOL(http_match_last_modified("HTTP_IF_UNMODIFIED_SINCE", t)); } - RETURN_BOOL(http_modified_match("HTTP_IF_MODIFIED_SINCE", t)); + RETURN_BOOL(http_match_last_modified("HTTP_IF_MODIFIED_SINCE", t)); } /* }}} */ @@ -319,15 +355,15 @@ PHP_FUNCTION(http_match_etag) } if (for_range) { - RETURN_BOOL(http_etag_match("HTTP_IF_MATCH", etag)); + RETURN_BOOL(http_match_etag("HTTP_IF_MATCH", etag)); } - RETURN_BOOL(http_etag_match("HTTP_IF_NONE_MATCH", etag)); + RETURN_BOOL(http_match_etag("HTTP_IF_NONE_MATCH", etag)); } /* }}} */ /* {{{ proto bool http_cache_last_modified([int timestamp_or_expires]]) * - * If timestamp_or_exires is greater than 0, it is handled as timestamp + * If timestamp_or_expires is greater than 0, it is handled as timestamp * and will be sent as date of last modification. If it is 0 or omitted, * the current time will be sent as Last-Modified date. If it's negative, * it is handled as expiration time in seconds, which means that if the @@ -364,7 +400,7 @@ PHP_FUNCTION(http_cache_last_modified) send_modified = last_modified; } - RETURN_SUCCESS(http_cache_last_modified(last_modified, send_modified, HTTP_DEFAULT_CACHECONTROL, sizeof(HTTP_DEFAULT_CACHECONTROL) - 1)); + RETURN_SUCCESS(http_cache_last_modified(last_modified, send_modified, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL))); } /* }}} */ @@ -388,17 +424,15 @@ PHP_FUNCTION(http_cache_etag) RETURN_FALSE; } - RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, sizeof(HTTP_DEFAULT_CACHECONTROL) - 1)); + RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL))); } /* }}} */ -/* {{{ proto string ob_httpetaghandler(string data, int mode) +/* {{{ proto string ob_etaghandler(string data, int mode) * * For use with ob_start(). - * Note that this has to be started as first output buffer. - * WARNING: Don't use with http_send_*(). */ -PHP_FUNCTION(ob_httpetaghandler) +PHP_FUNCTION(ob_etaghandler) { char *data; int data_len; @@ -408,22 +442,37 @@ PHP_FUNCTION(ob_httpetaghandler) RETURN_FALSE; } - if (mode & PHP_OUTPUT_HANDLER_START) { - if (HTTP_G(etag_started)) { - http_error(E_WARNING, HTTP_E_OBUFFER, "ob_httpetaghandler can only be used once"); - RETURN_STRINGL(data, data_len, 1); - } - http_send_header("Cache-Control: " HTTP_DEFAULT_CACHECONTROL); - HTTP_G(etag_started) = 1; - } + Z_TYPE_P(return_value) = IS_STRING; + http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), (uint *) &Z_STRLEN_P(return_value), mode); +} +/* }}} */ - if (OG(ob_nesting_level) > 1) { - http_error(E_WARNING, HTTP_E_OBUFFER, "ob_httpetaghandler must be started prior to other output buffers"); - RETURN_STRINGL(data, data_len, 1); - } +/* {{{ proto void http_throttle(double sec[, long bytes = 2097152]) + * + * Use with http_send() API. + * + * Example: + * 
+ * 
+ *
+ */ +PHP_FUNCTION(http_throttle) +{ + long chunk_size; + double interval; - Z_TYPE_P(return_value) = IS_STRING; - http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), mode); + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "dl", &interval, &chunk_size)) { + return; + } + + HTTP_G(send).throttle_delay = interval; + HTTP_G(send).buffer_size = chunk_size; } /* }}} */ @@ -445,30 +494,65 @@ PHP_FUNCTION(http_redirect) { int url_len; size_t query_len = 0; - zend_bool session = 0, permanent = 0; + zend_bool session = 0, permanent = 0, free_params = 0; zval *params = NULL; - char *query, *url, *URI, - LOC[HTTP_URI_MAXLEN + sizeof("Location: ")], - RED[HTTP_URI_MAXLEN * 2 + sizeof("Redirecting to %s?%s.\n")]; + char *query = NULL, *url = NULL, *URI, *LOC, *RED = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sa!/bb", &url, &url_len, ¶ms, &session, &permanent) != SUCCESS) { RETURN_FALSE; } /* append session info */ - if (session && (PS(session_status) == php_session_active)) { + if (session) { if (!params) { + free_params = 1; MAKE_STD_ZVAL(params); 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"); +#ifdef HAVE_PHP_SESSION +# ifdef COMPILE_DL_SESSION + if (SUCCESS == zend_get_module_started("session")) { + zval nm_retval, id_retval, func; + + INIT_PZVAL(&func); + INIT_PZVAL(&nm_retval); + INIT_PZVAL(&id_retval); + ZVAL_NULL(&nm_retval); + ZVAL_NULL(&id_retval); + + ZVAL_STRINGL(&func, "session_id", lenof("session_id"), 0); + call_user_function(EG(function_table), NULL, &func, &id_retval, 0, NULL TSRMLS_CC); + ZVAL_STRINGL(&func, "session_name", lenof("session_name"), 0); + call_user_function(EG(function_table), NULL, &func, &nm_retval, 0, NULL TSRMLS_CC); + + if ( Z_TYPE(nm_retval) == IS_STRING && Z_STRLEN(nm_retval) && + Z_TYPE(id_retval) == IS_STRING && Z_STRLEN(id_retval)) { + if (add_assoc_stringl_ex(params, Z_STRVAL(nm_retval), Z_STRLEN(nm_retval)+1, + Z_STRVAL(id_retval), Z_STRLEN(id_retval), 0) != SUCCESS) { + http_error(HE_WARNING, HTTP_E_RUNTIME, "Could not append session information"); + } + } } +# else + if (PS(session_status) == php_session_active) { + if (add_assoc_string(params, PS(session_name), PS(id), 1) != SUCCESS) { + http_error(HE_WARNING, HTTP_E_RUNTIME, "Could not append session information"); + } + } +# endif +#endif } /* treat params array with http_build_query() */ if (params) { if (SUCCESS != http_urlencode_hash_ex(Z_ARRVAL_P(params), 0, NULL, 0, &query, &query_len)) { + if (free_params) { + zval_dtor(params); + FREE_ZVAL(params); + } + if (query) { + efree(query); + } RETURN_FALSE; } } @@ -476,20 +560,27 @@ PHP_FUNCTION(http_redirect) URI = http_absolute_uri(url); if (query_len) { - snprintf(LOC, HTTP_URI_MAXLEN + sizeof("Location: "), "Location: %s?%s", URI, query); - sprintf(RED, "Redirecting to %s?%s.\n", URI, query, URI, query); - efree(query); + spprintf(&LOC, 0, "Location: %s?%s", URI, query); + if (SG(request_info).request_method && strcmp(SG(request_info).request_method, "HEAD")) { + spprintf(&RED, 0, "Redirecting to %s?%s.\n", URI, query, URI, query); + } } else { - snprintf(LOC, HTTP_URI_MAXLEN + sizeof("Location: "), "Location: %s", URI); - sprintf(RED, "Redirecting to %s.\n", URI, URI); + spprintf(&LOC, 0, "Location: %s", URI); + if (SG(request_info).request_method && strcmp(SG(request_info).request_method, "HEAD")) { + spprintf(&RED, 0, "Redirecting to %s.\n", URI, URI); + } } + efree(URI); - - if ((SUCCESS == http_send_header(LOC)) && (SUCCESS == http_send_status((permanent ? 301 : 302)))) { - php_body_write(RED, strlen(RED) TSRMLS_CC); - RETURN_TRUE; + if (query) { + efree(query); } - RETURN_FALSE; + if (free_params) { + zval_dtor(params); + FREE_ZVAL(params); + } + + RETURN_SUCCESS(http_exit_ex(permanent ? 301 : 302, LOC, RED, 1)); } /* }}} */ @@ -507,7 +598,6 @@ PHP_FUNCTION(http_send_data) } convert_to_string_ex(&zdata); - http_send_header("Accept-Ranges: bytes"); RETURN_SUCCESS(http_send_data(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata))); } /* }}} */ @@ -529,7 +619,6 @@ PHP_FUNCTION(http_send_file) RETURN_FALSE; } - http_send_header("Accept-Ranges: bytes"); RETURN_SUCCESS(http_send_file(file)); } /* }}} */ @@ -549,7 +638,6 @@ PHP_FUNCTION(http_send_stream) } php_stream_from_zval(file, &zstream); - http_send_header("Accept-Ranges: bytes"); RETURN_SUCCESS(http_send_stream(file)); } /* }}} */ @@ -562,60 +650,75 @@ PHP_FUNCTION(http_send_stream) PHP_FUNCTION(http_chunked_decode) { char *encoded = NULL, *decoded = NULL; - int encoded_len = 0, decoded_len = 0; + size_t decoded_len = 0; + int encoded_len = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &encoded, &encoded_len) != SUCCESS) { RETURN_FALSE; } - if (SUCCESS == http_chunked_decode(encoded, encoded_len, &decoded, &decoded_len)) { - RETURN_STRINGL(decoded, decoded_len, 0); + if (NULL != http_chunked_decode(encoded, encoded_len, &decoded, &decoded_len)) { + RETURN_STRINGL(decoded, (int) decoded_len, 0); } else { RETURN_FALSE; } } /* }}} */ -/* {{{ proto array http_split_response(string http_response) - * - * This function splits an HTTP response into an array with headers and the - * content body. The returned array may look simliar to the following example: +/* {{{ proto object http_parse_message(string message) * + * Parses (a) http_message(s) into a simple recursive object structure: + * * 
  *  array(
- *         'Status' => '200 Ok',
- *         'Content-Type' => 'text/plain',
- *         'Content-Language' => 'en-US'
- *     ),
- *     1 => "Hello World!"
- * );
+ * print_r(http_parse_message(http_get(URL, array('redirect' => 3)));
+ * 
+ * stdClass object
+ * (
+ *     [type] => 2
+ *     [httpVersion] => 1.1
+ *     [responseCode] => 200
+ *     [headers] => Array 
+ *         (
+ *             [Content-Length] => 3
+ *             [Server] => Apache
+ *         )
+ *     [body]  => Hi!
+ *     [parentMessage] => stdClass object
+ *     (
+ *         [type] => 2
+ *         [httpVersion] => 1.1
+ *         [responseCode] => 302
+ *         [headers] => Array 
+ *             (
+ *                 [Content-Length] => 0
+ *                 [Location] => ...
+ *             )
+ *         [body]  => 
+ *         [parentMessage] => ...
+ *     )
+ * )
  * ?>
  *
*/ -PHP_FUNCTION(http_split_response) +PHP_FUNCTION(http_parse_message) { - zval *zresponse, *zbody, *zheaders; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zresponse) != SUCCESS) { - RETURN_FALSE; + char *message; + int message_len; + http_message *msg = NULL; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &message, &message_len)) { + RETURN_NULL(); } - - 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"); - RETURN_FALSE; + + + if (msg = http_message_parse(message, message_len)) { + object_init(return_value); + http_message_tostruct_recursive(msg, return_value); + http_message_free(&msg); + } else { + RETURN_NULL(); } - - array_init(return_value); - add_index_zval(return_value, 0, zheaders); - add_index_zval(return_value, 1, zbody); } /* }}} */ @@ -624,7 +727,7 @@ PHP_FUNCTION(http_split_response) */ PHP_FUNCTION(http_parse_headers) { - char *header, *rnrn; + char *header; int header_len; if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &header, &header_len)) { @@ -632,12 +735,7 @@ PHP_FUNCTION(http_parse_headers) } array_init(return_value); - - if (rnrn = strstr(header, HTTP_CRLF HTTP_CRLF)) { - header_len = rnrn - header + 2; - } - if (SUCCESS != http_parse_headers(header, header_len, return_value)) { - http_error(E_WARNING, HTTP_E_PARSE, "Could not parse HTTP headers"); + if (SUCCESS != http_parse_headers(header, return_value)) { zval_dtor(return_value); RETURN_FALSE; } @@ -646,6 +744,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) { @@ -656,6 +755,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 @@ -693,6 +829,7 @@ PHP_FUNCTION(http_get_request_headers) * - lastmodified: int, timestamp for If-(Un)Modified-Since header * - timeout: int, seconds the request may take * - connecttimeout: int, seconds the connect may take + * - onprogress: mixed, progress callback * * * The optional third parameter will be filled with some additional information @@ -720,7 +857,6 @@ PHP_FUNCTION(http_get_request_headers) * 'content_type' => 'text/html; charset=iso-8859-1', * 'redirect_time' => 0, * 'redirect_count' => 0, - * 'private' => '', * 'http_connectcode' => 0, * 'httpauth_avail' => 0, * 'proxyauth_avail' => 0, @@ -746,7 +882,7 @@ PHP_FUNCTION(http_get) phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0); if (SUCCESS == http_get(URL, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { - RETURN_PHPSTR_VAL(response); + RETURN_PHPSTR_VAL(&response); } else { RETURN_FALSE; } @@ -777,14 +913,14 @@ PHP_FUNCTION(http_head) phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0); if (SUCCESS == http_head(URL, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { - RETURN_PHPSTR_VAL(response); + RETURN_PHPSTR_VAL(&response); } else { RETURN_FALSE; } } /* }}} */ -/* {{{ proto string http_post_data(string url, string data[, array options[, &info]]) +/* {{{ proto string http_post_data(string url, string data[, array options[, array &info]]) * * Performs an HTTP POST request, posting data. * Returns the HTTP response as string. @@ -796,6 +932,7 @@ PHP_FUNCTION(http_post_data) char *URL, *postdata; int postdata_len, URL_len; phpstr response; + http_request_body body; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &postdata, &postdata_len, &options, &info) != SUCCESS) { RETURN_FALSE; @@ -806,29 +943,38 @@ PHP_FUNCTION(http_post_data) array_init(info); } + body.type = HTTP_REQUEST_BODY_CSTRING; + body.data = postdata; + body.size = postdata_len; + phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0); - if (SUCCESS == http_post_data(URL, postdata, (size_t) postdata_len, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { - RETURN_PHPSTR_VAL(response); + if (SUCCESS == http_post(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { + RETVAL_PHPSTR_VAL(&response); } else { - RETURN_FALSE; + RETVAL_FALSE; } } /* }}} */ -/* {{{ proto string http_post_array(string url, array data[, array options[, array &info]]) +/* {{{ proto string http_post_fields(string url, array data[, array files[, array options[, array &info]]]) * * Performs an HTTP POST request, posting www-form-urlencoded array data. * Returns the HTTP response as string. * See http_get() for a full list of available options. */ -PHP_FUNCTION(http_post_array) +PHP_FUNCTION(http_post_fields) { - zval *options = NULL, *info = NULL, *postdata; + zval *options = NULL, *info = NULL, *fields, *files = NULL; char *URL; int URL_len; phpstr response; + http_request_body body; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|aa/!z", &URL, &URL_len, &fields, &files, &options, &info) != SUCCESS) { + RETURN_FALSE; + } - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|a/!z", &URL, &URL_len, &postdata, &options, &info) != SUCCESS) { + if (SUCCESS != http_request_body_fill(&body, Z_ARRVAL_P(fields), files ? Z_ARRVAL_P(files) : NULL)) { RETURN_FALSE; } @@ -838,126 +984,212 @@ PHP_FUNCTION(http_post_array) } phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0); - if (SUCCESS == http_post_array(URL, Z_ARRVAL_P(postdata), options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { - RETURN_PHPSTR_VAL(response); + if (SUCCESS == http_post(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { + RETVAL_PHPSTR_VAL(&response); } else { - RETURN_FALSE; + RETVAL_FALSE; } + http_request_body_dtor(&body); } /* }}} */ -#endif -/* }}} HAVE_CURL */ - - -/* {{{ proto bool http_auth_basic(string user, string pass[, string realm = "Restricted"]) +/* {{{ proto string http_put_file(string url, string file[, array options[, array &info]]) * - * Example: - * 
- * Authorization failed!');
- * }
- * ?>
- *
+ * 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_auth_basic) +PHP_FUNCTION(http_put_file) { - char *realm = NULL, *user, *pass, *suser, *spass; - int r_len, u_len, p_len; + char *URL, *file; + int URL_len, f_len; + zval *options = NULL, *info = NULL; + phpstr response; + php_stream *stream; + php_stream_statbuf ssb; + http_request_body body; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|s", &user, &u_len, &pass, &p_len, &realm, &r_len) != SUCCESS) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &file, &f_len, &options, &info)) { RETURN_FALSE; } - if (!realm) { - realm = "Restricted"; + if (!(stream = php_stream_open_wrapper(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL))) { + RETURN_FALSE; } - - if (SUCCESS != http_auth_credentials(&suser, &spass)) { - http_auth_header("Basic", realm); + if (php_stream_stat(stream, &ssb)) { + php_stream_close(stream); RETURN_FALSE; } - if (strcasecmp(suser, user)) { - http_auth_header("Basic", realm); + if (info) { + zval_dtor(info); + array_init(info); + } + + body.type = HTTP_REQUEST_BODY_UPLOADFILE; + body.data = stream; + body.size = ssb.sb.st_size; + + phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0); + if (SUCCESS == http_put(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { + RETVAL_PHPSTR_VAL(&response); + } else { + RETVAL_FALSE; + } + http_request_body_dtor(&body); +} +/* }}} */ + +/* {{{ 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) +{ + zval *resource, *options = NULL, *info = NULL; + char *URL; + int URL_len; + phpstr response; + php_stream *stream; + php_stream_statbuf ssb; + http_request_body body; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sr|a/!z", &URL, &URL_len, &resource, &options, &info)) { RETURN_FALSE; } - if (strcmp(spass, pass)) { - http_auth_header("Basic", realm); + php_stream_from_zval(stream, &resource); + if (php_stream_stat(stream, &ssb)) { RETURN_FALSE; } - RETURN_TRUE; + if (info) { + zval_dtor(info); + array_init(info); + } + + body.type = HTTP_REQUEST_BODY_UPLOADFILE; + body.data = stream; + body.size = ssb.sb.st_size; + + phpstr_init_ex(&response, HTTP_CURLBUF_SIZE, 0); + if (SUCCESS == http_put(URL, &body, options ? Z_ARRVAL_P(options) : NULL, info ? Z_ARRVAL_P(info) : NULL, &response)) { + RETURN_PHPSTR_VAL(&response); + } else { + RETURN_NULL(); + } } /* }}} */ +#endif /* HTTP_HAVE_CURL */ +/* }}} HAVE_CURL */ -/* {{{ proto bool http_auth_basic_cb(mixed callback[, string realm = "Restricted"]) +/* {{{ proto long http_request_method_register(string method) * - * Example: - * 
- * quoteSmart($user);
- *     if (strlen($realpass = $db->getOne($query)) {
- *         return $pass === $realpass;
- *     }
- *     return false;
- * }
- * if (!http_auth_basic_cb('auth_cb')) {
- *     die('
Authorization failed
');
- * }
- * ?>
- *
+ * Register a custom request method. */ -PHP_FUNCTION(http_auth_basic_cb) +PHP_FUNCTION(http_request_method_register) { - zval *cb; - char *realm = NULL, *user, *pass; - int r_len; + char *method; + int *method_len; + unsigned long existing; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s", &cb, &realm, &r_len) != SUCCESS) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len)) { RETURN_FALSE; } - - if (!realm) { - realm = "Restricted"; + if (existing = http_request_method_exists(1, 0, method)) { + RETURN_LONG((long) existing); } - if (SUCCESS != http_auth_credentials(&user, &pass)) { - http_auth_header("Basic", realm); + RETVAL_LONG((long) http_request_method_register(method)); +} +/* }}} */ + +/* {{{ proto bool http_request_method_unregister(mixed method) + * + * Unregister a previously registered custom request method. + */ +PHP_FUNCTION(http_request_method_unregister) +{ + zval *method; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &method)) { RETURN_FALSE; } + + switch (Z_TYPE_P(method)) { - zval *zparams[2] = {NULL, NULL}, retval; - int result = 0; + case IS_OBJECT: + convert_to_string(method); + case IS_STRING: + if (is_numeric_string(Z_STRVAL_P(method), Z_STRLEN_P(method), NULL, NULL, 1)) { + convert_to_long(method); + } else { + unsigned long mn; + if (!(mn = http_request_method_exists(1, 0, Z_STRVAL_P(method)))) { + RETURN_FALSE; + } + zval_dtor(method); + ZVAL_LONG(method, (long)mn); + } + case IS_LONG: + RETURN_SUCCESS(http_request_method_unregister(Z_LVAL_P(method))); + default: + RETURN_FALSE; + } +} +/* }}} */ - MAKE_STD_ZVAL(zparams[0]); - MAKE_STD_ZVAL(zparams[1]); - ZVAL_STRING(zparams[0], user, 0); - ZVAL_STRING(zparams[1], pass, 0); +/* {{{ 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) +{ + IF_RETVAL_USED { + zval *method; - if (SUCCESS == call_user_function(EG(function_table), NULL, cb, - &retval, 2, zparams TSRMLS_CC)) { - result = Z_LVAL(retval); + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &method)) { + RETURN_FALSE; } - efree(user); - efree(pass); - efree(zparams[0]); - efree(zparams[1]); + switch (Z_TYPE_P(method)) + { + case IS_OBJECT: + convert_to_string(method); + case IS_STRING: + if (is_numeric_string(Z_STRVAL_P(method), Z_STRLEN_P(method), NULL, NULL, 1)) { + convert_to_long(method); + } else { + RETURN_LONG((long) http_request_method_exists(1, 0, Z_STRVAL_P(method))); + } + case IS_LONG: + RETURN_LONG((long) http_request_method_exists(0, Z_LVAL_P(method), NULL)); + default: + RETURN_FALSE; + } + } +} +/* }}} */ + +/* {{{ 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) +{ + IF_RETVAL_USED { + long method; - if (!result) { - http_auth_header("Basic", realm); + if ((SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &method)) || (method < 0)) { + RETURN_FALSE; } - RETURN_BOOL(result); + RETURN_STRING(estrdup(http_request_method_name((unsigned long) method)), 0); } } -/* }}}*/ +/* }}} */ /* {{{ Sara Golemons http_build_query() */ #ifndef ZEND_ENGINE_2 @@ -976,7 +1208,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; } @@ -986,12 +1218,12 @@ PHP_FUNCTION(http_build_query) formstr = phpstr_new(); if (SUCCESS != http_urlencode_hash_implementation_ex(HASH_OF(formdata), formstr, arg_sep, prefix, prefix_len, NULL, 0, NULL, 0, (Z_TYPE_P(formdata) == IS_OBJECT ? formdata : NULL))) { - phpstr_free(formstr); + phpstr_free(&formstr); RETURN_FALSE; } if (!formstr->used) { - phpstr_free(formstr); + phpstr_free(&formstr); RETURN_NULL(); }