X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_client_curl.c;h=21ee32eefbc23cf9bb49ba9d68c6a4d29fba647c;hb=1ecdbf52888dde9b59dacfd399494a2b1f43adf1;hp=fb8ecf678f3e5e07366f7e772fd18d6551704b2a;hpb=f753226f1f45e10ef3916256ec1bc0416c8644a8;p=m6w6%2Fext-http

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index fb8ecf6..21ee32e 100644
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2013, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -228,7 +228,12 @@ static int php_http_curle_raw_callback(CURL *ch, curl_infotype type, char *data,
 	/* catch progress */
 	switch (type) {
 		case CURLINFO_TEXT:
-			if (php_memnstr(data, ZEND_STRL("About to connect"), data + length)) {
+			if (data[0] == '-') {
+			} else if (php_memnstr(data, ZEND_STRL("Adding handle:"), data + length)) {
+				h->progress.info = "setup";
+			} else if (php_memnstr(data, ZEND_STRL("addHandle"), data + length)) {
+				h->progress.info = "setup";
+			} else if (php_memnstr(data, ZEND_STRL("About to connect"), data + length)) {
 				h->progress.info = "resolve";
 			} else if (php_memnstr(data, ZEND_STRL("Trying"), data + length)) {
 				h->progress.info = "connect";
@@ -238,6 +243,10 @@ static int php_http_curle_raw_callback(CURL *ch, curl_infotype type, char *data,
 				h->progress.info = "connected";
 			} else if (php_memnstr(data, ZEND_STRL("Re-using existing connection!"), data + length)) {
 				h->progress.info = "connected";
+			} else if (php_memnstr(data, ZEND_STRL("blacklisted"), data + length)) {
+				h->progress.info = "blacklist check";
+			} else if (php_memnstr(data, ZEND_STRL("SSL"), data + length)) {
+				h->progress.info = "ssl negotiation";
 			} else if (php_memnstr(data, ZEND_STRL("left intact"), data + length)) {
 				h->progress.info = "not disconnected";
 			} else if (php_memnstr(data, ZEND_STRL("closed"), data + length)) {
@@ -247,7 +256,9 @@ static int php_http_curle_raw_callback(CURL *ch, curl_infotype type, char *data,
 			} else if (php_memnstr(data, ZEND_STRL("Operation timed out"), data + length)) {
 				h->progress.info = "timeout";
 			} else {
+#if PHP_DEBUG
 				h->progress.info = data;
+#endif
 			}
 			if (h->client->callback.progress.func) {
 				h->client->callback.progress.func(h->client->callback.progress.arg, h->client, &h->queue, &h->progress);
@@ -986,7 +997,9 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
 	if ((opt = php_http_option_register(registry, ZEND_STRL("proxyauth"), CURLOPT_PROXYUSERPWD, IS_STRING))) {
 		opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
 	}
-	php_http_option_register(registry, ZEND_STRL("proxyauthtype"), CURLOPT_PROXYAUTH, IS_LONG);
+	if ((opt = php_http_option_register(registry, ZEND_STRL("proxyauthtype"), CURLOPT_PROXYAUTH, IS_LONG))) {
+		Z_LVAL(opt->defval) = CURLAUTH_ANYSAFE;
+	}
 	php_http_option_register(registry, ZEND_STRL("proxytunnel"), CURLOPT_HTTPPROXYTUNNEL, IS_BOOL);
 #if PHP_HTTP_CURL_VERSION(7,19,4)
 	php_http_option_register(registry, ZEND_STRL("noproxy"), CURLOPT_NOPROXY, IS_STRING);
@@ -1044,17 +1057,17 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
 	if ((opt = php_http_option_register(registry, ZEND_STRL("httpauth"), CURLOPT_USERPWD, IS_STRING))) {
 		opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
 	}
-	php_http_option_register(registry, ZEND_STRL("httpauthtype"), CURLOPT_HTTPAUTH, IS_LONG);
+	if ((opt = php_http_option_register(registry, ZEND_STRL("httpauthtype"), CURLOPT_HTTPAUTH, IS_LONG))) {
+		Z_LVAL(opt->defval) = CURLAUTH_ANYSAFE;
+	}
 
 	/* redirects */
 	if ((opt = php_http_option_register(registry, ZEND_STRL("redirect"), CURLOPT_FOLLOWLOCATION, IS_LONG))) {
 		opt->setter = php_http_curle_option_set_redirect;
 	}
-	php_http_option_register(registry, ZEND_STRL("unrestrictedauth"), CURLOPT_UNRESTRICTED_AUTH, IS_BOOL);
+	php_http_option_register(registry, ZEND_STRL("unrestricted_auth"), CURLOPT_UNRESTRICTED_AUTH, IS_BOOL);
 #if PHP_HTTP_CURL_VERSION(7,19,1)
-	php_http_option_register(registry, ZEND_STRL("postredir"), CURLOPT_POSTREDIR, IS_BOOL);
-#else
-	php_http_option_register(registry, ZEND_STRL("postredir"), CURLOPT_POST301, IS_BOOL);
+	php_http_option_register(registry, ZEND_STRL("postredir"), CURLOPT_POSTREDIR, IS_LONG);
 #endif
 
 	/* retries */
@@ -1157,7 +1170,6 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
 			opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_BASEDIR;
 		}
 		php_http_option_register(registry, ZEND_STRL("certtype"), CURLOPT_SSLCERTTYPE, IS_STRING);
-		php_http_option_register(registry, ZEND_STRL("certpasswd"), CURLOPT_SSLCERTPASSWD, IS_STRING);
 
 		if ((opt = php_http_option_register(registry, ZEND_STRL("key"), CURLOPT_SSLKEY, IS_STRING))) {
 			opt->flags |= PHP_HTTP_CURLE_OPTION_CHECK_STRLEN;
@@ -1575,7 +1587,17 @@ static php_resource_factory_t *create_rf(const char *url TSRMLS_DC)
 	php_url *purl;
 	php_resource_factory_t *rf = NULL;
 
-	if ((purl = php_url_parse(url))) {
+	if (!url || !*url) {
+		php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "Cannot request empty URL");
+		return NULL;
+	}
+
+	purl = php_url_parse(url);
+
+	if (!purl) {
+		php_http_error(HE_WARNING, PHP_HTTP_E_CLIENT, "Could not parse URL '%s'", url);
+		return NULL;
+	} else {
 		char *id_str = NULL;
 		size_t id_len = spprintf(&id_str, 0, "%s:%d", STR_PTR(purl->host), purl->port ? purl->port : 80);
 		php_persistent_handle_factory_t *pf = php_persistent_handle_concede(NULL, ZEND_STRL("http\\Client\\Curl\\Request"), id_str, id_len, NULL, NULL TSRMLS_CC);
@@ -1601,9 +1623,15 @@ static STATUS php_http_client_curl_enqueue(php_http_client_t *h, php_http_client
 	php_http_client_curl_t *curl = h->ctx;
 	php_http_client_curl_handler_t *handler;
 	php_http_client_progress_state_t *progress;
+	php_resource_factory_t *rf;
 	TSRMLS_FETCH_FROM_CTX(h->ts);
 
-	handler = php_http_client_curl_handler_init(h, create_rf(enqueue->request->http.info.request.url TSRMLS_CC));
+	rf = create_rf(enqueue->request->http.info.request.url TSRMLS_CC);
+	if (!rf) {
+		return FAILURE;
+	}
+
+	handler = php_http_client_curl_handler_init(h, rf);
 	if (!handler) {
 		return FAILURE;
 	}
@@ -1862,10 +1890,11 @@ PHP_MINIT_FUNCTION(http_client_curl)
 {
 	php_http_options_t *options;
 	php_http_client_driver_t driver = {
+		ZEND_STRL("curl"),
 		&php_http_client_curl_ops
 	};
 
-	if (SUCCESS != php_http_client_driver_add(ZEND_STRL("curl"), &driver)) {
+	if (SUCCESS != php_http_client_driver_add(&driver)) {
 			return FAILURE;
 		}