X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=b1039ade5fa4024e3cb741a5afa0aaa5905436eb;hp=0cf01ae3ea9f7291397710398859be8549216232;hb=b0919f33875667baecb05888fba006d5652d68d1;hpb=7787d4fcc33ce6b85aff28103516fc102b6e41d9 diff --git a/http.c b/http.c index 0cf01ae..b1039ad 100644 --- a/http.c +++ b/http.c @@ -15,100 +15,103 @@ /* $Id$ */ -#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #ifdef HAVE_CONFIG_H # include "config.h" #endif - #include "php.h" -#include "php_ini.h" -#include "snprintf.h" -#include "ext/standard/info.h" -#include "ext/session/php_session.h" -#include "ext/standard/php_string.h" -#include "ext/standard/php_smart_str.h" #include "SAPI.h" +#include "php_ini.h" +#include "ext/standard/info.h" #include "php_http.h" +#include "php_http_std_defs.h" #include "php_http_api.h" +#include "php_http_send_api.h" +#include "php_http_cache_api.h" +#include "php_http_request_method_api.h" +#ifdef HTTP_HAVE_CURL +# include "php_http_request_api.h" +#endif #ifdef ZEND_ENGINE_2 -# include "ext/standard/php_http.h" +# include "php_http_util_object.h" +# include "php_http_message_object.h" +# ifndef WONKY +# include "php_http_response_object.h" +# endif +# ifdef HTTP_HAVE_CURL +# include "php_http_request_object.h" +# include "php_http_requestpool_object.h" +# endif +# include "php_http_exception_object.h" #endif -#ifdef HTTP_HAVE_CURL +#include "missing.h" +#include "phpstr/phpstr.h" +#ifdef HTTP_HAVE_CURL # ifdef PHP_WIN32 # include -# include # endif - # include +#endif +#ifdef HTTP_HAVE_MHASH +# include +#endif -/* {{{ ARG_INFO */ -# ifdef ZEND_BEGIN_ARG_INFO -ZEND_BEGIN_ARG_INFO(http_request_info_ref_3, 0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(1) -ZEND_END_ARG_INFO(); - -ZEND_BEGIN_ARG_INFO(http_request_info_ref_4, 0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(0) - ZEND_ARG_PASS_INFO(1) -ZEND_END_ARG_INFO(); -# else -static unsigned char http_request_info_ref_3[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; -static unsigned char http_request_info_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; -# endif -/* }}} ARG_INFO */ - -#endif /* HTTP_HAVE_CURL */ +#include -ZEND_DECLARE_MODULE_GLOBALS(http) +ZEND_DECLARE_MODULE_GLOBALS(http); +HTTP_DECLARE_ARG_PASS_INFO(); #ifdef COMPILE_DL_HTTP ZEND_GET_MODULE(http) #endif - /* {{{ http_functions[] */ function_entry http_functions[] = { + PHP_FE(http_test, NULL) PHP_FE(http_date, NULL) PHP_FE(http_absolute_uri, NULL) PHP_FE(http_negotiate_language, NULL) PHP_FE(http_negotiate_charset, NULL) PHP_FE(http_redirect, NULL) + PHP_FE(http_throttle, NULL) PHP_FE(http_send_status, NULL) PHP_FE(http_send_last_modified, NULL) + PHP_FE(http_send_content_type, NULL) + PHP_FE(http_send_content_disposition, NULL) PHP_FE(http_match_modified, NULL) PHP_FE(http_match_etag, NULL) PHP_FE(http_cache_last_modified, NULL) PHP_FE(http_cache_etag, NULL) - PHP_FE(http_content_type, NULL) - PHP_FE(http_content_disposition, NULL) PHP_FE(http_send_data, NULL) PHP_FE(http_send_file, NULL) PHP_FE(http_send_stream, NULL) PHP_FE(http_chunked_decode, NULL) - PHP_FE(http_split_response, NULL) + PHP_FE(http_parse_message, NULL) PHP_FE(http_parse_headers, NULL) PHP_FE(http_get_request_headers, NULL) + PHP_FE(http_get_request_body, NULL) + PHP_FE(http_match_request_header, NULL) #ifdef HTTP_HAVE_CURL - PHP_FE(http_get, http_request_info_ref_3) - PHP_FE(http_head, http_request_info_ref_3) - PHP_FE(http_post_data, http_request_info_ref_4) - PHP_FE(http_post_array, http_request_info_ref_4) + PHP_FE(http_get, http_arg_pass_ref_3) + PHP_FE(http_head, http_arg_pass_ref_3) + PHP_FE(http_post_data, http_arg_pass_ref_4) + PHP_FE(http_post_fields, http_arg_pass_ref_5) + PHP_FE(http_put_file, http_arg_pass_ref_4) + PHP_FE(http_put_stream, http_arg_pass_ref_4) #endif - PHP_FE(http_auth_basic, NULL) - PHP_FE(http_auth_basic_cb, NULL) + PHP_FE(http_request_method_register, NULL) + PHP_FE(http_request_method_unregister, NULL) + PHP_FE(http_request_method_exists, NULL) + PHP_FE(http_request_method_name, NULL) #ifndef ZEND_ENGINE_2 PHP_FE(http_build_query, NULL) #endif + PHP_FE(ob_etaghandler, NULL) {NULL, NULL, NULL} }; /* }}} */ @@ -121,983 +124,164 @@ zend_module_entry http_module_entry = { "http", http_functions, PHP_MINIT(http), - NULL, - NULL, + PHP_MSHUTDOWN(http), + PHP_RINIT(http), PHP_RSHUTDOWN(http), PHP_MINFO(http), #if ZEND_MODULE_API_NO >= 20010901 - PHP_EXT_HTTP_VERSION, + HTTP_PEXT_VERSION, #endif STANDARD_MODULE_PROPERTIES }; /* }}} */ -#define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v)) -#define HASH_ORNULL(z) ((z) ? Z_ARRVAL_P(z) : NULL) - -/* {{{ proto string http_date([int timestamp]) - * - * This function returns a valid HTTP date regarding RFC 822/1123 - * looking like: "Wed, 22 Dec 2004 11:34:47 GMT" - * - */ -PHP_FUNCTION(http_date) -{ - long t = -1; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &t) != SUCCESS) { - RETURN_FALSE; - } - - if (t == -1) { - t = (long) time(NULL); - } - - RETURN_STRING(http_date(t), 0); -} -/* }}} */ - -/* {{{ proto string http_absolute_uri(string url[, string proto]) - * - * This function returns an absolute URI constructed from url. - * If the url is already abolute but a different proto was supplied, - * only the proto part of the URI will be updated. If url has no - * path specified, the path of the current REQUEST_URI will be taken. - * The host will be taken either from the Host HTTP header of the client - * the SERVER_NAME or just localhost if prior are not available. - * - * Some examples: - * 
- *  url = "page.php"                    => http://www.example.com/current/path/page.php
- *  url = "/page.php"                   => http://www.example.com/page.php
- *  url = "/page.php", proto = "https"  => https://www.example.com/page.php
- *
- * - */ -PHP_FUNCTION(http_absolute_uri) -{ - char *url = NULL, *proto = NULL; - int url_len = 0, proto_len = 0; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &url, &url_len, &proto, &proto_len) != SUCCESS) { - RETURN_FALSE; - } - - RETURN_STRING(http_absolute_uri(url, proto), 0); -} -/* }}} */ - -/* {{{ proto string http_negotiate_language(array supported[, string default = 'en-US']) - * - * 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 qualifier is recognized and languages without qualifier are rated highest. - * - * The supported parameter is expected to be an array having - * the supported languages as array values. - * - * Example: - * 
- * 
- *
- * - */ -PHP_FUNCTION(http_negotiate_language) -{ - zval *supported; - char *def = NULL; - int def_len = 0; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|s", &supported, &def, &def_len) != SUCCESS) { - RETURN_FALSE; - } - - if (!def) { - def = "en-US"; - } - - RETURN_STRING(http_negotiate_language(supported, def), 0); -} -/* }}} */ - -/* {{{ proto string http_negotiate_charset(array supported[, string default = 'iso-8859-1']) - * - * 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 qualifier is recognized and charset without qualifier are rated highest. - * - * The supported parameter is expected to be an array having - * the supported charsets as array values. - * - * Example: - * 
- * 
- *
- */ -PHP_FUNCTION(http_negotiate_charset) -{ - zval *supported; - char *def = NULL; - int def_len = 0; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|s", &supported, &def, &def_len) != SUCCESS) { - RETURN_FALSE; - } - - if (!def) { - def = "iso-8859-1"; - } - - RETURN_STRING(http_negotiate_charset(supported, def), 0); -} -/* }}} */ - -/* {{{ proto bool http_send_status(int status) - * - * Send HTTP status code. - * - */ -PHP_FUNCTION(http_send_status) -{ - int status = 0; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &status) != SUCCESS) { - RETURN_FALSE; - } - if (status < 100 || status > 510) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid HTTP status code (100-510): %d", status); - RETURN_FALSE; - } - - RETURN_SUCCESS(http_send_status(status)); -} -/* }}} */ - -/* {{{ proto bool http_send_last_modified([int timestamp]) - * - * This converts the given timestamp to a valid HTTP date and - * sends it as "Last-Modified" HTTP header. If timestamp is - * omitted, current time is sent. - * - */ -PHP_FUNCTION(http_send_last_modified) -{ - long t = -1; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &t) != SUCCESS) { - RETURN_FALSE; - } - - if (t == -1) { - t = (long) time(NULL); - } - - RETURN_SUCCESS(http_send_last_modified(t)); -} -/* }}} */ - -/* {{{ proto bool http_match_modified([int timestamp]) - * - * Matches the given timestamp against the clients "If-Modified-Since" resp. - * "If-Unmodified-Since" HTTP headers. - * - */ -PHP_FUNCTION(http_match_modified) -{ - long t = -1; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &t) != SUCCESS) { - RETURN_FALSE; - } - - // current time if not supplied (senseless though) - if (t == -1) { - t = (long) time(NULL); - } - - RETURN_BOOL(http_modified_match("HTTP_IF_MODIFIED_SINCE", t) || http_modified_match("HTTP_IF_UNMODIFIED_SINCE", t)); -} -/* }}} */ - -/* {{{ proto bool http_match_etag(string etag) - * - * This matches the given ETag against the clients - * "If-Match" resp. "If-None-Match" HTTP headers. - * - */ -PHP_FUNCTION(http_match_etag) -{ - int etag_len; - char *etag; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &etag, &etag_len) != SUCCESS) { - RETURN_FALSE; - } - - RETURN_BOOL(http_etag_match("HTTP_IF_NONE_MATCH", etag) || http_etag_match("HTTP_IF_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 - * 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 - * requested last modification date is not between the calculated timespan, - * the Last-Modified header is updated and the actual body will be sent. - * - */ -PHP_FUNCTION(http_cache_last_modified) -{ - long last_modified = 0, send_modified = 0, t; - zval *zlm; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &last_modified) != SUCCESS) { - RETURN_FALSE; - } - - t = (long) time(NULL); - - /* 0 or omitted */ - if (!last_modified) { - /* does the client have? (att: caching "forever") */ - if (zlm = http_get_server_var("HTTP_IF_MODIFIED_SINCE")) { - last_modified = send_modified = http_parse_date(Z_STRVAL_P(zlm)); - /* send current time */ - } else { - send_modified = t; - } - /* negative value is supposed to be expiration time */ - } else if (last_modified < 0) { - last_modified += t; - send_modified = t; - /* send supplied time explicitly */ - } else { - send_modified = last_modified; - } - - http_send_header("Cache-Control: private, must-revalidate, max-age=0"); - - if (http_modified_match("HTTP_IF_MODIFIED_SINCE", last_modified)) { - if (SUCCESS == http_send_status(304)) { - zend_bailout(); - } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified"); - RETURN_FALSE; - } - } - RETURN_SUCCESS(http_send_last_modified(send_modified)); -} -/* }}} */ - -/* {{{ proto bool http_cache_etag([string etag]) - * - * This function attempts to cache the HTTP body based on an ETag, - * either supplied or generated through calculation of the MD5 - * checksum of the output (uses output buffering). - * - * If clients "If-None-Match" header matches the supplied/calculated - * ETag, the body is considered cached on the clients side and - * a "304 Not Modified" status code is issued. - * - */ -PHP_FUNCTION(http_cache_etag) -{ - char *etag; - int etag_len = 0; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &etag, &etag_len) != SUCCESS) { - RETURN_FALSE; - } - - php_end_ob_buffers(0 TSRMLS_CC); - http_send_header("Cache-Control: private, must-revalidate, max-age=0"); - - /* if no etag is given and we didn't already - * start ob_etaghandler -- start it - */ - if (!HTTP_G(etag_started) && !etag_len) { - php_ob_set_internal_handler(_http_ob_etaghandler, (uint) 4096, "etag output handler", 0 TSRMLS_CC); - HTTP_G(etag_started) = 1; - RETURN_BOOL(php_start_ob_buffer_named("etag output handler", (uint) 4096, 0 TSRMLS_CC)); - } - - if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) { - if (SUCCESS == http_send_status(304)) { - zend_bailout(); - } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified"); - RETURN_FALSE; - } - } - - RETURN_SUCCESS(http_send_etag(etag, etag_len)); -} -/* }}} */ - -/* {{{ proto void http_redirect([string url[, array params[, bool session,[ bool permanent]]]]) - * - * Redirect to a given url. - * The supplied url will be expanded with http_absolute_uri(), the params array will - * be treated with http_build_query() and the session identification will be appended - * if session is true. - * - * Depending on permanent the redirection will be issued with a permanent - * ("301 Moved Permanently") or a temporary ("302 Found") redirection - * status code. - * - * To be RFC compliant, "Redirecting to URI." will be displayed, - * if the client doesn't redirect immediatly. - */ -PHP_FUNCTION(http_redirect) -{ - int url_len; - zend_bool session = 0, permanent = 0; - zval *params = NULL; - smart_str qstr = {0}; - char *url, *URI, LOC[HTTP_URI_MAXLEN + 9], RED[HTTP_URI_MAXLEN * 2 + 34]; - - 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 (!params) { - MAKE_STD_ZVAL(params); - array_init(params); - } - if (add_assoc_string(params, PS(session_name), PS(id), 1) != SUCCESS) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not append session information"); - } - } - - /* treat params array with http_build_query() */ - if (params) { - if (php_url_encode_hash_ex(Z_ARRVAL_P(params), &qstr, NULL,0,NULL,0,NULL,0,NULL TSRMLS_CC) != SUCCESS) { - if (qstr.c) { - efree(qstr.c); - } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not encode query parameters"); - RETURN_FALSE; - } - smart_str_0(&qstr); - } - - URI = http_absolute_uri(url, NULL); - if (qstr.c) { - snprintf(LOC, HTTP_URI_MAXLEN + strlen("Location: "), "Location: %s?%s", URI, qstr.c); - sprintf(RED, "Redirecting to %s?%s.\n", URI, qstr.c, URI, qstr.c); - efree(qstr.c); - } else { - snprintf(LOC, HTTP_URI_MAXLEN + strlen("Location: "), "Location: %s", URI); - sprintf(RED, "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; - } - RETURN_FALSE; -} -/* }}} */ - -/* {{{ proto bool http_send_data(string data) - * - * Sends raw data with support for (multiple) range requests. - * - */ -PHP_FUNCTION(http_send_data) -{ - zval *zdata; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zdata) != SUCCESS) { - RETURN_FALSE; - } - - convert_to_string_ex(&zdata); - http_send_header("Accept-Ranges: bytes"); - RETURN_SUCCESS(http_send_data(zdata)); -} -/* }}} */ - -/* {{{ proto bool http_send_file(string file) - * - * Sends a file with support for (multiple) range requests. - * - */ -PHP_FUNCTION(http_send_file) -{ - zval *zfile; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zfile) != SUCCESS) { - RETURN_FALSE; - } - - convert_to_string_ex(&zfile); - http_send_header("Accept-Ranges: bytes"); - RETURN_SUCCESS(http_send_file(zfile)); -} -/* }}} */ - -/* {{{ proto bool http_send_stream(resource stream) - * - * Sends an already opened stream with support for (multiple) range requests. - * - */ -PHP_FUNCTION(http_send_stream) -{ - zval *zstream; - php_stream *file; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream) != SUCCESS) { - RETURN_FALSE; - } - - php_stream_from_zval(file, &zstream); - http_send_header("Accept-Ranges: bytes"); - RETURN_SUCCESS(http_send_stream(file)); -} -/* }}} */ - -/* {{{ proto bool http_content_type([string content_type = 'application/x-octetstream']) - * - * Sets the content type. - * - */ -PHP_FUNCTION(http_content_type) -{ - char *ct, *content_type; - int ct_len = 0; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &ct, &ct_len) != SUCCESS) { - RETURN_FALSE; - } - - if (!ct_len) { - RETURN_SUCCESS(http_send_header("Content-Type: application/x-octetstream")); - } - - /* remember for multiple ranges */ - if (HTTP_G(ctype)) { - efree(HTTP_G(ctype)); - } - HTTP_G(ctype) = estrndup(ct, ct_len); - - content_type = (char *) emalloc(strlen("Content-Type: ") + ct_len + 1); - sprintf(content_type, "Content-Type: %s", ct); - - RETVAL_BOOL(SUCCESS == http_send_header(content_type)); - efree(content_type); -} -/* }}} */ - -/* {{{ proto bool http_content_disposition(string filename[, bool inline = false]) - * - * Set the Content Disposition. The Content-Disposition header is very useful - * if the data actually sent came from a file or something similar, that should - * be "saved" by the client/user (i.e. by browsers "Save as..." popup window). - * - */ -PHP_FUNCTION(http_content_disposition) -{ - char *filename, *header; - int f_len; - zend_bool send_inline = 0; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &filename, &f_len, &send_inline) != SUCCESS) { - RETURN_FALSE; - } - - if (send_inline) { - header = (char *) emalloc(strlen("Content-Disposition: inline; filename=\"\"") + f_len + 1); - sprintf(header, "Content-Disposition: inline; filename=\"%s\"", filename); - } else { - header = (char *) emalloc(strlen("Content-Disposition: attachment; filename=\"\"") + f_len + 1); - sprintf(header, "Content-Disposition: attachment; filename=\"%s\"", filename); - } +int http_module_number; - RETVAL_BOOL(SUCCESS == http_send_header(header)); - efree(header); -} -/* }}} */ - -/* {{{ proto string http_chunked_decode(string encoded) - * - * This function decodes a string that was HTTP-chunked encoded. - * Returns false on failure. - */ -PHP_FUNCTION(http_chunked_decode) +/* {{{ http_globals */ +static void http_globals_init_once(zend_http_globals *G) { - char *encoded = NULL, *decoded = NULL; - int encoded_len = 0, decoded_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); - } else { - RETURN_FALSE; - } + memset(G, 0, sizeof(zend_http_globals)); } -/* }}} */ -/* {{{ 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: - * - * 
- *  array(
- *         'Status' => '200 Ok',
- *         'Content-Type' => 'text/plain',
- *         'Content-Language' => 'en-US'
- *     ),
- *     1 => "Hello World!"
- * );
- * ?>
- *
- */ -PHP_FUNCTION(http_split_response) +static inline void http_globals_init(zend_http_globals *G) { - zval *zresponse, *zbody, *zheaders; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zresponse) != SUCCESS) { - RETURN_FALSE; - } - - convert_to_string_ex(&zresponse); - - MAKE_STD_ZVAL(zbody); - MAKE_STD_ZVAL(zheaders); - array_init(zheaders); - - if (SUCCESS != http_split_response(zresponse, zheaders, zbody)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP response"); - RETURN_FALSE; - } - - array_init(return_value); - add_index_zval(return_value, 0, zheaders); - add_index_zval(return_value, 1, zbody); -} -/* }}} */ - -/* {{{ proto array http_parse_headers(string header) - * - */ -PHP_FUNCTION(http_parse_headers) -{ - char *header, *rnrn; - int header_len; - - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &header, &header_len)) { - RETURN_FALSE; - } - - 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)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP header"); - zval_dtor(return_value); - RETURN_FALSE; - } + G->send.buffer_size = HTTP_SENDBUF_SIZE; + zend_hash_init(&G->request.methods.custom, 0, NULL, ZVAL_PTR_DTOR, 0); +#ifdef HTTP_HAVE_CURL + zend_llist_init(&G->request.copies.strings, sizeof(char *), http_request_data_free_string, 0); + zend_llist_init(&G->request.copies.slists, sizeof(struct curl_slist *), http_request_data_free_slist, 0); + zend_llist_init(&G->request.copies.contexts, sizeof(http_request_callback_ctx *), http_request_data_free_context, 0); + zend_llist_init(&G->request.copies.convs, sizeof(http_request_conv *), http_request_data_free_conv, 0); +#endif } -/* }}}*/ -/* {{{ proto array http_get_request_headers(void) - * - */ -PHP_FUNCTION(http_get_request_headers) +static inline void http_globals_free(zend_http_globals *G) { - if (ZEND_NUM_ARGS()) { - WRONG_PARAM_COUNT; - } - - array_init(return_value); - http_get_request_headers(return_value); -} -/* }}} */ - -/* {{{ HAVE_CURL */ + STR_SET(G->send.content_type, NULL); + STR_SET(G->send.unquoted_etag, NULL); + zend_hash_destroy(&G->request.methods.custom); #ifdef HTTP_HAVE_CURL - -/* {{{ proto string http_get(string url[, array options[, array &info]]) - * - * Performs an HTTP GET request on the supplied url. - * - * The second parameter is expected to be an associative - * array where the following keys will be recognized: - * 
- *  - redirect:         int, whether and how many redirects to follow
- *  - unrestrictedauth: bool, whether to continue sending credentials on
- *                      redirects to a different host
- *  - proxyhost:        string, proxy host in "host[:port]" format
- *  - proxyport:        int, use another proxy port as specified in proxyhost
- *  - proxyauth:        string, proxy credentials in "user:pass" format
- *  - proxyauthtype:    int, HTTP_AUTH_BASIC and/or HTTP_AUTH_NTLM
- *  - httpauth:         string, http credentials in "user:pass" format
- *  - httpauthtype:     int, HTTP_AUTH_BASIC, DIGEST and/or NTLM
- *  - compress:         bool, whether to allow gzip/deflate content encoding
- *                      (defaults to true)
- *  - port:             int, use another port as specified in the url
- *  - referer:          string, the referer to sends
- *  - useragent:        string, the user agent to send
- *                      (defaults to PECL::HTTP/version (PHP/version)))
- *  - headers:          array, list of custom headers as associative array
- *                      like array("header" => "value")
- *  - cookies:          array, list of cookies as associative array
- *                      like array("cookie" => "value")
- *  - cookiestore:      string, path to a file where cookies are/will be stored
- *
- * - * The optional third parameter will be filled with some additional information - * in form af an associative array, if supplied, like the following example: - * 
- *  'http://localhost',
- *     'response_code' => 403,
- *     'total_time' => 0.017,
- *     'namelookup_time' => 0.013,
- *     'connect_time' => 0.014,
- *     'pretransfer_time' => 0.014,
- *     'size_upload' => 0,
- *     'size_download' => 202,
- *     'speed_download' => 11882,
- *     'speed_upload' => 0,
- *     'header_size' => 145,
- *     'request_size' => 62,
- *     'ssl_verifyresult' => 0,
- *     'filetime' => -1,
- *     'content_length_download' => 202,
- *     'content_length_upload' => 0,
- *     'starttransfer_time' => 0.017,
- *     'content_type' => 'text/html; charset=iso-8859-1',
- *     'redirect_time' => 0,
- *     'redirect_count' => 0,
- *     'private' => '',
- *     'http_connectcode' => 0,
- *     'httpauth_avail' => 0,
- *     'proxyauth_avail' => 0,
- * )
- * ?>
- *
- */ -PHP_FUNCTION(http_get) -{ - char *URL, *data = NULL; - size_t data_len = 0; - int URL_len; - zval *options = NULL, *info = NULL; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a/!z", &URL, &URL_len, &options, &info) != SUCCESS) { - RETURN_FALSE; - } - - if (info) { - zval_dtor(info); - array_init(info); - } - - if (SUCCESS == http_get(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) { - RETURN_STRINGL(data, data_len, 0); - } else { - RETURN_FALSE; - } + zend_llist_clean(&G->request.copies.strings); + zend_llist_clean(&G->request.copies.slists); + zend_llist_clean(&G->request.copies.contexts); + zend_llist_clean(&G->request.copies.convs); +#endif } /* }}} */ -/* {{{ proto string http_head(string url[, array options[, array &info]]) - * - * Performs an HTTP HEAD request on the suppied url. - * Returns the HTTP response as string. - * See http_get() for a full list of available options. - */ -PHP_FUNCTION(http_head) +/* {{{ static inline void http_check_allowed_methods(char *, int) */ +#define http_check_allowed_methods(m, l) _http_check_allowed_methods((m), (l) TSRMLS_CC) +static inline void _http_check_allowed_methods(char *methods, int length TSRMLS_DC) { - char *URL, *data = NULL; - size_t data_len = 0; - int URL_len; - zval *options = NULL, *info = NULL; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a/!z", &URL, &URL_len, &options, &info) != SUCCESS) { - RETURN_FALSE; - } - - if (info) { - zval_dtor(info); - array_init(info); - } - - if (SUCCESS == http_head(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) { - RETURN_STRINGL(data, data_len, 0); - } else { - RETURN_FALSE; + if (length && SG(request_info).request_method) { + if (SUCCESS != http_check_method_ex(SG(request_info).request_method, methods)) { + char *header = emalloc(length + sizeof("Allow: ")); + sprintf(header, "Allow: %s", methods); + http_exit(405, header); + } } } /* }}} */ -/* {{{ proto string http_post_data(string url, string data[, array options[, &info]]) - * - * Performs an HTTP POST request, posting data. - * Returns the HTTP response as string. - * See http_get() for a full list of available options. - */ -PHP_FUNCTION(http_post_data) +/* {{{ PHP_INI */ +PHP_INI_MH(http_update_allowed_methods) { - char *URL, *postdata, *data = NULL; - size_t data_len = 0; - int postdata_len, URL_len; - zval *options = NULL, *info = NULL; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &postdata, &postdata_len, &options, &info) != SUCCESS) { - RETURN_FALSE; - } - - if (info) { - zval_dtor(info); - array_init(info); - } - - if (SUCCESS == http_post_data(URL, postdata, (size_t) postdata_len, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) { - RETURN_STRINGL(data, data_len, 0); - } else { - RETURN_FALSE; - } + http_check_allowed_methods(new_value, new_value_length); + return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); } -/* }}} */ -/* {{{ proto string http_post_array(string url, array data[, 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_INI_DISP(http_etag_mode_displayer) { - char *URL, *data = NULL; - size_t data_len = 0; - int URL_len; - zval *options = NULL, *info = NULL, *postdata; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|a/!z", &URL, &URL_len, &postdata, &options, &info) != SUCCESS) { - RETURN_FALSE; - } - - if (info) { - zval_dtor(info); - array_init(info); - } - - if (SUCCESS == http_post_array(URL, Z_ARRVAL_P(postdata), HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) { - RETURN_STRINGL(data, data_len, 0); + long value; + + if (type == ZEND_INI_DISPLAY_ORIG && ini_entry->modified) { + value = (ini_entry->orig_value) ? atoi(ini_entry->orig_value) : HTTP_ETAG_MD5; + } else if (ini_entry->value) { + value = (ini_entry->value[0]) ? atoi(ini_entry->value) : HTTP_ETAG_MD5; } else { - RETURN_FALSE; - } -} -/* }}} */ - -#endif -/* }}} HAVE_CURL */ - - -/* {{{ proto bool http_auth_basic(string user, string pass[, string realm = "Restricted"]) - * - * Example: - * 
- * Authorization failed!');
- * }
- * ?>
- *
- */ -PHP_FUNCTION(http_auth_basic) -{ - char *realm = NULL, *user, *pass, *suser, *spass; - int r_len, u_len, p_len; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|s", &user, &u_len, &pass, &p_len, &realm, &r_len) != SUCCESS) { - RETURN_FALSE; - } - - if (!realm) { - realm = "Restricted"; - } - - if (SUCCESS != http_auth_credentials(&suser, &spass)) { - http_auth_header("Basic", realm); - RETURN_FALSE; - } - - if (strcasecmp(suser, user)) { - http_auth_header("Basic", realm); - RETURN_FALSE; - } - - if (strcmp(spass, pass)) { - http_auth_header("Basic", realm); - RETURN_FALSE; - } - - RETURN_TRUE; -} -/* }}} */ - -/* {{{ proto bool http_auth_basic_cb(mixed callback[, string realm = "Restricted"]) - * - * Example: - * 
- * quoteSmart($user);
- *     if (strlen($realpass = $db->getOne($query)) {
- *         return $pass === $realpass;
- *     }
- *     return false;
- * }
- *
- * if (!http_auth_basic_cb('auth_cb')) {
- *     die('
Authorization failed
');
- * }
- * ?>
- *
- */ -PHP_FUNCTION(http_auth_basic_cb) -{ - zval *cb; - char *realm = NULL, *user, *pass; - int r_len; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s", &cb, &realm, &r_len) != SUCCESS) { - RETURN_FALSE; - } - - if (!realm) { - realm = "Restricted"; - } - - if (SUCCESS != http_auth_credentials(&user, &pass)) { - http_auth_header("Basic", realm); - RETURN_FALSE; + value = HTTP_ETAG_MD5; } + + switch (value) { - zval *zparams[2] = {NULL, NULL}, retval; - int result = 0; - - MAKE_STD_ZVAL(zparams[0]); - MAKE_STD_ZVAL(zparams[1]); - ZVAL_STRING(zparams[0], user, 0); - ZVAL_STRING(zparams[1], pass, 0); - - if (SUCCESS == call_user_function(EG(function_table), NULL, cb, - &retval, 2, zparams TSRMLS_CC)) { - result = Z_LVAL(retval); - } - - efree(user); - efree(pass); - efree(zparams[0]); - efree(zparams[1]); - - if (!result) { - http_auth_header("Basic", realm); + case HTTP_ETAG_SHA1: + ZEND_WRITE("HTTP_ETAG_SHA1", lenof("HTTP_ETAG_SHA1")); + break; + + case HTTP_ETAG_MD5: +#ifndef HTTP_HAVE_MHASH + default: +#endif + ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5")); + break; + +#ifdef HTTP_HAVE_MHASH + default: + { + const char *hash_name = mhash_get_hash_name_static(value); + + if (!hash_name) { + ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5")); + } else { + ZEND_WRITE("HTTP_ETAG_MHASH|MHASH_", lenof("HTTP_ETAG_MHASH|MHASH_")); + ZEND_WRITE(hash_name, strlen(hash_name)); + } } - - RETURN_BOOL(result); + break; +#endif } } -/* }}}*/ - -/* {{{ php_http_init_globals(zend_http_globals *) */ -static void php_http_init_globals(zend_http_globals *http_globals) -{ - http_globals->etag_started = 0; - http_globals->ctype = NULL; - http_globals->etag = NULL; - http_globals->lmod = 0; -#ifdef HTTP_HAVE_CURL - http_globals->curlbuf.body.data = NULL; - http_globals->curlbuf.body.used = 0; - http_globals->curlbuf.body.free = 0; - http_globals->curlbuf.hdrs.data = NULL; - http_globals->curlbuf.hdrs.used = 0; - http_globals->curlbuf.hdrs.free = 0; +#ifndef ZEND_ENGINE_2 +# define OnUpdateLong OnUpdateInt #endif - http_globals->allowed_methods = NULL; -} -/* }}} */ - -/* {{{ PHP_INI */ -PHP_INI_MH(update_allowed_methods) -{ - if (SG(request_info).request_method && new_value_length && (!strstr(new_value, SG(request_info).request_method))) { - char *allow_header = emalloc(new_value_length + sizeof("Allow: ")); - sprintf(allow_header, "Allow: %s", new_value); - http_send_header(allow_header); - efree(allow_header); - http_send_status(405); - return SUCCESS; - } - return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); -} PHP_INI_BEGIN() - STD_PHP_INI_ENTRY("http.allowed_methods", "HEAD,GET,POST", PHP_INI_ALL, update_allowed_methods, allowed_methods, zend_http_globals, http_globals) + HTTP_PHP_INI_ENTRY("http.allowed_methods", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed) + HTTP_PHP_INI_ENTRY("http.cache_log", "", PHP_INI_ALL, OnUpdateString, log.cache) + HTTP_PHP_INI_ENTRY("http.redirect_log", "", PHP_INI_ALL, OnUpdateString, log.redirect) + HTTP_PHP_INI_ENTRY("http.allowed_methods_log", "", PHP_INI_ALL, OnUpdateString, log.allowed_methods) + HTTP_PHP_INI_ENTRY("http.composite_log", "", PHP_INI_ALL, OnUpdateString, log.composite) +#ifdef ZEND_ENGINE_2 + HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions) +#endif + HTTP_PHP_INI_ENTRY_EX("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, http_etag_mode_displayer, etag.mode) PHP_INI_END() /* }}} */ + /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(http) { - ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL); + http_module_number = module_number; + + ZEND_INIT_MODULE_GLOBALS(http, http_globals_init_once, NULL) + REGISTER_INI_ENTRIES(); + + HTTP_LONG_CONSTANT("HTTP_ETAG_MD5", HTTP_ETAG_MD5); + HTTP_LONG_CONSTANT("HTTP_ETAG_SHA1", HTTP_ETAG_SHA1); + HTTP_LONG_CONSTANT("HTTP_ETAG_MHASH", HTTP_ETAG_MHASH); + #ifdef HTTP_HAVE_CURL - REGISTER_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM, CONST_CS | CONST_PERSISTENT); -#endif + if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) { + return FAILURE; + } +#endif /* HTTP_HAVE_CURL */ + +#ifdef ZEND_ENGINE_2 + http_util_object_init(); + http_message_object_init(); +# ifndef WONKY + http_response_object_init(); +# endif +# ifdef HTTP_HAVE_CURL + http_request_object_init(); + http_requestpool_object_init(); +# endif /* HTTP_HAVE_CURL */ + http_exception_object_init(); +#endif /* ZEND_ENGINE_2 */ + return SUCCESS; } /* }}} */ @@ -1106,6 +290,9 @@ PHP_MINIT_FUNCTION(http) PHP_MSHUTDOWN_FUNCTION(http) { UNREGISTER_INI_ENTRIES(); +#ifdef HTTP_HAVE_CURL + curl_global_cleanup(); +#endif return SUCCESS; } /* }}} */ @@ -1113,15 +300,13 @@ PHP_MSHUTDOWN_FUNCTION(http) /* {{{ PHP_RINIT_FUNCTION */ PHP_RINIT_FUNCTION(http) { - char *allowed_methods = INI_STR("http.allowed_methods"); - int am_len; - if (SG(request_info).request_method && (am_len = strlen(allowed_methods)) && (!strstr(allowed_methods, SG(request_info).request_method))) { - char *allow_header = emalloc(am_len + sizeof("Allow: ")); - sprintf(allow_header, "Allow: %s", allowed_methods); - http_send_header(allow_header); - efree(allow_header); - http_send_status(405); + char *m; + + if (m = INI_STR("http.allowed_methods")) { + http_check_allowed_methods(m, strlen(m)); } + + http_globals_init(HTTP_GLOBALS); return SUCCESS; } /* }}} */ @@ -1129,24 +314,7 @@ PHP_RINIT_FUNCTION(http) /* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(http) { - if (HTTP_G(ctype)) { - efree(HTTP_G(ctype)); - HTTP_G(ctype) = NULL; - } - if (HTTP_G(etag)) { - efree(HTTP_G(etag)); - HTTP_G(etag) = NULL; - } -#ifdef HTTP_HAVE_CURL - if (HTTP_G(curlbuf).body.data) { - efree(HTTP_G(curlbuf).body.data); - HTTP_G(curlbuf).body.data = NULL; - } - if (HTTP_G(curlbuf).hdrs.data) { - efree(HTTP_G(curlbuf).hdrs.data); - HTTP_G(curlbuf).hdrs.data = NULL; - } -#endif + http_globals_free(HTTP_GLOBALS); return SUCCESS; } /* }}} */ @@ -1155,15 +323,74 @@ PHP_RSHUTDOWN_FUNCTION(http) PHP_MINFO_FUNCTION(http) { php_info_print_table_start(); - php_info_print_table_header(2, "Extended HTTP support", "enabled"); - php_info_print_table_row(2, "Version:", PHP_EXT_HTTP_VERSION); - php_info_print_table_row(2, "cURL convenience functions:", + { + php_info_print_table_row(2, "Extended HTTP support:", "enabled"); + php_info_print_table_row(2, "Extension Version:", HTTP_PEXT_VERSION); #ifdef HTTP_HAVE_CURL - "enabled" + php_info_print_table_row(2, "cURL HTTP Requests:", curl_version()); +#else + php_info_print_table_row(2, "cURL HTTP Requests:", "disabled"); +#endif +#ifdef HTTP_HAVE_MHASH + { + char mhash_info[32]; + + snprintf(mhash_info, 32, "libmhash/%d", MHASH_API_VERSION); + php_info_print_table_row(2, "mhash ETag Generator:", mhash_info); + } +#else + php_info_print_table_row(2, "mhash ETag Generator:", "disabled"); +#endif +#if defined(HTTP_HAVE_MAGIC) && !defined(WONKY) + php_info_print_table_row(2, "magic MIME Guessing:", "libmagic/unknown"); #else - "disabled" + php_info_print_table_row(2, "magic MIME Guessing:", "disabled"); +#endif + php_info_print_table_row(2, "Registered Classes:", +#ifndef ZEND_ENGINE_2 + "none" +#else + "HttpUtil, " + "HttpMessage, " +# ifdef HTTP_HAVE_CURL + "HttpRequest, " + "HttpRequestPool, " +# endif +# ifndef WONKY + "HttpResponse" +# endif #endif - ); + ); + } + php_info_print_table_end(); + + php_info_print_table_start(); + { + unsigned i; + zval **custom_method; + phpstr *known_request_methods = phpstr_new(); + phpstr *custom_request_methods = phpstr_new(); + + for (i = HTTP_NO_REQUEST_METHOD+1; i < HTTP_MAX_REQUEST_METHOD; ++i) { + phpstr_appendl(known_request_methods, http_request_method_name(i)); + phpstr_appends(known_request_methods, ", "); + } + FOREACH_HASH_VAL(&HTTP_G(request).methods.custom, custom_method) { + phpstr_append(custom_request_methods, Z_STRVAL_PP(custom_method), Z_STRLEN_PP(custom_method)); + phpstr_appends(custom_request_methods, ", "); + } + + phpstr_append(known_request_methods, PHPSTR_VAL(custom_request_methods), PHPSTR_LEN(custom_request_methods)); + phpstr_fix(known_request_methods); + phpstr_fix(custom_request_methods); + + php_info_print_table_row(2, "Known Request Methods:", PHPSTR_VAL(known_request_methods)); + php_info_print_table_row(2, "Custom Request Methods:", + PHPSTR_LEN(custom_request_methods) ? PHPSTR_VAL(custom_request_methods) : "none registered"); + + phpstr_free(&known_request_methods); + phpstr_free(&custom_request_methods); + } php_info_print_table_end(); DISPLAY_INI_ENTRIES();