X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_methods.c;h=6b7794780f59df7999770b32f9ceb06265c0104d;hp=d22ae96e912c00c050ef0cc7f3c55492e9805ab9;hb=fcebff9b60cdeede7970f5b4bb7b01318b4415c3;hpb=af674f03c32f0f56b7f8c67e61c7e86b3ea23be5

diff --git a/http_methods.c b/http_methods.c
index d22ae96..6b77947 100644
--- a/http_methods.c
+++ b/http_methods.c
@@ -21,9 +21,19 @@
 
 #include "php.h"
 #include "php_http.h"
+#include "php_http_std_defs.h"
 #include "php_http_api.h"
+#include "php_http_cache_api.h"
 #include "php_http_curl_api.h"
-#include "php_http_std_defs.h"
+#include "php_http_date_api.h"
+#include "php_http_headers_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
 
@@ -42,13 +52,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();
 }
 /* }}} */
 
@@ -438,6 +447,11 @@ PHP_METHOD(HttpResponse, send)
 	do_cache = GET_PROP(obj, cache);
 	do_gzip  = GET_PROP(obj, gzip);
 
+	/* gzip */
+	if (Z_LVAL_P(do_gzip)) {
+		php_start_ob_buffer_named("ob_gzhandler", 0, 1 TSRMLS_CC);
+	}
+
 	/* caching */
 	if (Z_LVAL_P(do_cache)) {
 		zval *cctrl, *etag, *lmod, *ccraw;
@@ -458,11 +472,6 @@ PHP_METHOD(HttpResponse, send)
 		}
 	}
 
-	/* gzip */
-	if (Z_LVAL_P(do_gzip)) {
-		/* ... */
-	}
-
 	/* content type */
 	{
 		zval *ctype = GET_PROP(obj, contentType);
@@ -512,6 +521,83 @@ PHP_METHOD(HttpResponse, send)
 /* }}} */
 /* }}} */
 
+/* {{{ HttpMessage */
+
+/* {{{ void HttpMessage::__construct([string raw_message])
+ *
+ * Instantiate a new HttpMessage object based on the optionally provided
+ * raw message.  An HTTP Message can be either a response or a request.
+ */
+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);
+	}
+}
+/* }}} */
+
+/* {{{ void HttpMessage::setRaw(string raw_message)
+ *
+ * Parse a new raw message.
+ */
+PHP_METHOD(HttpMessage, setRaw)
+{
+	zval *message;
+	getObject(http_message_object, obj);
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &message)) {
+		return;
+	}
+
+	convert_to_string(message);
+	SET_PROP(obj, raw, message);
+}
+/* }}} */
+
+/* {{{ string HttpMessage::getBody()
+ *
+ * Get the body of the parsed Message.
+ */
+PHP_METHOD(HttpMessage, getBody)
+{
+	zval *body;
+	getObject(http_message_object, obj);
+
+	NO_ARGS;
+
+	body = GET_PROP(obj, body);
+	RETURN_STRINGL(Z_STRVAL_P(body), Z_STRLEN_P(body), 1);
+}
+/* }}} */
+
+/* {{{ array HttpMessage::getHeaders()
+ *
+ * Get Message Headers.
+ */
+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);
+}
+/* }}} */
+
+/* }}} */
+
 #ifdef HTTP_HAVE_CURL
 /* {{{ HttpRequest */
 
@@ -527,22 +613,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();
 }
 /* }}} */
 
@@ -641,11 +727,74 @@ PHP_METHOD(HttpRequest, unsetOptions)
 }
 /* }}} */
 
-/* {{{ proto bool HttpRequest::addHeader(array header)
+/* {{{ proto bool HttpRequest::setSslOptions(array options)
+ *
+ * Set additional SSL options.
+ */
+PHP_METHOD(HttpRequest, setSslOptions)
+{
+	zval *opts, *old_opts, **ssl_options;
+	getObject(http_request_object, obj);
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &opts)) {
+		RETURN_FALSE;
+	}
+
+	old_opts = GET_PROP(obj, options);
+
+	if (SUCCESS == zend_hash_find(Z_ARRVAL_P(old_opts), "ssl", sizeof("ssl"), (void **) &ssl_options)) {
+		array_merge(opts, *ssl_options);
+	} else {
+		zval_add_ref(&opts);
+		add_assoc_zval(old_opts, "ssl", opts);
+	}
+
+	RETURN_TRUE;
+}
+/* }}} */
+
+/* {{{ proto array HttpRequest::getSslOtpions()
+ *
+ * Get previously set SSL options.
+ */
+PHP_METHOD(HttpRequest, getSslOptions)
+{
+	zval *opts, **ssl_options;
+	getObject(http_request_object, obj);
+
+	NO_ARGS;
+
+	opts = GET_PROP(obj, options);
+
+	array_init(return_value);
+
+	if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "ssl", sizeof("ssl"), (void **) &ssl_options)) {
+		array_copy(*ssl_options, return_value);
+	}
+}
+/* }}} */
+
+/* {{{ proto void HttpRequest::unsetSslOptions()
  *
- * Add (a) request header name/value pair(s).
+ * Unset previously set SSL options.
  */
