Merge http proxy changes and improve.

twose · twose · commit db34e4621d67 · 2018-12-17T17:49:12.000+08:00
diff --git a/include/client.h b/include/client.h
@@ -55,7 +55,7 @@ struct _http_proxy
     char *target_host;
     int l_target_host;
     int target_port;
-    char buf[600];
+    char buf[512];
 };
 
 typedef struct _swClient
diff --git a/swoole_http_client_coro.cc b/swoole_http_client_coro.cc
@@ -613,19 +613,20 @@ void PHPHttpClient::set(zval *zset = nullptr)
         php_swoole_client_coro_check_setting(socket, zsettings);
         if (socket->http_proxy)
         {
-            zval *zrequest_headers = sw_zend_read_property(swoole_http_client_coro_ce_ptr, zobject, ZEND_STRL("requestHeaders"), 0);
             if (socket->http_proxy->password)
             {
-                char _buf1[128];
-                char _buf2[256];
-                int _n1 = snprintf(_buf1, sizeof(_buf1), "%*s:%*s",
+                char _buf1[256];
+                int _n1 = snprintf(
+                    _buf1, sizeof(_buf1), "%*s:%*s",
                     socket->http_proxy->l_user, socket->http_proxy->user,
                     socket->http_proxy->l_password, socket->http_proxy->password
                 );
                 zend_string *str = php_base64_encode((const unsigned char *) _buf1, _n1);
-                int _n2 = snprintf(_buf2, sizeof(_buf2), "Basic %*s", (int)str->len, str->val);
+                snprintf(
+                    socket->http_proxy->buf, sizeof(socket->http_proxy->buf),
+                    "Proxy-Authorization:Basic %*s", (int)str->len, str->val
+                );
                 zend_string_free(str);
-                add_assoc_stringl_ex(zrequest_headers, ZEND_STRL("Proxy-Authorization"), _buf2, _n2);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -613,19 +613,20 @@ void PHPHttpClient::set(zval *zset = nullptr)`
`613`	`613`	`php_swoole_client_coro_check_setting(socket, zsettings);`
`614`	`614`	`if (socket->http_proxy)`
`615`	`615`	`{`
`616`		`- zval *zrequest_headers = sw_zend_read_property(swoole_http_client_coro_ce_ptr, zobject, ZEND_STRL("requestHeaders"), 0);`
`617`	`616`	`if (socket->http_proxy->password)`
`618`	`617`	`{`
`619`		`- char _buf1[128];`
`620`		`- char _buf2[256];`
`621`		`- int _n1 = snprintf(_buf1, sizeof(_buf1), "%s:%s",`
	`618`	`+ char _buf1[256];`
	`619`	`+ int _n1 = snprintf(`
	`620`	`+ _buf1, sizeof(_buf1), "%s:%s",`
`622`	`621`	`socket->http_proxy->l_user, socket->http_proxy->user,`
`623`	`622`	`socket->http_proxy->l_password, socket->http_proxy->password`
`624`	`623`	`);`
`625`	`624`	`zend_string str = php_base64_encode((const unsigned char ) _buf1, _n1);`
`626`		`- int _n2 = snprintf(_buf2, sizeof(_buf2), "Basic %*s", (int)str->len, str->val);`
	`625`	`+ snprintf(`
	`626`	`+ socket->http_proxy->buf, sizeof(socket->http_proxy->buf),`
	`627`	`+ "Proxy-Authorization:Basic %*s", (int)str->len, str->val`
	`628`	`+ );`
`627`	`629`	`zend_string_free(str);`
`628`		`- add_assoc_stringl_ex(zrequest_headers, ZEND_STRL("Proxy-Authorization"), _buf2, _n2);`
`629`	`630`	`}`
`630`	`631`	`}`
`631`	`632`	`}`