Improve code

Author: twose

clear.sh

@@ -2,11 +2,11 @@
 __DIR__=$(cd "$(dirname "$0")";pwd)
 
 set -e
-cd ${__DIR__}
+cd "${__DIR__}"
 set +e
-find . -name \*.gcno -o -name \*.gcda | xargs rm -f
-find . -name \*.lo -o -name \*.o | xargs rm -f
-find . -name \*.la -o -name \*.a | xargs rm -f
-find . -name \*.so | xargs rm -f
-find . -name .libs -a -type d|xargs rm -rf
-rm -f libphp.la       modules/* libs/*
+find . \( -name \*.gcno -o -name \*.gcda \) -print0 | xargs -0 rm -f
+find . \( -name \*.lo -o -name \*.o \) -print0 | xargs -0 rm -f
+find . \( -name \*.la -o -name \*.a \) -print0 | xargs -0 rm -f
+find . -name \*.so -print0 | xargs -0 rm -f
+find . -name .libs -a -type d -print0 | xargs -0 rm -rf
+rm -f libphp.la modules/* libs/*

swoole_http.h

@@ -278,48 +278,6 @@ static sw_inline void php_brotli_free(void* opaque, void* address)
 }
 #endif
 
-static int http_parse_set_cookies(const char *at, size_t length, zval *cookies, zval *zset_cookie_headers)
-{
-    const char *key = at;
-    zval val;
-    size_t key_len = 0, val_len = 0;
-    const char *p, *eof = at + length;
-    // key
-    p = (char *) memchr(at, '=', length);
-    if (p)
-    {
-        key_len = p - at;
-    }
-    if (key_len == 0 || key_len >= length - 1)
-    {
-        swWarn("cookie key format is wrong");
-        return SW_ERR;
-    }
-    if (key_len > SW_HTTP_COOKIE_KEYLEN)
-    {
-        swWarn("cookie[%.8s...] name length %zu is exceed the max name len %d", key, key_len, SW_HTTP_COOKIE_KEYLEN);
-        return SW_ERR;
-    }
-    add_next_index_stringl(zset_cookie_headers, (char *) at, length);
-    // val
-    p++;
-    eof = (char*) memchr(p, ';', at + length - p);
-    if (!eof)
-    {
-        eof = at + length;
-    }
-    val_len = eof - p;
-    if (val_len > SW_HTTP_COOKIE_VALLEN)
-    {
-        swWarn("cookie[%.*s]'s value[v=%.8s...] length %d is exceed the max value len %d", (int) key_len, key, p, (int) val_len, SW_HTTP_COOKIE_VALLEN);
-        return SW_ERR;
-    }
-    ZVAL_STRINGL(&val, p, val_len);
-    Z_STRLEN(val) = php_url_decode(Z_STRVAL(val), val_len);
-    add_assoc_zval_ex(cookies, at, key_len, &val);
-    return SW_OK;
-}
-
 int swoole_websocket_onMessage(swServer *serv, swEventData *req);
 int swoole_websocket_onHandshake(swServer *serv, swListenPort *port, http_context *ctx);
 void swoole_websocket_onOpen(http_context *ctx);

swoole_http2_client_coro.cc

@@ -699,7 +699,7 @@ enum swReturn_code http2_client::parse_frame(zval *return_value)
         zval zresponse = *stream->zresponse;
         if (type == SW_HTTP2_TYPE_RST_STREAM)
         {
-            zend_update_property_long(swoole_http2_response_ce, &zresponse, ZEND_STRL("statusCode"), -3);
+            zend_update_property_long(swoole_http2_response_ce, &zresponse, ZEND_STRL("statusCode"), -3 /* HTTP_CLIENT_ESTATUS_SERVER_RESET */);
             zend_update_property_long(swoole_http2_response_ce, &zresponse, ZEND_STRL("errCode"), value);
         }
         if (stream->buffer)
@@ -884,6 +884,8 @@ bool http2_client::send_setting()
     return send(frame, SW_HTTP2_FRAME_HEADER_SIZE + 18);
 }
 
