disable swoole_http_client, Fix #461

Author: matyhtf

php_swoole.h

@@ -294,7 +294,9 @@ void swoole_table_init(int module_number TSRMLS_DC);
 void swoole_lock_init(int module_number TSRMLS_DC);
 void swoole_atomic_init(int module_number TSRMLS_DC);
 void swoole_client_init(int module_number TSRMLS_DC);
+#ifdef SW_HTTP_CLIENT_ENABLE
 void swoole_http_client_init(int module_number TSRMLS_DC);
+#endif
 void swoole_process_init(int module_number TSRMLS_DC);
 void swoole_http_init(int module_number TSRMLS_DC);
 void swoole_websocket_init(int module_number TSRMLS_DC);

swoole.c

@@ -630,7 +630,9 @@ PHP_MINIT_FUNCTION(swoole)
     swoole_init();
 
     swoole_client_init(module_number TSRMLS_CC);
+#ifdef SW_HTTP_CLIENT_ENABLE
     swoole_http_client_init(module_number TSRMLS_CC);
+#endif
     swoole_async_init(module_number TSRMLS_CC);
     swoole_process_init(module_number TSRMLS_CC);
     swoole_table_init(module_number TSRMLS_CC);

swoole_config.h

@@ -211,6 +211,8 @@
 
 #define SW_DNS_LOOKUP_USE_THREAD
 
+//#define SW_HTTP_CLIENT_ENABLE
+
 #define SW_HTTP_SERVER_SOFTWARE          "swoole-http-server"
 #define SW_HTTP_BAD_REQUEST              "<h1>400 Bad Request</h1>\r\n"
 #define SW_HTTP_PARAM_MAX_NUM            128

swoole_http_client.c

@@ -18,6 +18,8 @@
 #include "thirdparty/php_http_parser.h"
 #include "ext/standard/basic_functions.h"
 
+#ifdef SW_HTTP_CLIENT_ENABLE
+
 #define SW_FD_HTTP_CLIENT (SW_FD_USER+1)
 
 typedef struct
@@ -43,6 +45,8 @@ typedef struct
     char *tmp_header_field_name;
     zend_size_t tmp_header_field_name_len;
 
+    char *body;
+
     php_http_parser parser;
 
     int phase;  //0 wait 1 ready 2 busy
@@ -698,15 +702,13 @@ static PHP_METHOD(swoole_http_client, __construct)
         return;
     }
 
-    if(host_len <= 0)
+    if (host_len <= 0)
     {
         swoole_php_fatal_error(E_ERROR, "host is empty.");
         RETURN_FALSE;
     }
 
-    zend_update_property_stringl(
-        swoole_http_client_class_entry_ptr,
-        getThis(), ZEND_STRL("host"), host, host_len TSRMLS_CC);
+    zend_update_property_stringl(swoole_http_client_class_entry_ptr, getThis(), ZEND_STRL("host"), host, host_len TSRMLS_CC);
 
     zend_update_property_long(
         swoole_http_client_class_entry_ptr,
@@ -1017,8 +1019,8 @@ static int http_client_parser_on_body(php_http_parser *parser, const char *at, s
     TSRMLS_FETCH_FROM_CTX(sw_thread_ctx ? sw_thread_ctx : NULL);
 #endif
 
-    http_client* http = (http_client*)parser->data;
-    zval* zobject = (zval*)http->cli->socket->object;
+    http_client* http = (http_client*) parser->data;
+    zval* zobject = (zval*) http->cli->socket->object;
 
     zval *body = sw_zend_read_property(swoole_http_client_class_entry_ptr, zobject, ZEND_STRL("body"), 0 TSRMLS_CC);
     zval *tmp;
@@ -1035,6 +1037,7 @@ static int http_client_parser_on_message_complete(php_http_parser *parser)
 #if PHP_MAJOR_VERSION < 7
     TSRMLS_FETCH_FROM_CTX(sw_thread_ctx ? sw_thread_ctx : NULL);
 #endif
+
     http_client* http = (http_client*)parser->data;
     zval* zobject = (zval*)http->cli->socket->object;
 
@@ -1044,7 +1047,6 @@ static int http_client_parser_on_message_complete(php_http_parser *parser)
         http->phase = 1;
     }
 
-
     zval *retval;
     zval *zcallback;
 
@@ -1072,3 +1074,5 @@ static int http_client_parser_on_message_complete(php_http_parser *parser)
 
     return 0;
 }
+
+#endif