Skip to content

Commit 009b424

Browse files
matyhtfmatyhtf
authored
Update version, Optimize code, Fix swoole#3968, Fix swoole#3917 (swoole#4007)
* Optimize code, Fix swoole#3917 * update version * update package.xml, fix tests
1 parent b8cce7c commit 009b424

File tree

10 files changed

+25
-19
lines changed

10 files changed

+25
-19
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PROJECT(libswoole)
22

33
ENABLE_LANGUAGE(ASM)
4-
SET(SWOOLE_VERSION 4.6.1)
4+
SET(SWOOLE_VERSION 4.6.2)
55

66
set(CMAKE_CXX_STANDARD 11)
77
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")

‎config.m4

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -622,13 +622,7 @@ if test "$PHP_SWOOLE" != "no"; then
622622
)
623623

624624
if test "$SW_OS" = "MAC"; then
625-
if test "$SW_CPU" = "arm"; then
626-
SW_CONTEXT_ASM_FILE="arm_aapcs_macho_gas.S"
627-
elif test "$SW_CPU" = "arm64"; then
628-
SW_CONTEXT_ASM_FILE="arm64_aapcs_macho_gas.S"
629-
else
630-
SW_CONTEXT_ASM_FILE="combined_sysv_macho_gas.S"
631-
fi
625+
SW_CONTEXT_ASM_FILE="combined_sysv_macho_gas.S"
632626
elif test "$SW_CPU" = "x86_64"; then
633627
if test "$SW_OS" = "LINUX"; then
634628
SW_CONTEXT_ASM_FILE="x86_64_sysv_elf_gas.S"

‎ext-src/swoole_redis_coro.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3886,7 +3886,7 @@ static PHP_METHOD(swoole_redis_coro, hExists) {
38863886

38873887
RedisClient *redis = php_swoole_get_redis_client(ZEND_THIS);
38883888
if (redis->compatibility_mode && ZVAL_IS_LONG(return_value)) {
3889-
RETURN_BOOL(zval_get_long(return_value) );
3889+
RETURN_BOOL(zval_get_long(return_value));
38903890
}
38913891
}
38923892

‎include/swoole_version.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
#define SWOOLE_MAJOR_VERSION 4
2222
#define SWOOLE_MINOR_VERSION 6
23-
#define SWOOLE_RELEASE_VERSION 1
24-
#define SWOOLE_EXTRA_VERSION ""
25-
#define SWOOLE_VERSION "4.6.1"
26-
#define SWOOLE_VERSION_ID 40601
23+
#define SWOOLE_RELEASE_VERSION 2
24+
#define SWOOLE_EXTRA_VERSION "alpha"
25+
#define SWOOLE_VERSION "4.6.2"
26+
#define SWOOLE_VERSION_ID 40602
2727
#define SWOOLE_API_VERSION_ID 0x202012a
2828

2929
#define SWOOLE_BUG_REPORT \

‎package.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
<email>shenzhe163@gmail.com</email>
4343
<active>yes</active>
4444
</developer>
45-
<date>2021-01-11</date>
46-
<time>18:00:00</time>
45+
<date>2021-01-19</date>
46+
<time>19:00:00</time>
4747
<version>
48-
<release>4.6.1</release>
48+
<release>4.6.2</release>
4949
<api>4.0</api>
5050
</version>
5151
<stability>
@@ -1245,6 +1245,8 @@
12451245
<file role="test" name="tests/swoole_http_server_coro/bug_no_handle.phpt" />
12461246
<file role="test" name="tests/swoole_http_server_coro/check_cookie_crlf.phpt" />
12471247
<file role="test" name="tests/swoole_http_server_coro/check_http_header_crlf.phpt" />
1248+
<file role="test" name="tests/swoole_http_server_coro/create_response.phpt" />
1249+
<file role="test" name="tests/swoole_http_server_coro/create_response_2.phpt" />
12481250
<file role="test" name="tests/swoole_http_server_coro/error_404.phpt" />
12491251
<file role="test" name="tests/swoole_http_server_coro/error_413.phpt" />
12501252
<file role="test" name="tests/swoole_http_server_coro/handle.phpt" />
@@ -1423,6 +1425,7 @@
14231425
<file role="test" name="tests/swoole_redis_coro/auto_reconnect_ex.phpt" />
14241426
<file role="test" name="tests/swoole_redis_coro/basic.phpt" />
14251427
<file role="test" name="tests/swoole_redis_coro/bug_lock.phpt" />
1428+
<file role="test" name="tests/swoole_redis_coro/compatibility_mode/hExists.phpt" />
14261429
<file role="test" name="tests/swoole_redis_coro/connect_timeout.phpt" />
14271430
<file role="test" name="tests/swoole_redis_coro/connect_to_wrong.phpt" />
14281431
<file role="test" name="tests/swoole_redis_coro/connect_twice-2.phpt" />
@@ -1680,6 +1683,7 @@
16801683
<file role="test" name="tests/swoole_server/sigint_with_process.phpt" />
16811684
<file role="test" name="tests/swoole_server/sleep.phpt" />
16821685
<file role="test" name="tests/swoole_server/slow_client.phpt" />
1686+
<file role="test" name="tests/swoole_server/slow_master.phpt" />
16831687
<file role="test" name="tests/swoole_server/slow_worker.phpt" />
16841688
<file role="test" name="tests/swoole_server/ssl/00.phpt" />
16851689
<file role="test" name="tests/swoole_server/ssl/bad_client.phpt" />

‎tests/swoole_http_server_coro/create_response.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
swoole_http_server: create response
2+
swoole_http_server_coro: create response
33
--SKIPIF--
44
<?php
55

‎tests/swoole_http_server_coro/create_response_2.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
swoole_http_server: create response [2]
2+
swoole_http_server_coro: create response [2]
33
--SKIPIF--
44
<?php
55

‎tests/swoole_redis_coro/compatibility_mode/hExists.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
swoole_redis_coro: hExists
2+
swoole_redis_coro/compatibility_mode: hExists
33
--SKIPIF--
44
<?php require __DIR__ . '/../../include/skipif.inc'; ?>
55
--FILE--

‎thirdparty/boost/asm/jump_combined_sysv_macho_gas.S

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
#include "jump_ppc32_sysv_macho_gas.S"
1616
#elif defined(__ppc64__)
1717
#include "jump_ppc64_sysv_macho_gas.S"
18+
#elif defined(__arm__)
19+
#include "jump_arm_aapcs_macho_gas.S"
20+
#elif defined(__arm64__)
21+
#include "jump_arm64_aapcs_macho_gas.S"
1822
#else
1923
#error "No arch's"
2024
#endif

‎thirdparty/boost/asm/make_combined_sysv_macho_gas.S

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
#include "make_ppc32_sysv_macho_gas.S"
1616
#elif defined(__ppc64__)
1717
#include "make_ppc64_sysv_macho_gas.S"
18+
#elif defined(__arm__)
19+
#include "make_arm_aapcs_macho_gas.S"
20+
#elif defined(__arm64__)
21+
#include "make_arm64_aapcs_macho_gas.S"
1822
#else
1923
#error "No arch's"
2024
#endif

0 commit comments

Comments
 (0)