X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=07cb9f4dbced71aadc65962c5735266befb3c248;hp=d0f91c695db82d3176fe73525c80f5f1c3784a36;hb=7b88d9022c90eb12e5fe195af8644935141c9d68;hpb=94e87723fd916f0fe9e72f2280433b06e295bf79

diff --git a/http_api.c b/http_api.c
index d0f91c6..07cb9f4 100644
--- a/http_api.c
+++ b/http_api.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -18,25 +15,53 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#include "php.h"
+
+#include "php_http.h"
 
 #include "SAPI.h"
+#include "php_output.h"
 #include "ext/standard/url.h"
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_api.h"
-#include "php_http_headers_api.h"
 #include "php_http_send_api.h"
 
 #ifdef ZEND_ENGINE_2
-#	include "zend_exceptions.h"
 #	include "php_http_exception_object.h"
 #endif
 
-#include <ctype.h>
+PHP_MINIT_FUNCTION(http_support)
+{
+	HTTP_LONG_CONSTANT("HTTP_SUPPORT", HTTP_SUPPORT);
+	HTTP_LONG_CONSTANT("HTTP_SUPPORT_REQUESTS", HTTP_SUPPORT_REQUESTS);
+	HTTP_LONG_CONSTANT("HTTP_SUPPORT_MAGICMIME", HTTP_SUPPORT_MAGICMIME);
+	HTTP_LONG_CONSTANT("HTTP_SUPPORT_ENCODINGS", HTTP_SUPPORT_ENCODINGS);
+	HTTP_LONG_CONSTANT("HTTP_SUPPORT_SSLREQUESTS", HTTP_SUPPORT_SSLREQUESTS);
+	
+	return SUCCESS;
+}
+
+PHP_HTTP_API long _http_support(long feature)
+{
+	long support = HTTP_SUPPORT;
+	
+#ifdef HTTP_HAVE_CURL
+	support |= HTTP_SUPPORT_REQUESTS;
+#	ifdef HTTP_HAVE_SSL
+	support |= HTTP_SUPPORT_SSLREQUESTS;
+#	endif
+#endif
+#ifdef HTTP_HAVE_MAGIC
+	support |= HTTP_SUPPORT_MAGICMIME;
+#endif
+#ifdef HTTP_HAVE_ZLIB
+	support |= HTTP_SUPPORT_ENCODINGS;
+#endif
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
+	if (feature) {
+		return (feature == (support & feature));
+	}
+	return support;
+}
 
 /* char *pretty_key(char *, size_t, zend_bool, zend_bool) */
 char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen)
@@ -44,7 +69,7 @@ char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool x
 	if (key && key_len) {
 		size_t i;
 		int wasalpha;
-		if (wasalpha = isalpha((int) key[0])) {
+		if ((wasalpha = isalpha((int) key[0]))) {
 			key[0] = (char) (uctitle ? toupper((int) key[0]) : tolower((int) key[0]));
 		}
 		for (i = 1; i < key_len; i++) {
@@ -78,7 +103,7 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
 	int vallen = 0, keylen = 0, done = 0;
 	zval array;
 
-	Z_ARRVAL(array) = items;
+	INIT_ZARR(array, items);
 
 	if (!(val = strchr(list, '='))) {
 		return FAILURE;
@@ -157,77 +182,95 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
 /* }}} */
 
 /* {{{ void http_error(long, long, char*) */
-void _http_error_ex(long type, long code, const char *format, ...)
+void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
 {
 	va_list args;
-	TSRMLS_FETCH();
-
+	
 	va_start(args, format);
-	if (type == E_THROW) {
 #ifdef ZEND_ENGINE_2
+	if ((type == E_THROW) || (PG(error_handling) == EH_THROW)) {
 		char *message;
+		
 		vspprintf(&message, 0, format, args);
 		zend_throw_exception(http_exception_get_for_code(code), message, code TSRMLS_CC);
-#else
-		type = E_WARNING;
+		efree(message);
+	} else
 #endif
-	}
-	if (type != E_THROW) {
-		php_verror(NULL, "", type, format, args TSRMLS_CC);
-	}
+	php_verror(NULL, "", type, format, args TSRMLS_CC);
 	va_end(args);
 }
 /* }}} */
 
-/* {{{ STATUS http_exit(int, char*, char*, zend_bool) */
-STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header TSRMLS_DC)
+/* {{{ void http_log(char *, char *, char *) */
+void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC)
 {
+	time_t now;
+	struct tm nowtm;
 	char datetime[128];
 	
-	if (SUCCESS != http_send_status_header(status, send_header ? header : NULL)) {
-		http_error_ex(HE_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : "");
-		STR_FREE(header);
-		STR_FREE(body);
-		return FAILURE;
-	}
-	if (body) {
-		PHPWRITE(body, strlen(body));
-	}
-	{
-		time_t now;
-		struct tm nowtm;
-		
-		time(&now);
-		strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm));
-	}
-
-#define HTTP_LOG_WRITE(for, type, header) \
-	HTTP_LOG_WRITE_EX(for, type, header); \
-	HTTP_LOG_WRITE_EX(composite, type, header);
+	HTTP_CHECK_OPEN_BASEDIR(file, return);
+	
+	time(&now);
+	strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm));
 
