X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=325378c4d0ec3d2e167d6efaafa8c36ccc196ca4;hp=cbbaf6f7dd1af2a55d34fc391f5fd835dfc7e825;hb=9b6cff9fb09a6a49d75439b03201f8e6c8995e22;hpb=c565d29e26b3b8be1b24a08bec57081aafc33a58

diff --git a/php_http_api.h b/php_http_api.h
index cbbaf6f..325378c 100644
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -21,6 +21,11 @@
 #define HTTP_SUPPORT_ENCODINGS		0x08L
 #define HTTP_SUPPORT_SSLREQUESTS	0x20L
 
+#define HTTP_PARAMS_ALLOW_COMMA		0x01
+#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)
+
 extern PHP_MINIT_FUNCTION(http_support);
 
 #define http_support(f) _http_support(f)
@@ -29,13 +34,33 @@ 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);
 
-#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
 extern void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...);
 
+
+#ifdef ZEND_ENGINE_2
+#define http_exception_wrap(o, n, ce) _http_exception_wrap((o), (n), (ce) TSRMLS_CC)
+extern zval *_http_exception_wrap(zval *old_exception, zval *new_exception, zend_class_entry *ce TSRMLS_DC);
+
+#define http_try \
+{ \
+		zval *old_exception = EG(exception); \
+		EG(exception) = NULL;
+#define http_catch(ex_ce) \
+		if (EG(exception) && old_exception) { \
+			EG(exception) = http_exception_wrap(old_exception, EG(exception), ex_ce); \
+		} \
+}
+#define http_final(ex_ce) \
+	if (EG(exception)) { \
+		zval *exception = http_exception_wrap(EG(exception), NULL, ex_ce); \
+		EG(exception) = NULL; \
+		zend_throw_exception_object(exception TSRMLS_CC); \
+	}
+#endif /* ZEND_ENGINE_2 */
+
+
 #define HTTP_CHECK_CURL_INIT(ch, init, action) \
 	if ((!(ch)) && (!((ch) = init))) { \
 		http_error(HE_WARNING, HTTP_E_REQUEST, "Could not initialize curl"); \
@@ -122,19 +147,35 @@ PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_
 #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);
 
+
+typedef void (*http_parse_params_callback)(void *cb_arg, const char *key, int keylen, const char *val, int vallen TSRMLS_DC);
+
+#define http_parse_params_default_callback _http_parse_params_default_callback
+PHP_HTTP_API void _http_parse_params_default_callback(void *ht, const char *key, int keylen, const char *val, int vallen TSRMLS_DC);
+
+#define http_parse_params(s, f, ht) _http_parse_params_ex((s), (f), _http_parse_params_default_callback, (ht) TSRMLS_CC)
+#define http_parse_params_ex(s, f, cb, a) _http_parse_params_ex((s), (f), (cb), (a) TSRMLS_CC)
+PHP_HTTP_API STATUS _http_parse_params_ex(const char *params, int flags, http_parse_params_callback cb, void *cb_arg TSRMLS_DC);
+
+
 #define http_locate_body _http_locate_body
 static inline const char *_http_locate_body(const char *message)
 {
-	const char *cr = strstr(message, "\r\n\r\n");
-	const char *lf = strstr(message, "\n\n");
-
-	if (lf && cr) {
-		return MIN(lf + 2, cr + 4);
-	} else if (lf || cr) {
-		return MAX(lf + 2, cr + 4);
-	} else {
-		return NULL;
+	const char *body = NULL, *msg = message;
+	
+	while (*msg) {
+		if (*msg == '\n') {
+			if (*(msg+1) == '\n') {
+				body = msg + 2;
+				break;
+			} else if (*(msg+1) == '\r' && *(msg+2) == '\n' && msg != message && *(msg-1) == '\r') {
+				body = msg + 3;
+				break;
+			}
+		}
+		++msg;
 	}
+	return body;
 }
 
 #define http_locate_eol _http_locate_eol
@@ -152,8 +193,7 @@ static inline const char *_http_locate_eol(const char *line, int *eol_len)
 static inline zval *_convert_to_type(int type, zval *z)
 {
 	if (Z_TYPE_P(z) != type) {
-		switch (type)
-		{
+		switch (type) {
 			case IS_NULL:	convert_to_null(z);		break;
 			case IS_BOOL:	convert_to_boolean(z);	break;
 			case IS_LONG:	convert_to_long(z);		break;
@@ -170,8 +210,7 @@ static inline zval *_convert_to_type_ex(int type, zval *z, zval **p)
 {
 	*p = z;
 	if (Z_TYPE_P(z) != type) {
-		switch (type)
-		{
+		switch (type) {
 			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;