X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http.c;h=0cf01ae3ea9f7291397710398859be8549216232;hb=7787d4fcc33ce6b85aff28103516fc102b6e41d9;hp=795a3a54d32387ff1c306a9f587e89dd58035100;hpb=d9a5eb7f270247c44f4ff78c1f5d03d520e8fec0;p=m6w6%2Fext-http

diff --git a/http.c b/http.c
index 795a3a5..0cf01ae 100644
--- a/http.c
+++ b/http.c
@@ -22,12 +22,15 @@
 #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"
 
@@ -94,6 +97,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)
@@ -676,6 +680,7 @@ PHP_FUNCTION(http_chunked_decode)
  * content body. The returned array may look simliar to the following example:
  *
  * <pre>
+ * <?php
  * array(
  *     0 => array(
  *         'Status' => '200 Ok',
@@ -684,6 +689,7 @@ PHP_FUNCTION(http_chunked_decode)
  *     ),
  *     1 => "Hello World!"
  * );
+ * ?>
  * </pre>
  */
 PHP_FUNCTION(http_split_response)
@@ -711,7 +717,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;
@@ -734,6 +742,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
 
@@ -767,8 +789,37 @@ PHP_FUNCTION(http_parse_headers)
  * </pre>
  *
  * 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:
+ * <pre>
+ * <?php
+ * array (
+ *     'effective_url' => '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,
+ * )
+ * ?>
+ * </pre>
  */
 PHP_FUNCTION(http_get)
 {
@@ -1014,13 +1065,34 @@ 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;
 }
 /* }}} */
 
+/* {{{ 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)
+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);
@@ -1030,21 +1102,49 @@ 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");
+	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);
+	}
+	return SUCCESS;
+}
+/* }}} */
+
 /* {{{ 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
 	return SUCCESS;
@@ -1065,6 +1165,8 @@ PHP_MINFO_FUNCTION(http)
 #endif
 	);
 	php_info_print_table_end();
+
+	DISPLAY_INI_ENTRIES();
 }
 /* }}} */