Djam/php7
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/php7.git synced 2025-02-23 14:52:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'rosa2021.15' into rosa2023.1

Browse source
This commit is contained in:
Mikhail Novosyolov 2024-01-16 14:33:29 +03:00
commit 8fea8f5760
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
php-7.4.30-svace-fixes.patch
View file

@ -323,3 +323,17 @@ index e0cf63d..d30d9e1 100644
set_ns_and_type(ret, type); set_ns_and_type(ret, type);
} }
return ret; return ret;
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index 4dcaf12..96e516b 100644
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -1396,8 +1396,8 @@ MYSQLND_METHOD(mysqlnd_res, store_result_fetch_data)(MYSQLND_CONN_DATA * const c
UPSERT_STATUS_GET_SERVER_STATUS(conn->upsert_status));
free_end:
PACKET_FREE(&row_packet);
+ DBG_INF_FMT("rows=%llu", (unsigned long long)set->row_count);
end:
- DBG_INF_FMT("rows=%llu", (unsigned long long)result->stored_data->row_count);
DBG_RETURN(ret);
}
/* }}} */

2
php7.spec
View file

@ -27,7 +27,7 @@
Summary: The PHP7 scripting language Summary: The PHP7 scripting language
Name: php Name: php
Version: 7.4.33 Version: 7.4.33
Release: 5 Release: 6
Source0: http://ch1.php.net/distributions/php-%{version}.tar.gz Source0: http://ch1.php.net/distributions/php-%{version}.tar.gz
Source1: macros.php Source1: macros.php
Group: Development/PHP Group: Development/PHP