From 02004439fc319b0b494094d74f003dc99b672585 Mon Sep 17 00:00:00 2001
From: NathanFreeman <1056159381@qq.com>
Date: Mon, 19 Aug 2024 20:51:01 +0800
Subject: [PATCH] optimize code

---
 ext-src/swoole_http_response.cc    | 62 +++++++++++++++---------------
 tests/swoole_curl/ssl/version.phpt |  1 -
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/ext-src/swoole_http_response.cc b/ext-src/swoole_http_response.cc
index 5734c336e6..a04aaea22d 100644
--- a/ext-src/swoole_http_response.cc
+++ b/ext-src/swoole_http_response.cc
@@ -760,30 +760,30 @@ void HttpContext::end(zval *zdata, zval *return_value) {
     }
 
 #ifdef SW_HAVE_ZLIB
-    if (upgrade) {
-        Server *serv = nullptr;
-        Connection *conn = nullptr;
-        if (!co_socket) {
-            serv = (Server *) private_data;
-            conn = serv->get_connection_verify(fd);
-        }
-        bool enable_websocket_compression = co_socket ? websocket_compression : serv->websocket_compression;
-        bool accept_websocket_compression = false;
-        zval *pData;
-        if (enable_websocket_compression && request.zobject &&
-            (pData = zend_hash_str_find(Z_ARRVAL_P(request.zheader), ZEND_STRL("sec-websocket-extensions"))) &&
-            Z_TYPE_P(pData) == IS_STRING) {
-            std::string value(Z_STRVAL_P(pData), Z_STRLEN_P(pData));
-            if (value.substr(0, value.find_first_of(';')) == "permessage-deflate") {
-                accept_websocket_compression = true;
-                set_header(ZEND_STRL("Sec-Websocket-Extensions"), ZEND_STRL(SW_WEBSOCKET_EXTENSION_DEFLATE), false);
+        if (upgrade) {
+            Server *serv = nullptr;
+            Connection *conn = nullptr;
+            if (!co_socket) {
+                serv = (Server *) private_data;
+                conn = serv->get_connection_verify(fd);
+            }
+            bool enable_websocket_compression = co_socket ? websocket_compression : serv->websocket_compression;
+            bool accept_websocket_compression = false;
+            zval *pData;
+            if (enable_websocket_compression && request.zobject &&
+                (pData = zend_hash_str_find(Z_ARRVAL_P(request.zheader), ZEND_STRL("sec-websocket-extensions"))) &&
+                Z_TYPE_P(pData) == IS_STRING) {
+                std::string value(Z_STRVAL_P(pData), Z_STRLEN_P(pData));
+                if (value.substr(0, value.find_first_of(';')) == "permessage-deflate") {
+                    accept_websocket_compression = true;
+                    set_header(ZEND_STRL("Sec-Websocket-Extensions"), ZEND_STRL(SW_WEBSOCKET_EXTENSION_DEFLATE), false);
+                }
+            }
+            websocket_compression = accept_websocket_compression;
+            if (conn) {
+                conn->websocket_compression = accept_websocket_compression;
             }
         }
-        websocket_compression = accept_websocket_compression;
-        if (conn) {
-            conn->websocket_compression = accept_websocket_compression;
-        }
-    }
 #endif
 
     String *http_buffer = get_write_buffer();
@@ -971,10 +971,10 @@ static void php_swoole_http_response_cookie(INTERNAL_FUNCTION_PARAMETERS, const
     }
 
     char *cookie = nullptr, *date = nullptr;
-    size_t cookie_size = name_len + 1;  // add 1 for null char
-    cookie_size += 50;                  // strlen("; expires=Fri, 31-Dec-9999 23:59:59 GMT; Max-Age=0")
+    size_t cookie_size = name_len + 1; // add 1 for null char
+    cookie_size += 50; // strlen("; expires=Fri, 31-Dec-9999 23:59:59 GMT; Max-Age=0")
     if (value_len == 0) {
-        cookie_size += 8;  // strlen("=deleted")
+        cookie_size += 8; // strlen("=deleted")
     }
     if (expires > 0) {
         // Max-Age will be no longer than 12 digits since the
@@ -982,22 +982,22 @@ static void php_swoole_http_response_cookie(INTERNAL_FUNCTION_PARAMETERS, const
         cookie_size += 11;
     }
     if (path_len > 0) {
-        cookie_size += path_len + 7;  // strlen("; path=")
+        cookie_size += path_len + 7; // strlen("; path=")
     }
     if (domain_len > 0) {
-        cookie_size += domain_len + 9;  // strlen("; domain=")
+        cookie_size += domain_len + 9; // strlen("; domain=")
     }
     if (secure) {
-        cookie_size += 8;  // strlen("; secure")
+        cookie_size += 8; // strlen("; secure")
     }
     if (httponly) {
-        cookie_size += 10;  // strlen("; httponly")
+        cookie_size += 10; // strlen("; httponly")
     }
     if (samesite_len > 0) {
-        cookie_size += samesite_len + 11;  // strlen("; samesite=")
+        cookie_size += samesite_len + 11; // strlen("; samesite=")
     }
     if (priority_len > 0) {
-        cookie_size += priority_len + 11;  // strlen("; priority=")
+        cookie_size += priority_len + 11; // strlen("; priority=")
     }
 
     if (value_len == 0) {
diff --git a/tests/swoole_curl/ssl/version.phpt b/tests/swoole_curl/ssl/version.phpt
index 31d72fd3b9..4c838ef74b 100644
--- a/tests/swoole_curl/ssl/version.phpt
+++ b/tests/swoole_curl/ssl/version.phpt
@@ -11,7 +11,6 @@ require __DIR__ . '/../../include/bootstrap.php';
 $cm = new \SwooleTest\CurlManager();
 $cm->run(function ($host) {
 	$userAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:129.0) Gecko/20100101 Firefox/129.0';
-
     $ch = curl_init();
     curl_setopt($ch, CURLOPT_USERAGENT, $userAgent);
     curl_setopt($ch, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2);