X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_methods.c;h=af7586d86e2ba3ddc7f5288258cdacc2e5d3d9c2;hp=a6e2f2007ff3fc0453f9fc6b455c8161c2661d57;hb=cf9967800843ea01e77b374b4d78fad4bc18a3f6;hpb=80fd11fc5b72c8fadea499aec6e617d415334c2d

diff --git a/http_methods.c b/http_methods.c
index a6e2f20..af7586d 100644
--- a/http_methods.c
+++ b/http_methods.c
@@ -27,12 +27,14 @@
 #include "php_http_curl_api.h"
 #include "php_http_date_api.h"
 #include "php_http_headers_api.h"
+#include "php_http_message_api.h"
 #include "php_http_send_api.h"
 #include "php_http_url_api.h"
 
 #include "php_http_message_object.h"
 #include "php_http_response_object.h"
 #include "php_http_request_object.h"
+#include "php_http_exception_object.h"
 
 #ifdef ZEND_ENGINE_2
 
@@ -51,13 +53,12 @@ PHP_METHOD(HttpResponse, __construct)
 	zend_bool do_cache = 0, do_gzip = 0;
 	getObject(http_response_object, obj);
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bb", &do_cache, &do_gzip)) {
-		// throw exception
-		return;
+	SET_EH_THROW_HTTP();
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bb", &do_cache, &do_gzip)) {
+		UPD_PROP(obj, long, cache, do_cache);
+		UPD_PROP(obj, long, gzip, do_gzip);
 	}
-
-	UPD_PROP(obj, long, cache, do_cache);
-	UPD_PROP(obj, long, gzip, do_gzip);
+	SET_EH_NORMAL();
 }
 /* }}} */
 
@@ -152,7 +153,7 @@ PHP_METHOD(HttpResponse, setCacheControl)
 	}
 
 	if ((!raw) && (strcmp(ccontrol, "public") && strcmp(ccontrol, "private") && strcmp(ccontrol, "no-cache"))) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cache-Control '%s' doesn't match public, private or no-cache", ccontrol);
+		http_error_ex(E_WARNING, HTTP_E_PARAM, "Cache-Control '%s' doesn't match public, private or no-cache", ccontrol);
 		RETURN_FALSE;
 	}
 
@@ -193,8 +194,7 @@ PHP_METHOD(HttpResponse, setContentType)
 	}
 
 	if (!strchr(ctype, '/')) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
-			"Content type '%s' doesn't seem to contain a primary and a secondary part", ctype);
+		http_error_ex(E_WARNING, HTTP_E_PARAM, "Content type '%s' doesn't seem to contain a primary and a secondary part", ctype);
 		RETURN_FALSE;
 	}
 
@@ -523,6 +523,29 @@ PHP_METHOD(HttpResponse, send)
 
 /* {{{ HttpMessage */
 
+/* {{{ static HttpMessage HttpMessage::fromString(string raw_message)
+ *
+ * Create an HttpMessage object from a string.
+ */
+PHP_METHOD(HttpMessage, fromString)
+{
+	char *string = NULL;
+	int length = 0;
+	http_message *msg = NULL;
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &length)) {
+		RETURN_NULL();
+	}
+
+	if (!(msg = http_message_parse(string, length))) {
+		RETURN_NULL();
+	}
+
+	Z_TYPE_P(return_value) = IS_OBJECT;
+	return_value->value.obj = http_message_object_from_msg(msg);
+}
+/* }}} */
+
 /* {{{ void HttpMessage::__construct([string raw_message])
  *
  * Instantiate a new HttpMessage object based on the optionally provided
@@ -531,17 +554,16 @@ PHP_METHOD(HttpResponse, send)
 PHP_METHOD(HttpMessage, __construct)
 {
 	zval *message = NULL;
-	int message_len;
 	getObject(http_message_object, obj);
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z/", &message)) {
-		return;
-	}
-
-	if (message) {
-		convert_to_string(message);
-		SET_PROP(obj, raw, message);
+	SET_EH_THROW_HTTP();
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z/", &message)) {
+		if (message) {
+			convert_to_string(message);
+			SET_PROP(obj, raw, message);
+		}
 	}
+	SET_EH_NORMAL();
 }
 /* }}} */
 
@@ -553,7 +575,7 @@ PHP_METHOD(HttpMessage, setRaw)
 {
 	zval *message;
 	getObject(http_message_object, obj);
-	
+
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &message)) {
 		return;
 	}