-#define HTTP_LOG_WRITE_EX(for, type, header) \
-	if (HTTP_G(log).##for && strlen(HTTP_G(log).##for)) { \
-	 	php_stream *log = php_stream_open_wrapper(HTTP_G(log).##for, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); \
+#define HTTP_LOG_WRITE(file, type, msg) \
+	if (file && *file) { \
+	 	php_stream *log = php_stream_open_wrapper(file, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); \
 		 \
 		if (log) { \
-			php_stream_printf(log TSRMLS_CC, "%s [%12s] %32s <%s>%s", datetime, type, header, SG(request_info).request_uri, PHP_EOL); \
+			php_stream_printf(log TSRMLS_CC, "%s\t[%s]\t%s\t<%s>%s", datetime, type, msg, SG(request_info).request_uri, PHP_EOL); \
 			php_stream_close(log); \
 		} \
 	 \
 	}
+	
+	HTTP_LOG_WRITE(file, ident, message);
+	HTTP_LOG_WRITE(HTTP_G(log).composite, ident, message);
+}
+/* }}} */
+
+static void http_ob_blackhole(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC)
+{
+	*handled_output = ecalloc(1,1);
+	*handled_output_len = 0;
+}
+
+/* {{{ STATUS http_exit(int, char*, char*) */
+STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header TSRMLS_DC)
+{
+	if (	(send_header && (SUCCESS != http_send_status_header(status, header))) ||
+			(!send_header && status && (SUCCESS != http_send_status(status)))) {
+		http_error_ex(HE_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : "");
+		STR_FREE(header);
+		STR_FREE(body);
+		return FAILURE;
+	}
+	
+	php_end_ob_buffers(0 TSRMLS_CC);
+	if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
+		PHPWRITE(body, strlen(body));
+	}
+	
 	switch (status)
 	{
-		case 301:	HTTP_LOG_WRITE(redirect, "301-REDIRECT", header);			break;
-		case 302:	HTTP_LOG_WRITE(redirect, "302-REDIRECT", header);			break;
-		case 304:	HTTP_LOG_WRITE(cache, "304-CACHE", header);					break;
-		case 401:	HTTP_LOG_WRITE(auth, "401-AUTH", header);					break;
-		case 403:	HTTP_LOG_WRITE(auth, "403-AUTH", header);					break;
-		case 405:	HTTP_LOG_WRITE(allowed_methods, "405-ALLOWED", header);		break;
+		case 301:	http_log(HTTP_G(log).redirect, "301-REDIRECT", header);			break;
+		case 302:	http_log(HTTP_G(log).redirect, "302-REDIRECT", header);			break;
+		case 303:	http_log(HTTP_G(log).redirect, "303-REDIRECT", header);			break;
+		case 307:	http_log(HTTP_G(log).redirect, "307-REDIRECT", header);			break;
+		case 304:	http_log(HTTP_G(log).cache, "304-CACHE", header);				break;
+		case 405:	http_log(HTTP_G(log).allowed_methods, "405-ALLOWED", header);	break;
+		default:	http_log(NULL, header, body);									break;
 	}