-PHP_METHOD(HttpRequest, addHeader)
+PHP_METHOD(HttpRequest, unsetSslOptions)
+{
+	zval *opts;
+	getObject(http_request_object, obj);
+
+	NO_ARGS;
+
+	opts = GET_PROP(obj, options);
+	zend_hash_del(Z_ARRVAL_P(opts), "ssl", sizeof("ssl"));
+}
+/* }}} */
+
+/* {{{ proto bool HttpRequest::addHeaders(array headers)
+ *
+ * Add request header name/value pairs.
+ */
+PHP_METHOD(HttpRequest, addHeaders)
 {
 	zval *opts, **headers, *new_headers;
 	getObject(http_request_object, obj);
@@ -667,11 +816,48 @@ PHP_METHOD(HttpRequest, addHeader)
 }
 /* }}} */
 
-/* {{{ proto bool HttpRequest::addCookie(array cookie)
+/* {{{ proto array HttpRequest::getHeaders()
  *
- * Add (a) cookie(s).
+ * Get previously set request headers.
  */
-PHP_METHOD(HttpRequest, addCookie)
+PHP_METHOD(HttpRequest, getHeaders)
+{
+	zval *opts, **headers;
+	getObject(http_request_object, obj);
+
+	NO_ARGS;
+
+	opts = GET_PROP(obj, options);
+
+	array_init(return_value);
+
+	if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void **) &headers)) {
+		array_copy(*headers, return_value);
+	}
+}
+/* }}} */
+
+/* {{{ proto void HttpRequest::unsetHeaders()
+ *
+ * Unset previously set request headers.
+ */
+PHP_METHOD(HttpRequest, unsetHeaders)
+{
+	zval *opts;
+	getObject(http_request_object, obj);
+
+	NO_ARGS;
+
+	opts = GET_PROP(obj, options);
+	zend_hash_del(Z_ARRVAL_P(opts), "headers", sizeof("headers"));
+}
+/* }}} */
+
+/* {{{ proto bool HttpRequest::addCookies(array cookies)
+ *
+ * Add cookies.
+ */
+PHP_METHOD(HttpRequest, addCookies)
 {
 	zval *opts, **cookies, *new_cookies;
 	getObject(http_request_object, obj);
@@ -693,6 +879,42 @@ PHP_METHOD(HttpRequest, addCookie)
 }
 /* }}} */
 
+/* {{{ proto array HttpRequest::getCookies()
+ *
+ * Get previously set cookies.
+ */
+PHP_METHOD(HttpRequest, getCookies)
+{
+	zval *opts, **cookies;
+	getObject(http_request_object, obj);
+
+	NO_ARGS;
+
+	opts = GET_PROP(obj, options);
+
+	array_init(return_value);
+
+	if (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "cookies", sizeof("cookies"), (void **) &cookies)) {
+		array_copy(*cookies, return_value);
+	}
+}
+/* }}} */
+
+/* {{{ proto void HttpRequest::unsetCookies()
+ *
+ */
+PHP_METHOD(HttpRequest, unsetCookies)
+{
+	zval *opts;
+	getObject(http_request_object, obj);
+
+	NO_ARGS;
+
+	opts = GET_PROP(obj, options);
+	zend_hash_del(Z_ARRVAL_P(opts), "cookies", sizeof("cookies"));
+}
+/* }}} */
+
 /* {{{ proto bool HttpRequest::setURL(string url)
  *
  * Set the request URL.
@@ -1066,7 +1288,7 @@ PHP_METHOD(HttpRequest, getResponseData)
 }
 /* }}} */
 