@@ -571,7 +593,7 @@ PHP_METHOD(HttpMessage, getBody)
 {
 	zval *body;
 	getObject(http_message_object, obj);
-	
+
 	NO_ARGS;
 
 	body = GET_PROP(obj, body);
@@ -587,15 +609,131 @@ PHP_METHOD(HttpMessage, getHeaders)
 {
 	zval *headers;
 	getObject(http_message_object, obj);
-	
+
 	NO_ARGS;
-	
+
 	headers = GET_PROP(obj, headers);
 	array_init(return_value);
 	array_copy(headers, return_value);
 }
 /* }}} */
 
+/* {{{ long HttpMessage::getType()
+ *
+ * Get Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE)
+ */
+PHP_METHOD(HttpMessage, getType)
+{
+	zval *type;
+	getObject(http_message_object, obj);
+
+	NO_ARGS;
+
+	type = GET_PROP(obj, type);
+	RETURN_LONG(Z_LVAL_P(type));
+}
+/* }}} */
+
+/* {{{ int HttpMessage::getResponseCode()
+ *
+ * Get the Response Code of the Message.
+ */
+PHP_METHOD(HttpMessage, getResponseCode)
+{
+	zval *status;
+	getObject(http_message_object, obj);
+
+	NO_ARGS;
+
+	if (obj->message->type != HTTP_MSG_RESPONSE) {
+		RETURN_NULL();
+	}
+
+	status = GET_PROP(obj, responseCode);
+	RETURN_LONG(Z_LVAL_P(status));
+}
+/* }}} */
+
+/* {{{ string HttpMessage::getRequestMethod()
+ *
+ * Get the Request Method of the Message.
+ */
+PHP_METHOD(HttpMessage, getRequestMethod)
+{
+	zval *method;
+	getObject(http_message_object, obj);
+
+	NO_ARGS;
+
+	if (obj->message->type != HTTP_MSG_REQUEST) {
+		RETURN_NULL();
+	}
+
+	method = GET_PROP(obj, requestMethod);
+	RETURN_STRINGL(Z_STRVAL_P(method), Z_STRLEN_P(method), 1);
+}
+/* }}} */
+
+/* {{{ string HttpMessage::getRequestUri()
+ *
+ * Get the Request URI of the Message.
+ */
+PHP_METHOD(HttpMessage, getRequestUri)
+{
+	zval *uri;
+	getObject(http_message_object, obj);
+
+	NO_ARGS;
+
+	if (obj->message->type != HTTP_MSG_REQUEST) {
+		RETURN_NULL();
+	}
+
+	uri = GET_PROP(obj, requestUri);
+	RETURN_STRINGL(Z_STRVAL_P(uri), Z_STRLEN_P(uri), 1);
+}
+/* }}} */
+
+/* {{{ string HttpMessage::getHttpVersion()
+ *
+ * Get the HTTP Protocol Version of the Message.
+ */
+PHP_METHOD(HttpMessage, getHttpVersion)
+{
+	zval *version;
+	char ver[4] = {0};
+	getObject(http_message_object, obj);
+
+	NO_ARGS;
+
+	version = GET_PROP(obj, httpVersion);
+
+	if (Z_TYPE_P(version) == IS_NULL) {
+		RETURN_NULL();
+	}
+
+	sprintf(ver, "1.1f", Z_DVAL_P(version));
+	RETURN_STRINGL(ver, 3, 1);
+}
+/* }}} */
+
+/* {{{ string HttpMessage::toString()
+ *
+ * Get the string representation of the Message.
+ */
+PHP_METHOD(HttpMessage, toString)
+{
+	char *string;
+	size_t length;
+	getObject(http_message_object, obj);
+
+	NO_ARGS;
+
+	http_message_tostring(obj->message, &string, &length);
+	RETURN_STRINGL(string, length, 0);
+}
+/* }}} */
+
 /* }}} */
 
 #ifdef HTTP_HAVE_CURL
@@ -613,22 +751,22 @@ PHP_METHOD(HttpRequest, __construct)
 	long meth = -1;
 	getObject(http_request_object, obj);
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sl", &URL, &URL_len, &meth)) {
-		return;
-	}
-
-	INIT_PARR(obj, options);
-	INIT_PARR(obj, responseInfo);
-	INIT_PARR(obj, responseData);
-	INIT_PARR(obj, postData);
-	INIT_PARR(obj, postFiles);
+	SET_EH_THROW_HTTP();
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sl", &URL, &URL_len, &meth)) {
+		INIT_PARR(obj, options);
+		INIT_PARR(obj, responseInfo);
+		INIT_PARR(obj, responseData);
+		INIT_PARR(obj, postData);
+		INIT_PARR(obj, postFiles);
 
