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

diff --git a/http_api.c b/http_api.c
index 48e3c31..d0f91c6 100644
--- a/http_api.c
+++ b/http_api.c
@@ -18,10 +18,9 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-
-#include <ctype.h>
-
 #include "php.h"
+
+#include "SAPI.h"
 #include "ext/standard/url.h"
 
 #include "php_http.h"
@@ -35,19 +34,22 @@
 #	include "php_http_exception_object.h"
 #endif
 
+#include <ctype.h>
+
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
-/* char *pretty_key(char *, size_t, zend_bool, zebd_bool) */
+/* 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)
 {
 	if (key && key_len) {
-		unsigned i, wasalpha;
-		if (wasalpha = isalpha(key[0])) {
-			key[0] = uctitle ? toupper(key[0]) : tolower(key[0]);
+		size_t i;
+		int wasalpha;
+		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++) {
-			if (isalpha(key[i])) {
-				key[i] = ((!wasalpha) && uctitle) ? toupper(key[i]) : tolower(key[i]);
+			if (isalpha((int) key[i])) {
+				key[i] = (char) (((!wasalpha) && uctitle) ? toupper((int) key[i]) : tolower((int) key[i]));
 				wasalpha = 1;
 			} else {
 				if (xhyphen && (key[i] == '_')) {
@@ -89,8 +91,8 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
 		if (decode) { \
 			decode(str, len, &decoded, &decoded_len TSRMLS_CC); \
 		} else { \
-			decoded = estrdup(str); \
 			decoded_len = len; \
+			decoded = estrndup(str, decoded_len); \
 		} \
 		add_assoc_stringl(array, k, decoded, decoded_len, 0); \
 	}
@@ -118,7 +120,7 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
 			key = val + strlen(val);
 			HTTP_KEYLIST_FIXVAL();
 			HTTP_KEYLIST_VAL(&array, "value", val, vallen);
-			goto list_done;
+			return SUCCESS;
 		}
 		/* additional info appended */
 		else {
@@ -150,9 +152,9 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
 		efree(keydup);
 	} while (!done);
 
-list_done:
 	return SUCCESS;
 }
+/* }}} */
 
 /* {{{ void http_error(long, long, char*) */
 void _http_error_ex(long type, long code, const char *format, ...)
@@ -177,19 +179,53 @@ void _http_error_ex(long type, long code, const char *format, ...)
 }
 /* }}} */
 
-/* {{{ STATUS http_exit(int, char*) */
-STATUS _http_exit_ex(int status, char *header, zend_bool free_header TSRMLS_DC)
+/* {{{ STATUS http_exit(int, char*, char*, zend_bool) */
+STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header TSRMLS_DC)
 {
-	if (SUCCESS != http_send_status_header(status, header)) {
-		http_error_ex(E_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : "");
-		if (free_header && header) {
-			efree(header);
-		}
+	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 (free_header && header) {
-		efree(header);
+	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);
+
+#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); \
+		 \
+		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_close(log); \
+		} \
+	 \
+	}
+	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;
+	}
+	STR_FREE(header);
+	STR_FREE(body);
 	zend_bailout();
 	/* fake */
 	return SUCCESS;
@@ -213,18 +249,36 @@ STATUS _http_check_method_ex(const char *method, const char *methods)
 /* {{{ zval *http_get_server_var_ex(char *, size_t) */
 PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zend_bool check TSRMLS_DC)
 {
+	zval **hsv;
 	zval **var;
-	if (SUCCESS == zend_hash_find(HTTP_SERVER_VARS,	(char *) key, key_size, (void **) &var)) {
-		if (check) {
-			return Z_STRVAL_PP(var) && Z_STRLEN_PP(var) ? *var : NULL;
-		} else {
-			return *var;
-		}
+	
+	if (SUCCESS != zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &hsv)) {
+		return NULL;
+	}
+	if (SUCCESS != zend_hash_find(Z_ARRVAL_PP(hsv), (char *) key, key_size, (void **) &var)) {
+		return NULL;
+	}
+	if (check && !(Z_STRVAL_PP(var) && Z_STRLEN_PP(var))) {
+		return NULL;
 	}
-	return NULL;
+	return *var;
 }
 /* }}} */
 
+/* {{{ STATUS http_get_request_body(char **, size_t *) */
+PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_bool dup TSRMLS_DC)
+{
+	*length = 0;
+	*body = NULL;
+
+	if (SG(request_info).raw_post_data) {
+		*length = SG(request_info).raw_post_data_length;
+		*body = (char *) (dup ? estrndup(SG(request_info).raw_post_data, *length) : SG(request_info).raw_post_data);
+		return SUCCESS;
+	}
+	return FAILURE;
+}
+/* }}} */
 
 /* {{{ 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,
@@ -258,10 +312,10 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode
 			} else {
 				efree(*decoded);
 				if (no_crlf) {
-					http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid character (expected 0x0D 0x0A; got: 0x%x 0x%x)", *n_ptr, *(n_ptr + 1));
+					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(E_WARNING, HTTP_E_PARSE, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
+					http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
 					efree(error);
 				}
 
@@ -286,31 +340,6 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode
 }
 /* }}} */
 
-/* {{{ STATUS http_split_response(char *, size_t, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_split_response(char *response, size_t response_len,
-	HashTable *headers, char **body, size_t *body_len TSRMLS_DC)
-{
-	char *header = response, *real_body = NULL;
-
-	while (0 < (response_len - (response - header + 4))) {
-		if (	(*response++ == '\r') &&
-				(*response++ == '\n') &&
-				(*response++ == '\r') &&
-				(*response++ == '\n')) {
-			real_body = response;
-			break;
-		}
-	}
-
-	if (real_body && (*body_len = (response_len - (real_body - header)))) {
-		*body = ecalloc(1, *body_len + 1);
-		memcpy(*body, real_body, *body_len);
-	}
-
-	return http_parse_headers_ex(header, headers, 1);
-}
-/* }}} */
-
 /*
  * Local variables:
  * tab-width: 4