-/* {{{ proto string HttpRequest::getResponseHeader([string name])
+/* {{{ proto mixed HttpRequest::getResponseHeader([string name])
  *
  * Get response header(s) after the request has been sent.
  */
@@ -1095,6 +1317,94 @@ PHP_METHOD(HttpRequest, getResponseHeader)
 		RETURN_FALSE;
 	}
 }
+/* }}} */
+
+/* {{{ proto array HttpRequest::getResponseCookie([string name])
+ *
+ * Get response cookie(s) after the request has been sent.
+ */
+PHP_METHOD(HttpRequest, getResponseCookie)
+{
+	zval *data, **headers;
+	char *cookie_name = NULL;
+	int cookie_len = 0;
+	getObject(http_request_object, obj);
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &cookie_name, &cookie_len)) {
+		RETURN_FALSE;
+	}
+
+	array_init(return_value);
+
+	data = GET_PROP(obj, responseData);
+	if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) {
+		ulong idx = 0;
+		char *key = NULL;
+		zval **header = NULL;
+
+		FOREACH_HASH_KEYVAL(Z_ARRVAL_PP(headers), key, idx, header) {
+			if (key && !strcasecmp(key, "Set-Cookie")) {
+				/* several cookies? */
+				if (Z_TYPE_PP(header) == IS_ARRAY) {
+					zval **cookie;
+
+					FOREACH_HASH_VAL(Z_ARRVAL_PP(header), cookie) {
+						zval *cookie_hash;
+						MAKE_STD_ZVAL(cookie_hash);
+						array_init(cookie_hash);
+
+						if (SUCCESS == http_parse_cookie(Z_STRVAL_PP(cookie), Z_ARRVAL_P(cookie_hash))) {
+							if (!cookie_len) {
+								add_next_index_zval(return_value, cookie_hash);
+							} else {
+								zval **name;
+
+								if (	(SUCCESS == zend_hash_find(Z_ARRVAL_P(cookie_hash), "name", sizeof("name"), (void **) &name)) &&
+										(!strcmp(Z_STRVAL_PP(name), cookie_name))) {
+									add_next_index_zval(return_value, cookie_hash);
+									return; /* <<< FOUND >>> */
+								} else {
+									zval_dtor(cookie_hash);
+									efree(cookie_hash);
+								}
+							}
+						} else {
+							zval_dtor(cookie_hash);
+							efree(cookie_hash);
+						}
+					}
+				} else {
+					zval *cookie_hash;
+					MAKE_STD_ZVAL(cookie_hash);
+					array_init(cookie_hash);
+
+					if (SUCCESS == http_parse_cookie(Z_STRVAL_PP(header), Z_ARRVAL_P(cookie_hash))) {
+						if (!cookie_len) {
+							add_next_index_zval(return_value, cookie_hash);
+						} else {
+							zval **name;
+
+							if (	(SUCCESS == zend_hash_find(Z_ARRVAL_P(cookie_hash), "name", sizeof("name"), (void **) &name)) &&
+									(!strcmp(Z_STRVAL_PP(name), cookie_name))) {
+								add_next_index_zval(return_value, cookie_hash);
+							} else {
+								zval_dtor(cookie_hash);
+								efree(cookie_hash);
+							}
+						}
+					} else {
+						zval_dtor(cookie_hash);
+						efree(cookie_hash);
+					}
+				}
+				break;
+			}
+			/* reset key */
+			key = NULL;
+		}
+	}
+}
+/* }}} */
 
 /* {{{ proto string HttpRequest::getResponseBody()
  *
@@ -1129,7 +1439,7 @@ PHP_METHOD(HttpRequest, getResponseCode)
 
 	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), "Status", sizeof("Status"), (void **) &code))) {
+			(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 {
@@ -1208,6 +1518,8 @@ PHP_METHOD(HttpRequest, send)
 	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");
@@ -1311,9 +1623,7 @@ PHP_METHOD(HttpRequest, send)
 	efree(request_uri);
 
 	/* final data handling */
-	if (status != SUCCESS) {
-		RETURN_FALSE;
-	} else {
+	if (status == SUCCESS) {
 		char *body = NULL;
 		size_t body_len = 0;
 		zval *zheaders;
@@ -1335,7 +1645,9 @@ PHP_METHOD(HttpRequest, send)
 
 		RETURN_TRUE;
 	}
-	/* */
+
+	SET_EH_NORMAL();
+	RETURN_SUCCESS(status);
 }
 /* }}} */
 /* }}} */