+int http_parse_set_cookies(const char *at, size_t length, zval *cookies, zval *zset_cookie_headers);
+
 int http2_client::parse_header(http2_client_stream *stream, int flags, char *in, size_t inlen)
 {
     zval *zresponse = stream->zresponse;

swoole_http_client.h

@@ -14,25 +14,28 @@
   +----------------------------------------------------------------------+
 */
 
-#ifndef SWOOLE_HTTP_CLIENT_H_
-#define SWOOLE_HTTP_CLIENT_H_
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ext/standard/basic_functions.h"
-#include "ext/standard/php_http.h"
-#include "ext/standard/base64.h"
-
 #include "swoole_http.h"
 #include "websocket.h"
 #include "thirdparty/swoole_http_parser.h"
 
+#include "ext/standard/basic_functions.h"
+#include "ext/standard/php_http.h"
+#include "ext/standard/base64.h"
+
 #ifdef SW_HAVE_ZLIB
 #include <zlib.h>
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 enum http_client_error_status_code
 {
     HTTP_CLIENT_ESTATUS_CONNECT_FAILED = -1,
@@ -41,12 +44,6 @@ enum http_client_error_status_code
     HTTP_CLIENT_ESTATUS_SEND_FAILED = -4,
 };
 
-enum http_client_error_flags
-{
-    HTTP_CLIENT_EFLAG_TIMEOUT = 1,
-    HTTP_CLIENT_EFLAG_UPGRADE = 1 << 1,
-};
-
 static sw_inline void http_client_create_token(int length, char *buf)
 {
     char characters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!\"§$%&/()=[]{}";
@@ -73,13 +70,3 @@ static sw_inline void http_client_append_content_length(swString* buf, int lengt
     int n = snprintf(SW_STRS(content_length_str), "Content-Length: %d\r\n\r\n", length);
     swString_append_ptr(buf, content_length_str, n);
 }
-
-#ifdef SW_HAVE_COMPRESSION
-extern swString *swoole_zlib_buffer;
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SWOOLE_HTTP_CLIENT_H_ */

swoole_http_client_coro.cc

@@ -304,6 +304,48 @@ static const zend_function_entry swoole_http_client_coro_methods[] =
     PHP_FE_END
 };
 
+int http_parse_set_cookies(const char *at, size_t length, zval *cookies, zval *zset_cookie_headers)
+{
+    const char *key = at;
+    zval val;
+    size_t key_len = 0, val_len = 0;
+    const char *p, *eof = at + length;
+    // key
+    p = (char *) memchr(at, '=', length);
+    if (p)
+    {
+        key_len = p - at;
+    }
+    if (key_len == 0 || key_len >= length - 1)
+    {
+        swWarn("cookie key format is wrong");
+        return SW_ERR;
+    }
+    if (key_len > SW_HTTP_COOKIE_KEYLEN)
+    {
+        swWarn("cookie[%.8s...] name length %zu is exceed the max name len %d", key, key_len, SW_HTTP_COOKIE_KEYLEN);
+        return SW_ERR;
+    }
+    add_next_index_stringl(zset_cookie_headers, (char *) at, length);
+    // val
+    p++;
+    eof = (char*) memchr(p, ';', at + length - p);
+    if (!eof)
+    {
+        eof = at + length;
+    }
+    val_len = eof - p;
+    if (val_len > SW_HTTP_COOKIE_VALLEN)
+    {
+        swWarn("cookie[%.*s]'s value[v=%.8s...] length %d is exceed the max value len %d", (int) key_len, key, p, (int) val_len, SW_HTTP_COOKIE_VALLEN);
+        return SW_ERR;
+    }
+    ZVAL_STRINGL(&val, p, val_len);
+    Z_STRLEN(val) = php_url_decode(Z_STRVAL(val), val_len);
+    add_assoc_zval_ex(cookies, at, key_len, &val);
+    return SW_OK;
+}
+
 static int http_parser_on_header_field(swoole_http_parser *parser, const char *at, size_t length)
 {
     http_client* http = (http_client*) parser->data;