X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=cbbaf6f7dd1af2a55d34fc391f5fd835dfc7e825;hp=694ddc015de9fdfb1b26c8f1bcf1312e51c2f337;hb=424eec077256edbed079988cfa4dccab5b979536;hpb=14819be2113881e1030d23c6a1a32e17083ab406

diff --git a/php_http_api.h b/php_http_api.h
index 694ddc0..cbbaf6f 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-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -29,13 +29,8 @@ PHP_HTTP_API long _http_support(long feature);
 #define pretty_key(key, key_len, uctitle, xhyphen) _http_pretty_key(key, key_len, uctitle, xhyphen)
 extern char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen);
 
-typedef void (*http_key_list_decode_t)(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC);
-#define http_key_list_default_decoder _http_key_list_default_decoder
-extern void _http_key_list_default_decoder(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC);
-
-#define http_parse_cookie(l, i) _http_parse_key_list((l), (i), ';', http_key_list_default_decoder, 1 TSRMLS_CC)
-#define http_parse_key_list(l, i, s, d, f) _http_parse_key_list((l), (i), (s), (d), (f) TSRMLS_CC)
-extern STATUS _http_parse_key_list(const char *list, HashTable *items, char separator, http_key_list_decode_t decode, zend_bool first_entry_is_name_value_pair TSRMLS_DC);
+#define http_parse_cookie(l, i) _http_parse_cookie((l), (i) TSRMLS_CC)
+PHP_HTTP_API STATUS _http_parse_cookie(const char *list, HashTable *items TSRMLS_DC);
 
 #define http_error(type, code, string) _http_error_ex(type, code, "%s", string)
 #define http_error_ex _http_error_ex
@@ -89,12 +84,12 @@ extern void _http_error_ex(long type TSRMLS_DC, long code, const char *format, .
  \
 		if (!strncasecmp(tmp, "file:", lenof("file:"))) { \
 			tmp += lenof("file:"); \
-			while (*tmp == '/' || *tmp == '\\') ++tmp; \
+			while ((tmp - (const char *)file < 7) && (*tmp == '/' || *tmp == '\\')) ++tmp; \
 		} \
  \
- 		if (!*tmp || php_check_open_basedir(tmp TSRMLS_CC) || \
-		 		(PG(safe_mode) && !php_checkuid(tmp, "rb+", CHECKUID_CHECK_MODE_PARAM))) { \
-		 		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Permission denied: %s", file); \
+ 		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; \
 		} \
 	}
@@ -124,6 +119,8 @@ PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zen
 #define http_get_request_body_ex(b, l, d) _http_get_request_body_ex((b), (l), (d) TSRMLS_CC)
 PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_bool dup TSRMLS_DC);
 
+#define http_get_request_body_stream() _http_get_request_body_stream(TSRMLS_C)
+PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D);
 
 #define http_locate_body _http_locate_body
 static inline const char *_http_locate_body(const char *message)
@@ -160,7 +157,7 @@ static inline zval *_convert_to_type(int type, zval *z)
 			case IS_NULL:	convert_to_null(z);		break;
 			case IS_BOOL:	convert_to_boolean(z);	break;
 			case IS_LONG:	convert_to_long(z);		break;
-			case IS_DOUBLE:	convert_to_array(z);	break;
+			case IS_DOUBLE:	convert_to_double(z);	break;
 			case IS_STRING:	convert_to_string(z);	break;
 			case IS_ARRAY:	convert_to_array(z);	break;
 			case IS_OBJECT:	convert_to_object(z);	break;
@@ -178,7 +175,7 @@ static inline zval *_convert_to_type_ex(int type, zval *z, zval **p)
 			case IS_NULL:	convert_to_null_ex(&z);		break;
 			case IS_BOOL:	convert_to_boolean_ex(&z);	break;
 			case IS_LONG:	convert_to_long_ex(&z);		break;
-			case IS_DOUBLE:	convert_to_array_ex(&z);	break;
+			case IS_DOUBLE:	convert_to_double_ex(&z);	break;
 			case IS_STRING:	convert_to_string_ex(&z);	break;
 			case IS_ARRAY:	convert_to_array_ex(&z);	break;
 			case IS_OBJECT:	convert_to_object_ex(&z);	break;
@@ -192,6 +189,29 @@ static inline zval *_convert_to_type_ex(int type, zval *z, zval **p)
 	return z;
 }
 
+#define zval_copy(t, z) _zval_copy((t), (z) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+static inline zval *_zval_copy(int type, zval *z ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+{
+	zval *copy;
+	
+	copy = emalloc_rel(sizeof(zval));
+	*copy = *z;
+	zval_copy_ctor(copy);
+	convert_to_type(type, copy);
+	copy->refcount = 0;
+	copy->is_ref = 0;
+	
+	return copy;
+}
+
+#define zval_free(z) _zval_free(z)
+static inline void _zval_free(zval **z)
+{
+	zval_dtor(*z);
+	FREE_ZVAL(*z);
+	*z = NULL;
+}
+
 #endif
 
 /*