X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=e74c18d60e4767c96d76a2263de5534a1ef750b0;hp=809f1426419871057c72e4b0ac0ee6fbcbeb6553;hb=eef82b527f14c30a7c4bd9056e704e306ae97409;hpb=6da3520587f9f79c7429501289512d2a2415b517

diff --git a/php_http_api.h b/php_http_api.h
index 809f142..e74c18d 100644
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -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);
 
@@ -168,9 +169,9 @@ static inline void _http_sleep(double s)
 #define HTTP_MLLISEC (1000)
 #define HTTP_MCROSEC (1000 * 1000)
 #define HTTP_NANOSEC (1000 * 1000 * 1000)
-#define HTTP_MSEC(s) (s * HTTP_MLLISEC)
-#define HTTP_USEC(s) (s * HTTP_MCROSEC)
-#define HTTP_NSEC(s) (s * HTTP_NANOSEC)
+#define HTTP_MSEC(s) ((long)(s * HTTP_MLLISEC))
+#define HTTP_USEC(s) ((long)(s * HTTP_MCROSEC))
+#define HTTP_NSEC(s) ((long)(s * HTTP_NANOSEC))
 
 #if defined(PHP_WIN32)
 	Sleep((DWORD) HTTP_MSEC(s));
@@ -227,7 +228,7 @@ static inline const char *_http_locate_body(const char *message)
 			if (*(msg+1) == '\n') {
 				body = msg + 2;
 				break;
-			} else if (*(msg+1) == '\r' && *(msg+2) == '\n' && msg != message && *(msg-1) == '\r') {
+			} else if (*(msg+1) == '\r' && *(msg+2) == '\n') {
 				body = msg + 3;
 				break;
 			}
@@ -248,8 +249,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,10 +265,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)
-{
-	*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) {
+	SEPARATE_ARG_IF_REF(z);
 	if (Z_TYPE_P(z) != type) {
 		switch (type) {
 			case IS_NULL:	convert_to_null_ex(&z);		break;
@@ -279,42 +280,12 @@ static inline zval *_convert_to_type_ex(int type, zval *z, zval **p)
 			case IS_OBJECT:	convert_to_object_ex(&z);	break;
 		}
 	}
-	if (*p == z) {
-		*p = NULL;
-	} else {
+	if (p) {
 		*p = z;
 	}
 	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);
-#ifdef Z_SET_REFCOUNT
-	Z_SET_REFCOUNT_P(copy, 0);
-	Z_UNSET_ISREF_P(copy);
-#else
-	copy->refcount = 0;
-	copy->is_ref = 0;
-#endif
-	
-	return copy;
-}
-
-#define zval_free(z) _zval_free(z)
-static inline void _zval_free(zval **z)
-{
-	zval_dtor(*z);
-	FREE_ZVAL(*z);
-	*z = NULL;
-}
-
 typedef struct _HashKey {
 	char *str;
 	uint len;
@@ -346,10 +317,10 @@ typedef struct _HashKey {
 #define array_copy(src, dst) zend_hash_copy(dst, src, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *))
 #define ARRAY_JOIN_STRONLY 1
 #define ARRAY_JOIN_PRETTIFY 2
-#define array_join(src, dst, append, flags) zend_hash_apply_with_arguments(src, (append)?apply_array_append_func:apply_array_merge_func, 2, dst, (int)flags)
+#define array_join(src, dst, append, flags) zend_hash_apply_with_arguments(src HTTP_ZAPI_HASH_TSRMLS_CC, (append)?apply_array_append_func:apply_array_merge_func, 2, dst, (int)flags)
 
-extern int apply_array_append_func(void *pDest, int num_args, va_list args, zend_hash_key *hash_key);
-extern int apply_array_merge_func(void *pDest, int num_args, va_list args, zend_hash_key *hash_key);
+extern int apply_array_append_func(void *pDest HTTP_ZAPI_HASH_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key);
+extern int apply_array_merge_func(void *pDest HTTP_ZAPI_HASH_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key);
 
 #endif