Skip to content

Commit 47ba54f

Browse files
committed
fix swoole_http_server zend_mm heap crash on PHP7.
1 parent 2169df9 commit 47ba54f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

swoole_http.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ typedef struct
8989
zval zpost;
9090
zval zfiles;
9191
zval zcookie;
92+
zval zdata;
9293
} request_stack;
9394
struct
9495
{

swoole_http_server.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ static int http_onReceive(swServer *serv, swEventData *req)
10051005
php_http_parser_init(parser, PHP_HTTP_REQUEST);
10061006

10071007
zval *zdata;
1008-
SW_MAKE_STD_ZVAL(zdata);
1008+
http_alloc_zval(client, request, zdata);
10091009
zdata = php_swoole_get_recv_data(zdata, req TSRMLS_CC);
10101010

10111011
swTrace("httpRequest %d bytes:\n---------------------------------------\n%s\n", Z_STRLEN_P(zdata), Z_STRVAL_P(zdata));
@@ -1026,7 +1026,6 @@ static int http_onReceive(swServer *serv, swEventData *req)
10261026
zval *retval;
10271027
zval **args[2];
10281028
zval *zreques_object = client->request.zrequest_object;
1029-
client->request.zdata = zdata;
10301029

10311030
char *method_name = http_get_method_name(parser->method);
10321031

0 commit comments

Comments
 (0)