-	if (URL) {
-		UPD_PROP(obj, string, url, URL);
-	}
-	if (meth > -1) {
-		UPD_PROP(obj, long, method, meth);
+		if (URL) {
+			UPD_PROP(obj, string, url, URL);
+		}
+		if (meth > -1) {
+			UPD_PROP(obj, long, method, meth);
+		}
 	}
+	SET_EH_NORMAL();
 }
 /* }}} */
 
@@ -1001,9 +1139,7 @@ PHP_METHOD(HttpRequest, setContentType)
 	}
 
 	if (!strchr(ctype, '/')) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
-			"Content-Type '%s' doesn't seem to contain a primary and a secondary part",
-			ctype);
+		http_error_ex(E_WARNING, HTTP_E_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", ctype);
 		RETURN_FALSE;
 	}
 
@@ -1214,7 +1350,7 @@ PHP_METHOD(HttpRequest, addPostFile)
 
 	if (type_len) {
 		if (!strchr(type, '/')) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", type);
+			http_error_ex(E_WARNING, HTTP_E_PARAM, "Content-Type '%s' doesn't seem to contain a primary and a secondary part", type);
 			RETURN_FALSE;
 		}
 	} else {
@@ -1432,19 +1568,13 @@ PHP_METHOD(HttpRequest, getResponseBody)
  */
 PHP_METHOD(HttpRequest, getResponseCode)
 {
-	zval **code, **hdrs, *data;
+	zval *code;
 	getObject(http_request_object, obj);
 
 	NO_ARGS;
 
-	data = GET_PROP(obj, responseData);
-	if (	(SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &hdrs)) &&
-			(SUCCESS == zend_hash_find(Z_ARRVAL_PP(hdrs), "Response Status", sizeof("Response Status"), (void **) &code))) {
-		RETVAL_STRINGL(Z_STRVAL_PP(code), Z_STRLEN_PP(code), 1);
-		convert_to_long(return_value);
-	} else {
-		RETURN_FALSE;
-	}
+	code = GET_PROP(obj, responseCode);
+	RETURN_LONG(Z_LVAL_P(code));
 }
 /* }}} */
 
@@ -1470,7 +1600,7 @@ PHP_METHOD(HttpRequest, getResponseInfo)
 		if (SUCCESS == zend_hash_find(Z_ARRVAL_P(info), pretty_key(info_name, info_len, 0, 0), info_len + 1, (void **) &infop)) {
 			RETURN_ZVAL(*infop, 1, ZVAL_PTR_DTOR);
 		} else {
-			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not find response info named %s", info_name);
+			http_error_ex(E_NOTICE, HTTP_E_PARAM, "Could not find response info named %s", info_name);
 			RETURN_FALSE;
 		}
 	} else {
@@ -1480,6 +1610,24 @@ PHP_METHOD(HttpRequest, getResponseInfo)
 }
 /* }}}*/
 
