X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=452ec8f86a98fed4ea6e2e4e17c2a43fd6f69372;hp=afa95b789c593459b2b5b794f2dea3584bdc8633;hb=0f9c41f499873dbd4ab88469d838922554a49a99;hpb=92cb4a624a2da6facfea66004bce886877933bcb diff --git a/http.c b/http.c index afa95b7..452ec8f 100644 --- a/http.c +++ b/http.c @@ -15,44 +15,41 @@ /* $Id$ */ +#define _WINSOCKAPI_ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #ifdef HAVE_CONFIG_H -#include "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_http.h" #include "php_http_api.h" #ifdef ZEND_ENGINE_2 -#include "ext/standard/php_http.h" +# include "ext/standard/php_http.h" #endif #ifdef HTTP_HAVE_CURL -#ifdef PHP_WIN32 -#include -#include -#endif - -#include -#endif +# ifdef PHP_WIN32 +# include +# include +# endif -ZEND_DECLARE_MODULE_GLOBALS(http) - -#ifdef COMPILE_DL_HTTP -ZEND_GET_MODULE(http) -#endif +# include /* {{{ ARG_INFO */ -#ifdef ZEND_BEGIN_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) @@ -65,11 +62,20 @@ ZEND_BEGIN_ARG_INFO(http_request_info_ref_4, 0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(1) ZEND_END_ARG_INFO(); -#else +# 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 */ + +ZEND_DECLARE_MODULE_GLOBALS(http) + +#ifdef COMPILE_DL_HTTP +ZEND_GET_MODULE(http) #endif -/* }}}*/ + /* {{{ http_functions[] */ function_entry http_functions[] = { @@ -92,6 +98,7 @@ function_entry http_functions[] = { PHP_FE(http_chunked_decode, NULL) PHP_FE(http_split_response, NULL) PHP_FE(http_parse_headers, NULL) + PHP_FE(http_get_request_headers, NULL) #ifdef HTTP_HAVE_CURL PHP_FE(http_get, http_request_info_ref_3) PHP_FE(http_head, http_request_info_ref_3) @@ -103,6 +110,7 @@ function_entry http_functions[] = { #ifndef ZEND_ENGINE_2 PHP_FE(http_build_query, NULL) #endif + PHP_FE(ob_httpetaghandler, NULL) {NULL, NULL, NULL} }; /* }}} */ @@ -433,28 +441,60 @@ PHP_FUNCTION(http_cache_etag) 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 (etag_len) { + http_send_etag(etag, etag_len); + 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; + } + } } - 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; + /* if no etag is given and we didn't already start ob_etaghandler -- start it */ + if (!HTTP_G(etag_started)) { + RETURN_BOOL(HTTP_G(etag_started) = (SUCCESS == http_start_ob_handler(_http_ob_etaghandler, "ob_etaghandler", 4096, 1))); + } + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto string ob_httpetaghandler(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) +{ + char *data; + int data_len; + long mode; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &data, &data_len, &mode)) { + RETURN_FALSE; + } + + if (mode & PHP_OUTPUT_HANDLER_START) { + if (HTTP_G(etag_started)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "ob_httpetaghandler can only be used once"); + RETURN_STRINGL(data, data_len, 1); } + http_send_header("Cache-Control: private, must-revalidate, max-age=0"); + HTTP_G(etag_started) = 1; } - RETURN_SUCCESS(http_send_etag(etag, etag_len)); + if (OG(ob_nesting_level) > 1) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "ob_httpetaghandler must be started prior to other output buffers"); + RETURN_STRINGL(data, data_len, 1); + } + + Z_TYPE_P(return_value) = IS_STRING; + http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), mode); } /* }}} */ @@ -674,6 +714,7 @@ PHP_FUNCTION(http_chunked_decode) * content body. The returned array may look simliar to the following example: * * 
+ *  array(
  *         'Status' => '200 Ok',
@@ -682,6 +723,7 @@ PHP_FUNCTION(http_chunked_decode)
  *     ),
  *     1 => "Hello World!"
  * );
+ * ?>
  *
*/ PHP_FUNCTION(http_split_response) @@ -709,7 +751,9 @@ PHP_FUNCTION(http_split_response) } /* }}} */ -/* {{{ proto array http_parse_headers(string header) */ +/* {{{ proto array http_parse_headers(string header) + * + */ PHP_FUNCTION(http_parse_headers) { char *header, *rnrn; @@ -732,6 +776,20 @@ PHP_FUNCTION(http_parse_headers) } /* }}}*/ +/* {{{ proto array http_get_request_headers(void) + * + */ +PHP_FUNCTION(http_get_request_headers) +{ + if (ZEND_NUM_ARGS()) { + WRONG_PARAM_COUNT; + } + + array_init(return_value); + http_get_request_headers(return_value); +} +/* }}} */ + /* {{{ HAVE_CURL */ #ifdef HTTP_HAVE_CURL @@ -765,8 +823,37 @@ PHP_FUNCTION(http_parse_headers) * * * The optional third parameter will be filled with some additional information - * in form af an associative array, if supplied (don't forget to initialize it - * with NULL or array()). + * 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) { @@ -1012,13 +1099,42 @@ static void php_http_init_globals(zend_http_globals *http_globals) http_globals->curlbuf.hdrs.used = 0; http_globals->curlbuf.hdrs.free = 0; #endif + http_globals->allowed_methods = NULL; +} +/* }}} */ + +/* {{{ static inline STATUS 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) +{ + if (length && SG(request_info).request_method && (!strstr(methods, SG(request_info).request_method))) { + char *allow_header = emalloc(length + sizeof("Allow: ")); + sprintf(allow_header, "Allow: %s", methods); + http_send_header(allow_header); + efree(allow_header); + http_send_status(405); + zend_bailout(); + } +} +/* }}} */ + +/* {{{ PHP_INI */ +PHP_INI_MH(update_allowed_methods) +{ + 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); } + +PHP_INI_BEGIN() + STD_PHP_INI_ENTRY("http.allowed_methods", "OPTIONS,GET,HEAD,POST,PUT,DELETE,TRACE,CONNECT", PHP_INI_ALL, update_allowed_methods, allowed_methods, zend_http_globals, http_globals) +PHP_INI_END() /* }}} */ /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(http) { ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL); + REGISTER_INI_ENTRIES(); #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); @@ -1028,21 +1144,46 @@ PHP_MINIT_FUNCTION(http) } /* }}} */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ +PHP_MSHUTDOWN_FUNCTION(http) +{ + UNREGISTER_INI_ENTRIES(); + return SUCCESS; +} +/* }}} */ + +/* {{{ PHP_RINIT_FUNCTION */ +PHP_RINIT_FUNCTION(http) +{ + char *allowed_methods = INI_STR("http.allowed_methods"); + http_check_allowed_methods(allowed_methods, strlen(allowed_methods)); + return SUCCESS; +} +/* }}} */ + /* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(http) { - if (HTTP_G(ctype)) { - efree(HTTP_G(ctype)); - } + HTTP_G(etag_started) = 0; + HTTP_G(lmod) = 0; + if (HTTP_G(etag)) { efree(HTTP_G(etag)); + HTTP_G(etag) = NULL; + } + + if (HTTP_G(ctype)) { + efree(HTTP_G(ctype)); + HTTP_G(ctype) = 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 return SUCCESS; @@ -1063,6 +1204,8 @@ PHP_MINFO_FUNCTION(http) #endif ); php_info_print_table_end(); + + DISPLAY_INI_ENTRIES(); } /* }}} */