X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=4f40fa520ab035a07c67c46edd22adaa31e2f069;hp=8906e2cda71793ae61fc92852e73c4fa3f4d8c49;hb=39feb7a7e30bb4b393a6f76aa2f35d4e9275523e;hpb=0d925a2820b9d75b8e32c451fd400863e51e22fe

diff --git a/php_http_api.h b/php_http_api.h
index 8906e2c..4f40fa5 100644
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -19,6 +19,7 @@
 #define PHP_HTTP_API_H
 
 #include "php_http_std_defs.h"
+#include "php_http_send_api.h"
 
 #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);
@@ -33,7 +34,33 @@ extern STATUS _http_parse_key_list(const char *list, HashTable *items, char sepa
 
 #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, long code, const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
+extern void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...);
+
+#define HTTP_CHECK_CURL_INIT(ch, init, action) \
+	if ((!(ch)) && (!((ch) = init))) { \
+		http_error(HE_WARNING, HTTP_E_REQUEST, "Could not initialize curl"); \
+		action; \
+	}
+#define HTTP_CHECK_CONTENT_TYPE(ct, action) \
+	if (!strchr((ct), '/')) { \
+		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, \
+			"Content type \"%s\" does not seem to contain a primary and a secondary part", (ct)); \
+		action; \
+	}
+#define HTTP_CHECK_MESSAGE_TYPE_RESPONSE(msg, action) \
+		if (!HTTP_MSG_TYPE(RESPONSE, (msg))) { \
+			http_error(HE_NOTICE, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_RESPONSE"); \
+			action; \
+		}
+#define HTTP_CHECK_MESSAGE_TYPE_REQUEST(msg, action) \
+		if (!HTTP_MSG_TYPE(REQUEST, (msg))) { \
+			http_error(HE_NOTICE, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_REQUEST"); \
+			action; \
+		}
+
+
+#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);
 
 #define http_exit(s, h) http_exit_ex((s), (h), NULL, 1)
 #define http_exit_ex(s, h, b, e) _http_exit_ex((s), (h), (b), (e) TSRMLS_CC)
@@ -60,6 +87,10 @@ PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_
 #define http_chunked_decode(e, el, d, dl) _http_chunked_decode((e), (el), (d), (dl) TSRMLS_CC)
 PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC);
 
+#define http_guess_content_type(mf, mm, d, l, m) _http_guess_content_type((mf), (mm), (d), (l), (m) TSRMLS_CC)
+PHP_HTTP_API char *_http_guess_content_type(const char *magic_file, long magic_mode, void *data_ptr, size_t data_len, http_send_mode mode TSRMLS_DC);
+
+
 #define http_locate_body _http_locate_body
 static inline const char *_http_locate_body(const char *message)
 {
@@ -75,6 +106,53 @@ static inline const char *_http_locate_body(const char *message)
 	}
 }
 
+#define http_locate_eol _http_locate_eol
+static inline const char *_http_locate_eol(const char *line, int *eol_len)
+{
+	const char *eol = strpbrk(line, "\r\n");
+	
+	if (eol_len) {
+		*eol_len = eol ? ((eol[0] == '\r' && eol[1] == '\n') ? 2 : 1) : 0;
+	}
+	return eol;
+}
+
+#define convert_to_type(t, z) _convert_to_type((t), (z))
+static inline zval *_convert_to_type(int type, zval *z)
+{
+	if (Z_TYPE_P(z) != 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;
+			case IS_DOUBLE:	convert_to_array(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;
+		}
+	}
+	return z;
+}
+#define convert_to_type_ex(t, z) _convert_to_type_ex((t), (z))
+static inline zval *_convert_to_type_ex(int type, zval *z)
+{
+	if (Z_TYPE_P(z) != 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;
+			case IS_DOUBLE:	convert_to_array_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;
+		}
+	}
+	return z;
+}
+
+
 #endif
 
 /*