X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=3a64350eca71abc1458be02aaf14b433839a5199;hp=fa0c1c89594f46d770e146f611f98b9bb4f3e215;hb=a82a43116a750e478d0d4be079a5fa5bac7e199b;hpb=c1782429f025af40d805d9c1b5b9d4416465318e

diff --git a/php_http_api.h b/php_http_api.h
index fa0c1c8..3a64350 100644
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -27,6 +27,7 @@
 #define HTTP_PARAMS_ALLOW_FAILURE	0x02
 #define HTTP_PARAMS_RAISE_ERROR		0x04
 #define HTTP_PARAMS_DEFAULT	(HTTP_PARAMS_ALLOW_COMMA|HTTP_PARAMS_ALLOW_FAILURE|HTTP_PARAMS_RAISE_ERROR)
+#define HTTP_PARAMS_COLON_SEPARATOR	0x10
 
 extern PHP_MINIT_FUNCTION(http_support);
 
@@ -95,12 +96,18 @@ extern STATUS _http_object_new(zend_object_value *ov, const char *cname_str, uin
 		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid compression level (-1 to 9): %d", level); \
 		action; \
 	}
-
+#ifndef PHP_OUTPUT_NEWAPI
+#	define HTTP_GET_OUTPUT_START() \
+		char *output_start_filename = php_get_output_start_filename(TSRMLS_C); \
+		int output_start_lineno = php_get_output_start_lineno(TSRMLS_C)
+#else
+#	define HTTP_GET_OUTPUT_START() \
+		char *output_start_filename = php_output_get_start_filename(TSRMLS_C); \
+		int output_start_lineno = php_output_get_start_lineno(TSRMLS_C)
+#endif
 #define HTTP_CHECK_HEADERS_SENT(action) \
 	if (SG(headers_sent) && !SG(request_info).no_headers) { \
-		char *output_start_filename = php_get_output_start_filename(TSRMLS_C); \
-		int output_start_lineno = php_get_output_start_lineno(TSRMLS_C); \
-		 \
+		HTTP_GET_OUTPUT_START(); \
 		if (output_start_filename) { \
 			http_error_ex(HE_WARNING, HTTP_E_HEADER, "Cannot modify header information - headers already sent by (output started at %s:%d)", \
 				output_start_filename, output_start_lineno); \
@@ -110,23 +117,6 @@ extern STATUS _http_object_new(zend_object_value *ov, const char *cname_str, uin
 		action; \
 	}
 
-#define HTTP_CHECK_OPEN_BASEDIR(file, act) \
-	if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) \
-	{ \
-		const char *tmp = file; \
- \
-		if (!strncasecmp(tmp, "file:", lenof("file:"))) { \
-			tmp += lenof("file:"); \
-			while ((tmp - (const char *)file < 7) && (*tmp == '/' || *tmp == '\\')) ++tmp; \
-		} \
- \
- 		if (	(tmp != file || !strstr(file, "://")) && \
-		 		(!*tmp || php_check_open_basedir(tmp TSRMLS_CC) || \
-		 		(PG(safe_mode) && !php_checkuid(tmp, "rb+", CHECKUID_CHECK_MODE_PARAM)))) { \
-		 		act; \
-		} \
-	}
-
 #define http_log(f, i, m) _http_log_ex((f), (i), (m) TSRMLS_CC)
 extern void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC);
 
@@ -248,8 +238,8 @@ static inline const char *_http_locate_eol(const char *line, int *eol_len)
 	return eol;
 }
 
-#define convert_to_type(t, z) _convert_to_type((t), (z))
-static inline zval *_convert_to_type(int type, zval *z)
+#define http_zset(t, z) _http_zset((t), (z))
+static inline zval *_http_zset(int type, zval *z)
 {
 	if (Z_TYPE_P(z) != type) {
 		switch (type) {
@@ -264,12 +254,10 @@ static inline zval *_convert_to_type(int type, zval *z)
 	}
 	return z;
 }
-#define convert_to_type_ex(t, z, p) _convert_to_type_ex((t), (z), (p))
-static inline zval *_convert_to_type_ex(int type, zval *z, zval **p)
-{
-	if (p) {
-		*p = z;
-	}
+#define http_zsep(t, z) _http_zsep_ex((t), (z), NULL)
+#define http_zsep_ex(t, z, p) _http_zsep_ex((t), (z), (p))
+static inline zval *_http_zsep_ex(int type, zval *z, zval **p) {
+	ZVAL_ADDREF(z);
 	if (Z_TYPE_P(z) != type) {
 		switch (type) {
 			case IS_NULL:	convert_to_null_ex(&z);		break;
@@ -280,13 +268,11 @@ static inline zval *_convert_to_type_ex(int type, zval *z, zval **p)
 			case IS_ARRAY:	convert_to_array_ex(&z);	break;
 			case IS_OBJECT:	convert_to_object_ex(&z);	break;
 		}
+	} else {
+		SEPARATE_ZVAL_IF_NOT_REF(&z);
 	}
 	if (p) {
-		if (*p == z) {
-			*p = NULL;
-		} else {
-			*p = z;
-		}
+		*p = z;
 	}
 	return z;
 }