+/* {{{ proto HttpMessage HttpRequest::getResponseMessage()
+ *
+ * Get the full response as HttpMessage object.
+ */
+PHP_METHOD(HttpRequest, getResponseMessage)
+{
+	zval *message;
+	getObject(http_request_object, obj);
+
+	NO_ARGS;
+
+	message = GET_PROP(obj, responseMessage);
+	Z_TYPE_P(return_value) = IS_OBJECT;
+	return_value->is_ref = 1;
+	return_value->value.obj = message->value.obj;
+	zval_add_ref(&return_value);
+}
+
 /* {{{ proto bool HttpRequest::send()
  *
  * Send the HTTP request.
@@ -1490,8 +1638,13 @@ PHP_METHOD(HttpRequest, getResponseInfo)
  * $r = new HttpRequest('http://example.com/feed.rss', HTTP_GET);
  * $r->setOptions(array('lastmodified' => filemtime('local.rss')));
  * $r->addQueryData(array('category' => 3));
- * if ($r->send() && $r->getResponseCode() == 200) {
- *     file_put_contents('local.rss', $r->getResponseBody());
+ * try {
+ *     $r->send();
+ *     if ($r->getResponseCode() == 200) {
+ *         file_put_contents('local.rss', $r->getResponseBody());
+ *    }
+ * } catch (HttpException $ex) {
+ *     echo $ex;
  * }
  * ?>
  * </pre>
@@ -1513,14 +1666,15 @@ PHP_METHOD(HttpRequest, send)
 {
 	STATUS status = FAILURE;
 	zval *meth, *URL, *qdata, *opts, *info, *resp;
-	char *response_data, *request_uri;
-	size_t response_len;
+	char *request_uri;
 	getObject(http_request_object, obj);
 
 	NO_ARGS;
 
+	SET_EH_THROW_HTTP();
+
 	if ((!obj->ch) && (!(obj->ch = curl_easy_init()))) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initilaize cURL");
+		http_error(E_WARNING, HTTP_E_CURL, "Could not initilaize curl");
 		RETURN_FALSE;
 	}
 
@@ -1546,11 +1700,11 @@ PHP_METHOD(HttpRequest, send)
 	switch (Z_LVAL_P(meth))
 	{
 		case HTTP_GET:
-			status = http_get_ex(obj->ch, request_uri, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &response_data, &response_len);
+			status = http_get_ex(obj->ch, request_uri, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
 		break;
 
 		case HTTP_HEAD:
-			status = http_head_ex(obj->ch, request_uri, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &response_data, &response_len);
+			status = http_head_ex(obj->ch, request_uri, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
 		break;
 
 		case HTTP_POST:
@@ -1563,7 +1717,7 @@ PHP_METHOD(HttpRequest, send)
 				if (!zend_hash_num_elements(Z_ARRVAL_P(post_files))) {
 
 					/* urlencoded post */
-					status = http_post_array_ex(obj->ch, request_uri, Z_ARRVAL_P(post_data), Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &response_data, &response_len);
+					status = http_post_array_ex(obj->ch, request_uri, Z_ARRVAL_P(post_data), Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
 
 				} else {
 
@@ -1608,7 +1762,7 @@ PHP_METHOD(HttpRequest, send)
 						}
 					}
 
-					status = http_post_curldata_ex(obj->ch, request_uri, http_post_data[0], Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &response_data, &response_len);
+					status = http_post_curldata_ex(obj->ch, request_uri, http_post_data[0], Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &obj->response);
 					curl_formfree(http_post_data[0]);
 				}
 			}
@@ -1621,31 +1775,37 @@ PHP_METHOD(HttpRequest, send)
 	efree(request_uri);
 
 	/* final data handling */
-	if (status != SUCCESS) {
-		RETURN_FALSE;
-	} else {
-		char *body = NULL;
-		size_t body_len = 0;
-		zval *zheaders;
+	if (status == SUCCESS) {
+		http_message *msg;
 
-		MAKE_STD_ZVAL(zheaders)
-		array_init(zheaders);
+		if (msg = http_message_parse(PHPSTR_VAL(&obj->response), PHPSTR_LEN(&obj->response))) {
+			zval *headers, *message;
+			char *body;
+			size_t body_len;
 
-		if (SUCCESS != http_split_response_ex(response_data, response_len, Z_ARRVAL_P(zheaders), &body, &body_len)) {
-			zval_dtor(zheaders);
-			efree(zheaders),
-			efree(response_data);
-			RETURN_FALSE;
-		}
+			UPD_PROP(obj, long, responseCode, msg->info.response.code);
 
-		add_assoc_zval(resp, "headers", zheaders);
-		add_assoc_stringl(resp, "body", body, body_len, 0);
+			MAKE_STD_ZVAL(headers)
+			array_init(headers);
 
-		efree(response_data);
+			zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+			phpstr_data(PHPSTR(msg), &body, &body_len);
 
-		RETURN_TRUE;
+			add_assoc_zval(resp, "headers", headers);
+			add_assoc_stringl(resp, "body", body, body_len, 0);
+
+			message = GET_PROP(obj, responseMessage);
+			zval_dtor(message);
+			Z_TYPE_P(message)  = IS_OBJECT;
+			message->value.obj = http_message_object_from_msg(msg);
+			SET_PROP(obj, responseMessage, message);
+		} else {
+			status = FAILURE;
+		}
 	}
-	/* */
+
+	SET_EH_NORMAL();
+	RETURN_SUCCESS(status);
 }
 /* }}} */
 /* }}} */