+	
 	STR_FREE(header);
 	STR_FREE(body);
-	zend_bailout();
-	/* fake */
+	
+	if (HTTP_G(force_exit)) {
+		zend_bailout();
+	} else {
+		php_ob_set_internal_handler(http_ob_blackhole, 4096, "blackhole", 0 TSRMLS_CC);
+	}
+	
 	return SUCCESS;
 }
 /* }}} */
@@ -239,7 +282,7 @@ STATUS _http_check_method_ex(const char *method, const char *methods)
 
 	if (	(found = strstr(methods, method)) &&
 			(found == method || !isalpha(found[-1])) &&
-			(!isalpha(found[strlen(method) + 1]))) {
+			(strlen(found) >= strlen(method) && !isalpha(found[strlen(method)]))) {
 		return SUCCESS;
 	}
 	return FAILURE;
@@ -252,10 +295,10 @@ PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zen
 	zval **hsv;
 	zval **var;
 	
-	if (SUCCESS != zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &hsv)) {
+	if ((SUCCESS != zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &hsv)) || (Z_TYPE_PP(hsv) != IS_ARRAY)) {
 		return NULL;
 	}
-	if (SUCCESS != zend_hash_find(Z_ARRVAL_PP(hsv), (char *) key, key_size, (void **) &var)) {
+	if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(hsv), (char *) key, key_size, (void **) &var)) || (Z_TYPE_PP(var) != IS_STRING)) {
 		return NULL;
 	}
 	if (check && !(Z_STRVAL_PP(var) && Z_STRLEN_PP(var))) {
@@ -280,65 +323,6 @@ PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_
 }
 /* }}} */
 
-/* {{{ char *http_chunked_decode(char *, size_t, char **, size_t *) */
-PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encoded_len,
-	char **decoded, size_t *decoded_len TSRMLS_DC)
-{
-	const char *e_ptr;
-	char *d_ptr;
-
-	*decoded_len = 0;
-	*decoded = ecalloc(1, encoded_len);
-	d_ptr = *decoded;
-	e_ptr = encoded;
-
-	while (((e_ptr - encoded) - encoded_len) > 0) {
-		int no_crlf = 0;
-		char *n_ptr;
-		size_t chunk_len = 0;
-
-		chunk_len = strtol(e_ptr, &n_ptr, 16);
-
-		/* check if:
-		 * - we could not read in chunk size
-		 * - chunk size is not followed by HTTP_CRLF|NUL
-		 */
-		if ((n_ptr == e_ptr) || (*n_ptr && (no_crlf = strncmp(n_ptr, HTTP_CRLF, lenof(HTTP_CRLF))))) {
-			/* don't fail on apperently not encoded data */
-			if (e_ptr == encoded) {
-				memcpy(*decoded, encoded, encoded_len);
-				*decoded_len = encoded_len;
-				return encoded + encoded_len;
-			} else {
-				efree(*decoded);
-				if (no_crlf) {
-					http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0D 0x0A; got: 0x%x 0x%x)", *n_ptr, *(n_ptr + 1));
-				} else {
-					char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n \0"));
-					http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
-					efree(error);
-				}
-
-				return NULL;
-			}
-		} else {
-			e_ptr = n_ptr;
-		}
-
-		/* reached the end */
-		if (!chunk_len) {
-			break;
-		}
-
-		memcpy(d_ptr, e_ptr += 2, chunk_len);
-		d_ptr += chunk_len;
-		e_ptr += chunk_len + 2;
-		*decoded_len += chunk_len;
-	}
-
-	return e_ptr;
-}
-/* }}} */
 
 /*
  * Local variables: