Merge branch '6.1'

Author: matyhtf

ext-src/swoole_http_client_coro.cc

@@ -221,6 +221,8 @@ class Client {
         if (buffer == nullptr) {
             RETURN_FALSE;
         }
+        buffer->clear();
+
         off_t offset = swoole_strnpos(buffer->str, buffer->length, ZEND_STRL("\r\n\r\n"));
         if (offset <= 0) {
             RETURN_FALSE;
@@ -1569,7 +1571,7 @@ bool Client::push(zval *zdata, zend_long opcode, uint8_t flags, zend_long code)
     }
 
     String *buffer = socket->get_write_buffer();
-
+    buffer->clear();
     FrameObject frame(zdata, opcode, flags, code);
 
     if (websocket_settings.mask) {

ext-src/swoole_http_response.cc

@@ -1100,6 +1100,7 @@ static PHP_METHOD(swoole_http_response, disconnect) {
     ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
 
     String *http_buffer = ctx->get_write_buffer();
+    http_buffer->clear();
 
     zval zdata = {};
     ZVAL_STR(&zdata, reason);
@@ -1255,6 +1256,7 @@ static PHP_METHOD(swoole_http_response, push) {
     }
 
     String *http_buffer = ctx->get_write_buffer();
+    http_buffer->clear();
 
     FrameObject frame(zdata, opcode, flags);
     sw_unset_bit(frame.flags, WebSocket::FLAG_MASK);
@@ -1292,6 +1294,7 @@ ssize_t WebSocket::send_frame(const swoole::WebSocketSettings &settings,
         sw_set_bit(flags, WebSocket::FLAG_MASK);
     }
     auto wbuf = sock->get_write_buffer();
+    wbuf->clear();
     WebSocket::encode(wbuf, payload, payload_length, opcode, flags);
     return sock->send(wbuf->str, wbuf->length);
 }

tests/swoole_http_server_coro/buffer_clear.phpt

@@ -0,0 +1,52 @@
+--TEST--
+swoole_http_server_coro: websocket buffer clear
+--SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
+--FILE--
+<?php
+require __DIR__ . '/../include/bootstrap.php';
+
+use Swoole\Event;
+use Swoole\Http\Request;
+use Swoole\Http\Response;
+use Swoole\Coroutine\Http\Client;
+use Swoole\Coroutine\Http\Server;
+
+$pm = new ProcessManager;
+$pm->parentFunc = function () use ($pm) {
+	go(function() use ($pm) {
+		$client = new Client('127.0.0.1', $pm->getFreePort());
+		$ret = $client->upgrade('/');
+		$client->set(['open_websocket_pong_frame' => true]);
+		$client->push('hello world');
+		$client->push('ping', SWOOLE_WEBSOCKET_OPCODE_PING);
+		$frame1 = $client->recv();
+		$frame2 = $client->recv();
+		Assert::eq($frame1->data, 'received: hello world');
+		Assert::eq($frame1->opcode, SWOOLE_WEBSOCKET_OPCODE_TEXT);
+		Assert::eq($frame2->data, 'ping');
+		Assert::eq($frame2->opcode, SWOOLE_WEBSOCKET_OPCODE_PONG);
+	});
+
+	Event::wait();
+	$pm->kill();
+};
+
+$pm->childFunc = function () use ($pm) {
+	go(function () use ($pm) {
+		$server = new Server('127.0.0.1', $pm->getFreePort(), false);
+        $server->handle('/', function (Request $request, Response $response) {
+            $response->upgrade();
+			while ($frame = $response->recv()) {
+				$response->push('received: ' . $frame->data);
+			}
+        });
+        $pm->wakeup();
+        $server->start();
+    });
+    Event::wait();
+};
+$pm->childFirst();
+$pm->run();
+?>
+--EXPECT--