Skip to content

Commit 239a0b1

Browse files
committed
Update library
1 parent a23fb06 commit 239a0b1

1 file changed

Lines changed: 15 additions & 6 deletions

File tree

ext-src/php_swoole_library.h

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
+----------------------------------------------------------------------+
1515
*/
1616

17-
/* $Id: 8534d98950d0a91de9879d1b9bcb904b7d5a3cb4 */
17+
/* $Id: 51d60adcf7beee32ef614c349fdd4a65ea2f3faf */
1818

1919
#ifndef SWOOLE_LIBRARY_H
2020
#define SWOOLE_LIBRARY_H
@@ -4402,7 +4402,13 @@ static const char* swoole_library_source_core_curl_handler =
44024402
" $this->readFunction = $value;\n"
44034403
" break;\n"
44044404
" case CURLOPT_WRITEFUNCTION:\n"
4405-
" $this->writeFunction = $value;\n"
4405+
" if (SWOOLE_VERSION_ID >= 50100) {\n"
4406+
" $this->clientOptions[Constant::OPTION_WRITE_FUNC] = function ($client, $data) use ($value) {\n"
4407+
" return $value($this, $data);\n"
4408+
" };\n"
4409+
" } else {\n"
4410+
" $this->writeFunction = $value;\n"
4411+
" }\n"
44064412
" break;\n"
44074413
" case CURLOPT_NOPROGRESS:\n"
44084414
" $this->noProgress = $value;\n"
@@ -4639,11 +4645,14 @@ static const char* swoole_library_source_core_curl_handler =
46394645
" $headerContent .= $row;\n"
46404646
" }\n"
46414647
" foreach ($client->headers as $k => $v) {\n"
4642-
" $row = \"{$k}: {$v}\\r\\n\";\n"
4643-
" if ($cb) {\n"
4644-
" $cb($this, $row);\n"
4648+
" $list = is_array($v) ? $v : [$v];\n"
4649+
" foreach ($list as $_v) {\n"
4650+
" $row = \"{$k}: {$_v}\\r\\n\";\n"
4651+
" if ($cb) {\n"
4652+
" $cb($this, $row);\n"
4653+
" }\n"
4654+
" $headerContent .= $row;\n"
46454655
" }\n"
4646-
" $headerContent .= $row;\n"
46474656
" }\n"
46484657
" $headerContent .= \"\\r\\n\";\n"
46494658
" $this->info['header_size'] = strlen($headerContent);\n"

0 commit comments

Comments
 (0)