[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/openssl/openssl.c
Commit:71daf3229b5707a3553dc7d1971e8a0e77cd9dfb Author:Stanislav Malyshev s...@php.net Tue, 10 Dec 2013 11:33:40 -0800 Parents: c062c18d426e8b1e4d7e4fabb6a5eae331f6e58b 8650bbc8dc6c3b416454f5e38812430edbd438c6 Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=71daf3229b5707a3553dc7d1971e8a0e77cd9dfb Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: 5.3.29-dev Fix CVE-2013-6420 - memory corruption in openssl_x509_parse Conflicts: configure.in main/php_version.h Changed paths: MM NEWS MM ext/openssl/openssl.c diff --cc NEWS index ebdf315,72c0939..cc85e90 --- a/NEWS +++ b/NEWS @@@ -1,319 -1,22 +1,323 @@@ PHP NEWS ||| -?? ??? 201?, PHP 5.3.29 +?? ??? 2013, PHP 5.4.24 -12 Dec 2013, PHP 5.3.28 +- Core: + . Added validation of class names in the autoload process. (Dmitry) + . Fixed invalid C code in zend_strtod.c. (Lior Kaplan) + . Fixed bug #61645 (fopen and O_NONBLOCK). (Mike) + +- Date: + . Fixed bug #66060 (Heap buffer over-read in DateInterval). (Remi) + . Fixed bug #63391 (Incorrect/inconsistent day of week prior to the year +1600). (Derick, T. Carter) + . Fixed bug #61599 (Wrong Day of Week). (Derick, T. Carter) + +- DOM: + . Fixed bug #65196 (Passing DOMDocumentFragment to DOMDocument::saveHTML() +Produces invalid Markup). (Mike) + +- Filter: + . Fixed bug #66229 (128.0.0.0/16 isn't reserved any longer). (Adam) + +- XSL + . Fixed bug #49634 (Segfault throwing an exception in a XSL registered +function). (Mike) + - ?? ??? 2013, PHP 5.4.23 ++12 Dec 2013, PHP 5.4.23 + +- Core: + . Fixed bug #66094 (unregister_tick_function tries to cast a Closure to a +string). (Laruence) + . Fixed bug #65969 (Chain assignment with T_LIST failure). (Dmitry) + . Fixed bug #65947 (basename is no more working after fgetcsv in certain +situation). (Laruence) + +- JSON + . Fixed whitespace part of bug #64874 (json_decode handles whitespace and +case-sensitivity incorrectly). (Andrea Faulds) + +- MySQLi: + . Fixed bug #66043 (Segfault calling bind_param() on mysqli). (Laruence) + +- mysqlnd: + . Fixed bug #66124 (mysqli under mysqlnd loses precision when bind_param +with 'i'). (Andrey) + . Fixed bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES +after failed query). (Andrey) + - Openssl: - . Fixed handling null bytes in subjectAltName (CVE-2013-4073). -(Christian Heimes) + . Fixed memory corruption in openssl_x509_parse() (CVE-2013-6420). + (Stefan Esser). + -11 Jul 2013, PHP 5.3.27 +- PDO + . Fixed bug 65946 (sql_parser permanently converts values bound to strings) + +14 Nov 2013, PHP 5.4.22 + +- Core: + . Fixed bug #65911 (scope resolution operator - strange behavior with $this). +(Bob Weinand) + +- CLI server: + . Fixed bug #65818 (Segfault with built-in webserver and chunked transfer +encoding). (Felipe) + +- Exif: + . Fixed crash on unknown encoding. (Draal) + +- FTP: + . Fixed bug #65667 (ftp_nb_continue produces segfault). (Philip Hofstetter) + +- ODBC: + . Fixed bug #65950 (Field name truncation if the field name is bigger than +32 characters). (patch submitted by: michael dot y at zend dot com, Yasuo) + +- PDO: + . Fixed bug #66033 (Segmentation Fault when constructor of PDO statement +throws an exception). (Laruence) + +- Sockets: + . Fixed bug #65808 (the socket_connect() won't work with IPv6 address). +(Mike) + +- Standard: + . Fixed bug #64760 (var_export() does not use full precision for floating-point +numbers) (Yasuo) + +- XMLReader: + . Fixed bug #51936 (Crash with clone XMLReader). (Mike) + . Fixed bug #64230 (XMLReader does not suppress errors). (Mike) + + +17 Oct 2013, PHP 5.4.21 + +- Core: + . Fixed bug #65322 (compile time errors won't trigger auto loading). (Nikita) + +- CLI server: + . Fixed bug #65633 (built-in server treat some http headers as +case-sensitive). (Adam) + +- Datetime: + . Fixed bug #64157 (DateTime::createFromFormat() reports confusing error +message). (Boro Sitnikovski) + +- DBA extension: + . Fixed bug #65708 (dba functions cast $key param to string in-place, +bypassing copy on write). (Adam) + +- Filter: + . Add RFC 6598 IPs to reserved addresses. (Sebastian Nohn) + . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names). +(Syra) + +- IMAP: + . Fixed bug #65721 (configure script broken in 5.5.4 and 5.4.20 when enabling +imap). (ryotakatsuki at gmail dot com) + +- Standard: + . Fixed bug #61548 (content-type must appear at the end of headers for 201 +Location to work in http). (Mike) + +- Build system: + . Fixed bug #62396
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/openssl/openssl.c
Commit:cf96aa155ec5e9fbee7af339ca7d4dd98c2086a4 Author:Stanislav Malyshev s...@php.net Mon, 19 Aug 2013 01:03:18 -0700 Parents: 14f5732096575f3c4ff0438e6650238370cb465c c1c49d6e3983c9ce0b43ffe7bf6e03b809ed048b Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cf96aa155ec5e9fbee7af339ca7d4dd98c2086a4 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: fix using wrong buffer pointer Changed paths: MM ext/openssl/openssl.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/xml/xml.c
Commit:e4a28b7b7b972fecd01458364c0663195352891e Author:Rob Richards rricha...@php.net Sat, 6 Jul 2013 07:59:20 -0400 Parents: c652cc93ec5ce8f1833d023159804ebd56e1a94e 7d163e8a0880ae8af2dd869071393e5dc07ef271 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e4a28b7b7b972fecd01458364c0663195352891e Log: Merge branch 'PHP-5.3' into PHP-5.4 # By Rob Richards (1) * PHP-5.3: truncate results at depth of 255 to prevent corruption Changed paths: MM ext/xml/xml.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: main/streams/cast.c
Commit:02f552cecadf7fa0a77f179e02f4dcb33b267105 Author:Matteo Beccati mbecc...@php.net Fri, 14 Jun 2013 16:54:32 +0200 Parents: 10b9579395641d96baf267bd880366aee690c1e0 6238dd6f3257bed9efe60a39978376862668e71c Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=02f552cecadf7fa0a77f179e02f4dcb33b267105 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug #63186 (compile failure on netbsd) Bugs: https://bugs.php.net/63186 Changed paths: MM main/streams/cast.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/spl/spl_iterators.c
Commit:f338510c94f71fdf5f0ea9990dfb36e9b4215028 Author:Xinchen Hui larue...@php.net Sun, 9 Jun 2013 22:25:07 +0800 Parents: e14800dd46ce9adbaa696fec6b2f1741bbc3abba 75c57122e36897c81c33dae81c436f7bad65e35c Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f338510c94f71fdf5f0ea9990dfb36e9b4215028 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/spl/spl_iterators.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_vm_def.h Zend/zend_vm_execute.h
Commit:ab22fda7e52f097297f1dcdf06f474cea858adc0
Author:Xinchen Hui larue...@php.net Sun, 9 Jun 2013 13:35:45 +0800
Parents: a7e25bdd486c28958c2db2f28c9fda63bb938405
e8f004d54252e0130b88131bdc46a41ed365c51e
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=ab22fda7e52f097297f1dcdf06f474cea858adc0
Log:
Merge branch 'PHP-5.3' into PHP-5.4
Changed paths:
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
Diff:
diff --cc Zend/zend_vm_def.h
index eed65e3,d471f39..40e2e42
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -2682,27 -2325,26 +2682,29 @@@ ZEND_VM_HELPER(zend_do_fcall_common_hel
}
if (!RETURN_VALUE_USED(opline)) {
-
zval_ptr_dtor(EX_T(opline-result.u.var).var.ptr);
+ zval_ptr_dtor(ret-var.ptr);
}
+ } else if (RETURN_VALUE_USED(opline)) {
+ EX_T(opline-result.u.var).var.ptr = NULL;
}
- } else if (EX(function_state).function-type == ZEND_USER_FUNCTION) {
+ } else if (fbc-type == ZEND_USER_FUNCTION) {
EX(original_return_value) = EG(return_value_ptr_ptr);
EG(active_symbol_table) = NULL;
- EG(active_op_array) = EX(function_state).function-op_array;
+ EG(active_op_array) = fbc-op_array;
EG(return_value_ptr_ptr) = NULL;
- if (RETURN_VALUE_USED(opline)) {
- EG(return_value_ptr_ptr) =
EX_T(opline-result.u.var).var.ptr;
- EX_T(opline-result.u.var).var.ptr = NULL;
- EX_T(opline-result.u.var).var.ptr_ptr =
EX_T(opline-result.u.var).var.ptr;
- EX_T(opline-result.u.var).var.fcall_returned_reference
= EX(function_state).function-common.return_reference;
+ if (RETURN_VALUE_USED(opline)) {
+ temp_variable *ret = EX_T(opline-result.var);
+
+ ret-var.ptr = NULL;
+ EG(return_value_ptr_ptr) = ret-var.ptr;
+ ret-var.ptr_ptr = ret-var.ptr;
+ ret-var.fcall_returned_reference =
(fbc-common.fn_flags ZEND_ACC_RETURN_REFERENCE) != 0;
}
- if (zend_execute == execute !EG(exception)) {
- EX(call_opline) = opline;
- ZEND_VM_ENTER();
+ if (EXPECTED(zend_execute == execute)) {
+ if (EXPECTED(EG(exception) == NULL)) {
+ ZEND_VM_ENTER();
+ }
} else {
zend_execute(EG(active_op_array) TSRMLS_CC);
}
diff --cc Zend/zend_vm_execute.h
index 18b3f47,993b822..ad6d708
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -646,27 -325,26 +646,29 @@@ static int ZEND_FASTCALL zend_do_fcall_
}
if (!RETURN_VALUE_USED(opline)) {
-
zval_ptr_dtor(EX_T(opline-result.u.var).var.ptr);
+ zval_ptr_dtor(ret-var.ptr);
}
+ } else if (RETURN_VALUE_USED(opline)) {
+ EX_T(opline-result.u.var).var.ptr = NULL;
}
- } else if (EX(function_state).function-type == ZEND_USER_FUNCTION) {
+ } else if (fbc-type == ZEND_USER_FUNCTION) {
EX(original_return_value) = EG(return_value_ptr_ptr);
EG(active_symbol_table) = NULL;
- EG(active_op_array) = EX(function_state).function-op_array;
+ EG(active_op_array) = fbc-op_array;
EG(return_value_ptr_ptr) = NULL;
if (RETURN_VALUE_USED(opline)) {
- EG(return_value_ptr_ptr) =
EX_T(opline-result.u.var).var.ptr;
- EX_T(opline-result.u.var).var.ptr = NULL;
- EX_T(opline-result.u.var).var.ptr_ptr =
EX_T(opline-result.u.var).var.ptr;
- EX_T(opline-result.u.var).var.fcall_returned_reference
= EX(function_state).function-common.return_reference;
+ temp_variable *ret = EX_T(opline-result.var);
+
+ ret-var.ptr = NULL;
+ EG(return_value_ptr_ptr) = ret-var.ptr;
+ ret-var.ptr_ptr = ret-var.ptr;
+ ret-var.fcall_returned_reference =
(fbc-common.fn_flags ZEND_ACC_RETURN_REFERENCE) != 0;
}
- if (zend_execute == execute !EG(exception)) {
- EX(call_opline) = opline;
- ZEND_VM_ENTER();
+ if (EXPECTED(zend_execute == execute)) {
+ if (EXPECTED(EG(exception) == NULL)) {
+ ZEND_VM_ENTER();
+
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/browscap.c
Commit:25cae37b13e76f91546e314c62822a9f85e6d408 Author:Anatol Belski a...@php.net Thu, 6 Jun 2013 18:51:32 +0200 Parents: 5ee047b4862dd9fc110b02ddc3b5a3e521424a3a 1aee7ad63672747bd941f169ef42bed5765137e0 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=25cae37b13e76f91546e314c62822a9f85e6d408 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug #64934 Apache2 TS crash with get_browser() Bugs: https://bugs.php.net/64934 Changed paths: MM ext/standard/browscap.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_execute_API.c
Commit:f597f5561e658643d2f7f6e35c12b283760e1ac3 Author:Xinchen Hui larue...@php.net Wed, 5 Jun 2013 17:26:10 +0800 Parents: efdeec3c0eb8e1bd9d14af37be6979fb46eda5df 3c87945c95c9c31986e690bb046c70e58c8d8896 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f597f5561e658643d2f7f6e35c12b283760e1ac3 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM Zend/zend_execute_API.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/standard/quot_print.c
Commit:efdeec3c0eb8e1bd9d14af37be6979fb46eda5df Author:Stanislav Malyshev s...@php.net Tue, 4 Jun 2013 21:57:16 -0700 Parents: 90bb28726bd0728059b0d58b1c063ae8ea250966 93e0d78ec655f59ebfa82b2c6f8486c43651c1d0 Branches: PHP-5.4 PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=efdeec3c0eb8e1bd9d14af37be6979fb46eda5df Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: fix CVE-2013-2110 - use correct formula to calculate string size Changed paths: MM NEWS MM ext/standard/quot_print.c Diff: diff --cc NEWS index 133a202,60a4035..371ec37 --- a/NEWS +++ b/NEWS @@@ -1,31 -1,26 +1,33 @@@ PHP NEWS ||| -?? ??? 2013, PHP 5.3.27 +?? ??? 2013, PHP 5.4.17 -- PDO_firebird: - . Fixed bug #64037 (Firebird return wrong value for numeric field). -(Matheus Degiovani, Matteo) - . Fixed bug #62024 (Cannot insert second row with null using parametrized -query). (patch by ja...@kenjim.com, Matheus Degiovani, Matteo) +- FPM: + . Fixed Bug #64915 (error_log ignored when daemonize=0). (Remi) -- PDO_pgsql: - . Fixed bug #64949 (Buffer overflow in _pdo_pgsql_error). (Remi) +- PDO_DBlib: + . Fixed bug #63638 (Cannot connect to SQL Server 2008 with PDO dblib). +(Stanley Sufficool) + . Fixed bug #64338 (pdo_dblib can't connect to Azure SQL). (Stanley +Sufficool) + . Fixed bug #64808 (FreeTDS PDO getColumnMeta on a prepared but not executed +statement crashes). (Stanley Sufficool) -- pgsql: - - Fixed bug #64609 (pg_convert enum type support). (Matteo) +- PDO_pgsql: + . Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error). (Remi) -?? ??? 2013, PHP 5.3.26 -### DO NOT ADD ENTRIES HERE, ADD THEM ABOVE FOR 5.3.27 ### +?? ??? 2013, PHP 5.4.16 - Core: - . Fixed bug #64720 (SegFault on zend_deactivate). (Dmitry) + . Fixed bug #64879 (Heap based buffer overflow in quoted_printable_encode, + CVE 2013-2110). (Stas) ++ . Fixed bug #64853 (Use of no longer available ini directives causes crash on ++TS build). (Anatol) + . Fixed bug #64729 (compilation failure on x32). (Gustavo) ++ . Fixed bug #64720 (SegFault on zend_deactivate). (Dmitry) + . Fixed bug #64660 (Segfault on memory exhaustion within function definition). +(Stas, reported by Juha Kylmänen) - . Fixed bug #64853 (Use of no longer available ini directives causes crash on - TS build). (Anatol) - Calendar: . Fixed bug #64895 (Integer overflow in SndToJewish). (Remi) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/pgsql/pgsql.c
Commit:51c065f611c563c4b9fc0432be27fafd99424d8e Author:Matteo Beccati mbecc...@php.net Sun, 2 Jun 2013 06:33:54 +0200 Parents: de428331158a8850c1bb7b1b187efb52c34a6b34 25aae37229a439109c020150d0f496ef4a237ecd Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=51c065f611c563c4b9fc0432be27fafd99424d8e Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug #64609 (pg_convert enum type support) Bugs: https://bugs.php.net/64609 Changed paths: MM ext/pgsql/pgsql.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/pdo_pgsql/pgsql_driver.c
Commit:2dd67abb7d3c87d8a103e69f2e0a9e380276e4e5 Author:Remi Collet r...@php.net Fri, 31 May 2013 08:44:33 +0200 Parents: 8b515fa00ad844af82158449ee3d5d1c72a93451 1c623e3b07128e78362911ff5754e7eee57fa8bb Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2dd67abb7d3c87d8a103e69f2e0a9e380276e4e5 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error) Bugs: https://bugs.php.net/64949 Changed paths: MM ext/pdo_pgsql/pgsql_driver.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_compile.c
Commit:8b515fa00ad844af82158449ee3d5d1c72a93451 Author:Dmitry Stogov dmi...@zend.com Wed, 29 May 2013 11:12:43 +0400 Parents: bcdac7526d2f48014e1e5f44d1449f8b841ff9e8 13e5c97ffd75821c01bbec79c1d2233c50d36b0e Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8b515fa00ad844af82158449ee3d5d1c72a93451 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed incorrect argument number Conflicts: Zend/zend_compile.c Changed paths: MM Zend/zend_compile.c Diff: diff --cc Zend/zend_compile.c index 82275ce,0fd1deb..3959517 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@@ -5478,8 -4018,8 +5478,8 @@@ void zend_do_shell_exec(znode *result, opline-opcode = ZEND_SEND_VAR; break; } - opline-op1 = *cmd; - opline-op2.u.opline_num = 1; + SET_NODE(opline-op1, cmd); - opline-op2.opline_num = 0; ++ opline-op2.opline_num = 1; opline-extended_value = ZEND_DO_FCALL; SET_UNUSED(opline-op2); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_API.h
Commit:2d7415a4af66e0771b36a10534e304fe7af4a855 Author:Sara Golemon poll...@php.net Sun, 19 May 2013 13:34:57 -0700 Parents: 646ebc2cb9148404ffbccf14413b794f3a1e0688 2d5695cbc5a627cb278b3ab0b1f5eed2f8be1bee Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2d7415a4af66e0771b36a10534e304fe7af4a855 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Don't double-quote name of namespaced function. Changed paths: MM Zend/zend_API.h Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/mysql/php_mysql.c ext/phar/phar_object.c ext/phar/util.c
Commit:de82e7edf7c91afab236a087ce4900868066b5d7 Author:Anatol Belski a...@php.net Wed, 15 May 2013 11:14:58 +0200 Parents: 1a46a102d96e08d1256770ddca3e9d955bcec025 86db5fb4c2b7199dc862dfce99c345c49305ba8a Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=de82e7edf7c91afab236a087ce4900868066b5d7 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fix unitialized vars when sql.safe_mode=1 more check for php_stream_fopen_tmpfile failure Changed paths: MM ext/mysql/php_mysql.c MM ext/phar/phar_object.c MM ext/phar/util.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/phar/phar_object.c ext/phar/util.c
Commit:7ec2e5314eb62d9cd2ef23e0b62445eb50cc23c0 Author:Pierre Joye pierre@gmail.com Tue, 14 May 2013 16:45:56 +0200 Parents: f37c54ab276bc55339e4b8aa2b6f5caa88cb4b86 ba1af298052cbef7329e330f2d3f9749b9be65bb Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7ec2e5314eb62d9cd2ef23e0b62445eb50cc23c0 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: more check for php_stream_fopen_tmpfile failure Changed paths: MM ext/phar/phar_object.c MM ext/phar/util.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/soap/soap.c
Commit:156576fcced43efc558002d504732271f6cc1fe1 Author:Anatol Belski a...@php.net Mon, 13 May 2013 14:25:25 +0200 Parents: 89159926ad1ceda2acb3c051599d3a918deba808 fe21accfb4913bf309f26894ae27e9ad34fb5260 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=156576fcced43efc558002d504732271f6cc1fe1 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: fix heap overflow warnings on win x64 debug crt Changed paths: MM ext/soap/soap.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_exceptions.c
Commit:dd188e9538a83473246d94642a7ce577fc5de33b Author:Anatol Belski a...@php.net Sun, 12 May 2013 14:06:59 +0200 Parents: 699dc04c5597a6dbd5d4fac43096d01ea37e6069 d6505acbf5ff6db0e9e19cdba121183d9563bad5 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dd188e9538a83473246d94642a7ce577fc5de33b Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug #64821 Custom Exceptions crash when internal properties overridden Bugs: https://bugs.php.net/64821 Changed paths: MM Zend/zend_exceptions.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: sapi/fpm/fpm/fpm_sockets.c
Commit:3fd4b6be6318aa20f53a28820e755bed420d813d Author:Remi Collet r...@php.net Fri, 3 May 2013 08:22:55 +0200 Parents: b7b150b8304419cd4ee8bba28915732d2c852291 0549e55d8233c1a0fb3eaf42bf88265f9b0fa5d0 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3fd4b6be6318aa20f53a28820e755bed420d813d Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: From code coverity scan, syscall return value must be check. Changed paths: MM sapi/fpm/fpm/fpm_sockets.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/streamsfuncs.c
Commit:aa4762572ee85e29e7d3cb063444f97074f61b85 Author:Anatol Belski a...@php.net Fri, 3 May 2013 17:03:16 +0200 Parents: e36adfe94a663bc1eeb5d9d378dc80883de179db b1ea0b7a7a580f074d889f9ff7a46566917088f2 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aa4762572ee85e29e7d3cb063444f97074f61b85 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug #64770 stream_select() fails with pipes Bugs: https://bugs.php.net/64770 Changed paths: MM ext/standard/streamsfuncs.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: sapi/fpm/fpm/fpm_main.c
Commit:be3f7ba4fbe2e4f9dec1da610facaef2dcbb10b3 Author:Remi Collet r...@php.net Thu, 2 May 2013 09:38:12 +0200 Parents: 3f2f534a5ca164772eb52625fcde635d9e636628 ab117573cd6fef9b7df50e00df0cf2078b740b5c Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=be3f7ba4fbe2e4f9dec1da610facaef2dcbb10b3 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: fix possible null deref (detected by code coverity scan) Changed paths: MM sapi/fpm/fpm/fpm_main.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: sapi/fpm/fpm/fpm_sockets.c
Commit:b7b150b8304419cd4ee8bba28915732d2c852291 Author:Remi Collet r...@php.net Thu, 2 May 2013 13:47:36 +0200 Parents: 08b72ac9f12890793bc67446e4999892607bbf7b 444e59eb2071e8c2d2bcb61bb1e2404dd3b780cf Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b7b150b8304419cd4ee8bba28915732d2c852291 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: fix more resource leaks Changed paths: MM sapi/fpm/fpm/fpm_sockets.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/mysqlnd/mysqlnd_result.c
Commit:d54432ed98e1ba563677d40f32f5bb10124478af Author:Xinchen Hui larue...@php.net Sat, 27 Apr 2013 23:38:10 +0800 Parents: e9b03c412ba44826de2c8150c7a930fe9aa17074 c7b8368ed579ddd539af95427902215f0530b4ea Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d54432ed98e1ba563677d40f32f5bb10124478af Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/mysqlnd/mysqlnd_result.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/mysqli/tests/bug64726.phpt
Commit:7b9eabaf51d6b91d250b19d78d400993231e2a64 Author:Xinchen Hui larue...@php.net Sat, 27 Apr 2013 23:50:02 +0800 Parents: 8f5a534b215905790a4dd5465804c1fbc21468c4 15b554cd9ba6b8553f45ea8408b3f0386965bef6 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7b9eabaf51d6b91d250b19d78d400993231e2a64 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/mysqli/tests/bug64726.phpt Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_vm_def.h Zend/zend_vm_execute.h
Commit:43ab915b41bbb236ca0aa1966c946c9c36fa2a2b
Author:Dmitry Stogov dmi...@zend.com Tue, 23 Apr 2013 23:55:47
+0400
Parents: b3aa3c26168df33fd739669bb7ede2af88051158
4cf0647399b7f79fa1d74bba9d528bc74b78ba10
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=43ab915b41bbb236ca0aa1966c946c9c36fa2a2b
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when
EX(function_state).function is not yet set to the calling function.
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Changed paths:
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
Diff:
diff --cc Zend/zend_vm_def.h
index f051c1a,02566f3..eed65e3
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -3140,7 -2710,9 +3140,9 @@@ ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|
ZEND_VM_NEXT_OPCODE();
}
- if (EX(function_state).function-type == ZEND_INTERNAL_FUNCTION
!ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline-op2.opline_num)) {
+ if (opline-extended_value == ZEND_DO_FCALL_BY_NAME
+ EX(function_state).function-type == ZEND_INTERNAL_FUNCTION
- !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline-op2.u.opline_num)) {
++ !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline-op2.opline_num)) {
ZEND_VM_DISPATCH_TO_HELPER(zend_send_by_var_helper);
}
diff --cc Zend/zend_vm_execute.h
index 07082d4,f6220b0..18b3f47
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -11171,7 -8399,9 +11171,9 @@@ static int ZEND_FASTCALL ZEND_SEND_REF
ZEND_VM_NEXT_OPCODE();
}
- if (EX(function_state).function-type == ZEND_INTERNAL_FUNCTION
!ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline-op2.opline_num)) {
+ if (opline-extended_value == ZEND_DO_FCALL_BY_NAME
+ EX(function_state).function-type == ZEND_INTERNAL_FUNCTION
- !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline-op2.u.opline_num)) {
++ !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline-op2.opline_num)) {
return
zend_send_by_var_helper_SPEC_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
}
@@@ -27123,7 -22314,9 +27125,9 @@@ static int ZEND_FASTCALL ZEND_SEND_REF
ZEND_VM_NEXT_OPCODE();
}
- if (EX(function_state).function-type == ZEND_INTERNAL_FUNCTION
!ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline-op2.opline_num)) {
+ if (opline-extended_value == ZEND_DO_FCALL_BY_NAME
+ EX(function_state).function-type == ZEND_INTERNAL_FUNCTION
- !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline-op2.u.opline_num)) {
++ !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline-op2.opline_num)) {
return
zend_send_by_var_helper_SPEC_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/standard/dns.c
Commit:5e24a6e74dfd4cff42a65fd45dddfb8878b6308a Author:Stanislav Malyshev s...@php.net Tue, 23 Apr 2013 21:43:55 -0700 Parents: 43ab915b41bbb236ca0aa1966c946c9c36fa2a2b 18fdab5a09b64252a9a61ad6d1b2eff4a257b8f2 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5e24a6e74dfd4cff42a65fd45dddfb8878b6308a Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fix bug #64458 (dns_get_record result with string of length -1) Bugs: https://bugs.php.net/64458 Changed paths: MM NEWS MM ext/standard/dns.c Diff: diff --cc NEWS index c93c899,af4957e..250ef5b --- a/NEWS +++ b/NEWS @@@ -4,19 -5,12 +4,20 @@@ PH - Core: . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: segfault). (Laruence) + . Fixed bug #64458 (dns_get_record result with string of length -1). (Stas) + . Fixed bug #64433 (follow_location parameter of context is ignored for most +response codes). (Sergey Akbarov) . Fixed bugs #47675 and #64577 (fd leak on Solaris) +- CURL: + . Add CURL_WRAPPERS_ENABLED constant. (Laruence) + +- Fileinfo: + . Upgraded libmagic to 5.14. (Anatol) + - Zip: . Fixed bug #64342 (ZipArchive::addFile() has to check for file existence). - (Anatol) +(Anatol) - Streams: . Fixed Windows x64 version of stream_socket_pair() and improved error handling -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/dns.c
Commit:f87d2ab893a37153e46510cfb604f9a0d5e30c69 Author:Stanislav Malyshev s...@php.net Tue, 23 Apr 2013 21:43:55 -0700 Parents: 43ab915b41bbb236ca0aa1966c946c9c36fa2a2b 18fdab5a09b64252a9a61ad6d1b2eff4a257b8f2 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f87d2ab893a37153e46510cfb604f9a0d5e30c69 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fix bug #64458 (dns_get_record result with string of length -1) Bugs: https://bugs.php.net/64458 Changed paths: MM ext/standard/dns.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/streamsfuncs.c
Commit:8febe2ad081dafa3d9d617c3d27f73777d735cc4 Author:Anatol Belski a...@php.net Mon, 22 Apr 2013 18:59:11 +0200 Parents: 0b2c411323413deffd3ae71a634f413ce04cdacc f082d6311b7998987f018fc6c791dd1892f2912a Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8febe2ad081dafa3d9d617c3d27f73777d735cc4 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed stream_socket_pair() on Windows x64 and Changed paths: MM ext/standard/streamsfuncs.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/mysqlnd/mysqlnd_enum_n_def.h
Commit:39cc08c7e985a7621d052e3f557c63cf5456fc30 Author:Andrey Hristov and...@php.net Fri, 19 Apr 2013 15:55:46 +0200 Parents: ecf76e2da81ca23d8e53d010ad1190129eb417ab 0802961bd13adef4f108ebb84a7de84951811795 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=39cc08c7e985a7621d052e3f557c63cf5456fc30 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/mysqlnd/mysqlnd_enum_n_def.h Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/gd/config.m4 ext/gd/gd.c
Commit:c480bf3fb2f04952f4421df197c58b07b479c1c1 Author:Pierre Joye pierre@gmail.com Wed, 10 Apr 2013 20:13:18 +0200 Parents: 442ff25187081212631c03a49041a0529520b505 224a67fb9f91f027efa8142d6b81072b33bd6cc5 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c480bf3fb2f04952f4421df197c58b07b479c1c1 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: add external 2.1 detection and fix gd_compat for 2.1+ Changed paths: MM ext/gd/config.m4 MM ext/gd/gd.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/zip/php_zip.c
Commit:ceb5b684e09df93e6061b1308c91a3d311608cff Author:Anatol Belski a...@php.net Wed, 10 Apr 2013 20:40:28 +0200 Parents: 442ff25187081212631c03a49041a0529520b505 968ae4a56a08587d73f81f30a0d57fbd109e4cf4 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ceb5b684e09df93e6061b1308c91a3d311608cff Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug #64342 ZipArchive::addFile() has to check for file existence Bugs: https://bugs.php.net/64342 Changed paths: MM ext/zip/php_zip.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_execute.c
Commit:db3d629f0578b783a48302a64a0d755942f6c574
Author:Xinchen Hui larue...@php.net Thu, 4 Apr 2013 13:40:46 +0800
Parents: 99ad08f9a5e696654676e9db8872e4198b738936
7fc8077e4caf1ac62e9591775f7779eb1a7c25ad
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=db3d629f0578b783a48302a64a0d755942f6c574
Log:
Merge branch 'PHP-5.3' into PHP-5.4
Changed paths:
MM Zend/zend_execute.c
Diff:
diff --cc Zend/zend_execute.c
index 276ad38,16dc08e..ff9c2d0
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@@ -1145,8 -937,11 +1145,12 @@@ convert_to_array
zend_error_noreturn(E_ERROR, []
operator not supported for strings);
}
+ if (type != BP_VAR_UNSET) {
+ SEPARATE_ZVAL_IF_NOT_REF(container_ptr);
+ }
+
if (Z_TYPE_P(dim) != IS_LONG) {
+
switch(Z_TYPE_P(dim)) {
/* case IS_LONG: */
case IS_STRING:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS Zend/zend_vm_def.h Zend/zend_vm_execute.h
Commit:e9f996c00d5cb6448dac1457dd9dae320c16904f
Author:Dmitry Stogov dmi...@zend.com Mon, 25 Mar 2013 15:23:49
+0400
Parents: 6f560b0487b48d8364a2077b97e661fd5107054e
c4686b4de93a89e8265331b0d4a6a7954ccbae95
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=e9f996c00d5cb6448dac1457dd9dae320c16904f
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions
properly). (Jeff Welch)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Bugs:
https://bugs.php.net/63914
Changed paths:
MM NEWS
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
diff --cc NEWS
index bc132d4,9d5fc6d..c14ea1c
--- a/NEWS
+++ b/NEWS
@@@ -1,16 -1,12 +1,18 @@@
PHP
NEWS
|||
-?? ??? 2013, PHP 5.3.24
-
+?? ??? 2013, PHP 5.4.14
- Core
+ . Fixed bug #64432 (more empty delimiter warning in strX methods).
(Laruence)
+ . Fixed bug #64417 (ArrayAccess::offsetGet() in a trait causes fatal
error).
+(Dmitry)
. Fixed bug #64370 (microtime(true) less than
$_SERVER['REQUEST_TIME_FLOAT']).
(Anatol)
+ . Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or
5.4.11).
+(Dmitry, Laruence)
+ . Fixed bug #63976 (Parent class incorrectly using child constant in class
+property). (Dmitry)
+ . Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle
+ exceptions properly). (Jeff Welch)
. Fixed bug #62343 (Show class_alias In get_declared_classes()) (Dmitry)
- PCRE:
diff --cc Zend/zend_vm_def.h
index e5cdd1d,eed9245..ffa94a1
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -2652,17 -2299,9 +2652,12 @@@ ZEND_VM_HELPER(zend_do_fcall_common_hel
zend_arg_types_stack_3_pop(EG(arg_types_stack), EX(called_scope),
EX(current_object), EX(fbc));
EX(function_state).arguments =
zend_vm_stack_push_args(opline-extended_value TSRMLS_CC);
+ LOAD_OPLINE();
+
+ if (fbc-type == ZEND_INTERNAL_FUNCTION) {
+ temp_variable *ret = EX_T(opline-result.var);
- MAKE_STD_ZVAL(ret-var.ptr);
- ZVAL_NULL(ret-var.ptr);
- ret-var.ptr_ptr = ret-var.ptr;
- ret-var.fcall_returned_reference = (fbc-common.fn_flags
ZEND_ACC_RETURN_REFERENCE) != 0;
-
- if (EX(function_state).function-type == ZEND_INTERNAL_FUNCTION) {
- if (EX(function_state).function-common.arg_info) {
+ if (fbc-common.arg_info) {
zend_uint i=0;
zval **p = (zval**)EX(function_state).arguments;
ulong arg_count = opline-extended_value;
@@@ -2673,34 -2312,37 +2668,41 @@@
}
}
- if (!zend_execute_internal) {
- /* saves one function call if zend_execute_internal is
not used */
- fbc-internal_function.handler(opline-extended_value,
ret-var.ptr, (fbc-common.fn_flags ZEND_ACC_RETURN_REFERENCE) ?
ret-var.ptr : NULL, EX(object), RETURN_VALUE_USED(opline) TSRMLS_CC);
- } else {
- zend_execute_internal(EXECUTE_DATA,
RETURN_VALUE_USED(opline) TSRMLS_CC);
- }
+ if (EXPECTED(EG(exception) == NULL)) {
- ALLOC_INIT_ZVAL(EX_T(opline-result.u.var).var.ptr);
- EX_T(opline-result.u.var).var.ptr_ptr =
EX_T(opline-result.u.var).var.ptr;
- EX_T(opline-result.u.var).var.fcall_returned_reference
= EX(function_state).function-common.return_reference;
++ MAKE_STD_ZVAL(ret-var.ptr);
++ ZVAL_NULL(ret-var.ptr);
++ ret-var.ptr_ptr = ret-var.ptr;
++ ret-var.fcall_returned_reference =
(fbc-common.fn_flags ZEND_ACC_RETURN_REFERENCE) != 0;
- if (!RETURN_VALUE_USED(opline)) {
- zval_ptr_dtor(ret-var.ptr);
+ if (!zend_execute_internal) {
+ /* saves one function call if
zend_execute_internal is not used */
- ((zend_internal_function *)
EX(function_state).function)-handler(opline-extended_value,
EX_T(opline-result.u.var).var.ptr,
EX(function_state).function-common.return_reference?EX_T(opline-result.u.var).var.ptr:NULL,
EX(object), RETURN_VALUE_USED(opline) TSRMLS_CC);
++
fbc-internal_function.handler(opline-extended_value, ret-var.ptr,
(fbc-common.fn_flags ZEND_ACC_RETURN_REFERENCE) ? ret-var.ptr : NULL,
EX(object), RETURN_VALUE_USED(opline) TSRMLS_CC);
+ } else {
+ zend_execute_internal(EXECUTE_DATA,
RETURN_VALUE_USED(opline) TSRMLS_CC);
+
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: sapi/cli/php.1.in
Commit:de71f435d8b4e30539284c73bd910f8dcc9e8d98 Author:Johannes Schlüter johan...@php.net Sun, 24 Mar 2013 17:32:00 +0100 Parents: bb18fa448c104c10d0899090bf64ca66e36e492e 66682f5abe27e7e53e088ec5d8268754912b5988 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=de71f435d8b4e30539284c73bd910f8dcc9e8d98 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM sapi/cli/php.1.in Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS Zend/zend_builtin_functions.c
Commit:84630a1109084507bc0c78301db831328229f1cb Author:Dmitry Stogov dmi...@zend.com Tue, 19 Mar 2013 14:59:08 +0400 Parents: e62bb0325763d9847847dd198e05c9b3147caf05 4a6291508d69fab951562b996ed7223c052a0168 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=84630a1109084507bc0c78301db831328229f1cb Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug #62343 (Show class_alias In get_declared_classes()) Bugs: https://bugs.php.net/62343 Changed paths: MM NEWS MM Zend/zend_builtin_functions.c Diff: diff --cc NEWS index 75b588b,c8c6f75..3c6579d --- a/NEWS +++ b/NEWS @@@ -1,37 -1,14 +1,38 @@@ PHP NEWS ||| -?? ??? 2013, PHP 5.3.24 - +?? ??? 2013, PHP 5.4.14 - Core + . Fixed bug #64417 (ArrayAccess::offsetGet() in a trait causes fatal error). +(Dmitry) . Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']). (Anatol) + . Fixed bug #62343 (Show class_alias In get_declared_classes()) (Dmitry) - PCRE: - . Merged PCRE 8.32). (Anatol) + . Merged PCRE 8.32. (Anatol) + +- SNMP: + . Fixed bug #61981 (OO API, walk: $suffix_as_key is not working correctly). + (Boris Lytochkin) + +14 Mar 2013, PHP 5.4.13 + +- Core: + . Fixed bug #64354 (Unserialize array of objects whose class can't +be autoloaded fail). (Laruence) + . Fixed bug #64235 (Insteadof not work for class method in 5.4.11). +(Laruence) + . Fixed bug #64197 (_Offsetof() macro used but not defined on ARM/Clang). +(Ard Biesheuvel) + . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell) + . Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi) + . Fixed bug #64070 (Inheritance with Traits failed with error). (Dmitry) + +- CLI server: + . Fixed bug #64128 (buit-in web server is broken on ppc64). (Remi) + +- Mbstring: + . mb_split() can now handle empty matches like preg_split() does. (Moriyoshi) - mysqlnd . Fixed bug #63530 (mysqlnd_stmt::bind_one_parameter crashes, uses wrong alloc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/date/php_date.c
Commit:cfd096fd7cc7e48e052f7309780a0bed257ed524 Author:Anatol Belski a...@php.net Tue, 19 Mar 2013 21:22:09 +0100 Parents: c6f6bf88d8c660f7dcb412b0d5049d376e3a5d36 8d199c7c4f93ebe5b9293096143d7007a6ad13a4 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cfd096fd7cc7e48e052f7309780a0bed257ed524 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Backported fix for bug #62852 Bugs: https://bugs.php.net/62852 Changed paths: MM ext/date/php_date.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/spl/spl_dllist.c
Commit:5de1b08482cdf2385e263f68ce9ea4001f724ffd Author:Etienne Kneuss col...@php.net Sat, 16 Mar 2013 18:20:06 +0100 Parents: 73c38eca5a7f3c68e1122aee001409dbd615c5a8 62364e6e01092911fa11e6d28f9acc3ed9af07e8 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5de1b08482cdf2385e263f68ce9ea4001f724ffd Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Remove spurious int cast in between two longs Changed paths: MM ext/spl/spl_dllist.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: README.RELEASE_PROCESS
Commit:30eff1a6974e57da3e1d50b167a1ff4cf48f9783 Author:Ferenc Kovacs tyr...@gmail.com Fri, 15 Mar 2013 09:41:34 +0100 Parents: 5df8cf19759c77ee05fe6eecba7088caecbe132e 9350f45aca48a1ad95da5dbaca0ee8a06e46a8d6 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=30eff1a6974e57da3e1d50b167a1ff4cf48f9783 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: explain the step updating the git submodule reference in web/php.git Changed paths: MM README.RELEASE_PROCESS Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/pcre/php_pcre.c
Commit:5df8cf19759c77ee05fe6eecba7088caecbe132e Author:Anatol Belski a...@php.net Thu, 14 Mar 2013 14:39:09 +0100 Parents: 0777a18703d9be2ea8efd85c0352863b8768e49e e43c5a83957c6a9953a74b5403a5f1d5ae341770 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5df8cf19759c77ee05fe6eecba7088caecbe132e Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: fix zts check Changed paths: MM ext/pcre/php_pcre.c Diff: diff --cc ext/pcre/php_pcre.c index 20fb2a2,fe72dbc..0d5d505 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@@ -248,10 -248,9 +248,10 @@@ PHPAPI pcre_cache_entry* pcre_get_compi #endif pcre_cache_entry*pce; pcre_cache_entry new_entry; + char*tmp = NULL; #if HAVE_SETLOCALE - # ifdef PHP_WIN32 ZTS + # if defined(PHP_WIN32) defined(ZTS) _configthreadlocale(_ENABLE_PER_THREAD_LOCALE); # endif locale = setlocale(LC_CTYPE, NULL); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/pcre/php_pcre.c
Commit:4e46a873923b9a608cd2cdcef98ec7faad749d0e
Author:Anatol Belski a...@php.net Mon, 4 Mar 2013 09:14:14 +0100
Parents: 2578f7bcc05c3a304599e978df3900323d3b1b70
b6fdb60ecf33b3d549d5d69e245b04d68ab3e824
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=4e46a873923b9a608cd2cdcef98ec7faad749d0e
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed PCRE locale crash in Windows/TS
Changed paths:
MM ext/pcre/php_pcre.c
Diff:
diff --cc ext/pcre/php_pcre.c
index b74b812,cab3a4c..20fb2a2
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@@ -248,8 -248,14 +248,15 @@@ PHPAPI pcre_cache_entry* pcre_get_compi
#endif
pcre_cache_entry*pce;
pcre_cache_entry new_entry;
+ char*tmp = NULL;
+ #if HAVE_SETLOCALE
+ # ifdef PHP_WIN32 ZTS
+ _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+ # endif
+ locale = setlocale(LC_CTYPE, NULL);
+ #endif
+
/* Try to lookup the cached regex entry, and if successful, just pass
back the compiled pattern, otherwise go on and compile it. */
if (zend_hash_find(PCRE_G(pcre_cache), regex, regex_len+1, (void
**)pce) == SUCCESS) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS
Commit:a3f020a4be1dc5595a55d0e970663e5830ce6aa7 Author:Derick Rethans git...@derickrethans.nl Sun, 3 Mar 2013 12:53:23 -0500 Parents: fe5ce5cb9143ca251dd8c2083a63232d8beea5a9 c134f2a1a5ef56da72dbdc1096eddc91e4f5939e Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a3f020a4be1dc5595a55d0e970663e5830ce6aa7 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM NEWS Diff: diff --cc NEWS index 4f29a68,6eea516..7d0d2b6 --- a/NEWS +++ b/NEWS @@@ -1,38 -1,12 +1,41 @@@ PHP NEWS ||| -?? ??? 2013, PHP 5.3.24 +?? ??? 2012, PHP 5.4.14 -28 Feb 2013, PHP 5.3.23RC1 +?? ??? 2012, PHP 5.4.13 + +- Core: + . Fixed bug #64235 (Insteadof not work for class method in 5.4.11). +(Laruence) + . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell) + . Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi) + . Fixed bug #64070 (Inheritance with Traits failed with error). (Dmitry) + +- CLI server: + . Fixed bug #64128 (buit-in web server is broken on ppc64). (Remi) + +- Mbstring: + . mb_split() can now handle empty matches like preg_split() does. (Moriyoshi) + +- OpenSSL: + . Fixed bug #61930 (openssl corrupts ssl key resource when using +openssl_get_publickey()). (Stas) + +- PDO_mysql: + . Fixed bug #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs). +(Johannes) + +- Phar: + . Fixed timestamp update on Phar contents modification. (Dmitry) + +- SOAP + . Added check that soap.wsdl_cache_dir conforms to open_basedir +(CVE-2013-1635). (Dmitry) + . Disabled external entities loading (CVE-2013-1643). (Dmitry) + - Phar: + . Fixed timestamp update on Phar contents modification. (Dmitry) + - SPL: . Fixed bug #64264 (SPLFixedArray toArray problem). (Laruence) . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS
Commit:2578f7bcc05c3a304599e978df3900323d3b1b70 Author:Stanislav Malyshev s...@php.net Sun, 3 Mar 2013 13:20:57 -0800 Parents: d95faef1a10df8db5ce622d6495733495d562430 656fcb67f1edbd2bde1b93577cdc273ad27e0d8f Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2578f7bcc05c3a304599e978df3900323d3b1b70 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: rename NEWS back updated NEWS Changed paths: AM NEWS Diff: Diff exceeded maximum size -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/spl/spl_array.c
Commit:7c082325091ee7bfcf0e1e8b488b1e9fa66f0739 Author:Stanislav Malyshev s...@php.net Tue, 26 Feb 2013 22:12:15 -0800 Parents: 52d1add0fe385d0e0d8b1132edd11168eb7fe0e4 61099f85857193c223dd62b0c5302507a77cf0ab Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7c082325091ee7bfcf0e1e8b488b1e9fa66f0739 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Bug #52861: unset fails with ArrayObject and deep arrays Bugs: https://bugs.php.net/52861 Changed paths: MM NEWS MM ext/spl/spl_array.c Diff: diff --cc NEWS index 0c4d786,57bae92..5fea27a --- a/NEWS +++ b/NEWS @@@ -27,37 -6,22 +27,39 @@@ PH . Fixed bug #64264 (SPLFixedArray toArray problem). (Laruence) . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS). (patch by kr...@krizalys.com, Laruence) - . Fixed bug #52861 (unset fails with ArrayObject and deep arrays). + . Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended). +(Nikita Popov) ++ . Fixed bug #52861 (unset fails with ArrayObject and deep arrays). + (Mike Willbanks) -21 Feb 2013, PHP 5.3.22 +- SNMP: + . Fixed bug #64124 (IPv6 malformed). (Boris Lytochkin) -- Zend Engine: - . Fixed bug #64099 (Wrong TSRM usage in zend_Register_class alias). (Johannes) - . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence) +?? ??? 2012, PHP 5.4.12 -- Core +- Core: + . Fixed bug #64099 (Wrong TSRM usage in zend_Register_class alias). (Johannes) + . Fixed bug #64011 (get_html_translation_table() output incomplete with +HTML_ENTITIES and ISO-8859-1). (Gustavo) + . Fixed bug #63982 (isset() inconsistently produces a fatal error on +protected property). (Stas) . Fixed bug #63943 (Bad warning text from strpos() on empty needle). (Laruence) + . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence) + . Fixed bug #63893 (Poor efficiency of strtr() using array with keys of very +different length). (Gustavo) + . Fixed bug #63882 (zend_std_compare_objects crash on recursion). (Dmitry) + . Fixed bug #63462 (Magic methods called twice for unset protected +properties). (Stas) + . Fixed bug #62524 (fopen follows redirects for non-3xx statuses). +(Wes Mason) + . Support BITMAPV5HEADER in getimagesize(). (AsamK, Lars) - Date: - . Fixed bug #55397 (comparsion of incomplete DateTime causes SIGSEGV). -(Laruence, Derick) + . Fixed bug #63699 (Performance improvements for various ext/date functions). +(Lars, original patch by njaguar at gmail dot com) + . Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV. +(Derick) - FPM: . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/spl/spl_fixedarray.c
Commit:d24ac6953ec8ca147243363eeacc8772d265b6cc Author:Xinchen Hui larue...@php.net Sun, 24 Feb 2013 12:58:39 +0800 Parents: 064c62e4cf078cf08a40478dfe0e64bd51789e57 1b58bd39a637e9ec4ea9e95903b74aefdbd1b596 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d24ac6953ec8ca147243363eeacc8772d265b6cc Log: Merge branch 'PHP-5.3' into PHP-5.4 Conflicts: ext/spl/spl_fixedarray.c Changed paths: MM NEWS MM ext/spl/spl_fixedarray.c Diff: diff --cc NEWS index d8df7b6,a298c55..0c4d786 --- a/NEWS +++ b/NEWS @@@ -1,62 -1,25 +1,63 @@@ PHP NEWS ||| -?? ??? 2013, PHP 5.3.23 +?? ??? 2012, PHP 5.4.13 + +- Core: + . Fixed bug #64235 (Insteadof not work for class method in 5.4.11). +(Laruence) + . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell) + . Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi) + . Fixed bug #64070 (Inheritance with Traits failed with error). (Dmitry) + +- CLI server: + . Fixed bug #64128 (buit-in web server is broken on ppc64). (Remi) + +- Mbstring: + . mb_split() can now handle empty matches like preg_split() does. (Moriyoshi) + +- OpenSSL: + . Fixed bug #61930 (openssl corrupts ssl key resource when using +openssl_get_publickey()). (Stas) + +- PDO_mysql: + . Fixed bug #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs). +(Johannes) - SPL: + . Fixed bug #64264 (SPLFixedArray toArray problem). (Laruence) . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS). (patch by kr...@krizalys.com, Laruence) + . Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended). +(Nikita Popov) -21 Feb 2013, PHP 5.3.22 +- SNMP: + . Fixed bug #64124 (IPv6 malformed). (Boris Lytochkin) -- Zend Engine: - . Fixed bug #64099 (Wrong TSRM usage in zend_Register_class alias). (Johannes) - . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence) +?? ??? 2012, PHP 5.4.12 -- Core +- Core: + . Fixed bug #64099 (Wrong TSRM usage in zend_Register_class alias). (Johannes) + . Fixed bug #64011 (get_html_translation_table() output incomplete with +HTML_ENTITIES and ISO-8859-1). (Gustavo) + . Fixed bug #63982 (isset() inconsistently produces a fatal error on +protected property). (Stas) . Fixed bug #63943 (Bad warning text from strpos() on empty needle). (Laruence) + . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence) + . Fixed bug #63893 (Poor efficiency of strtr() using array with keys of very +different length). (Gustavo) + . Fixed bug #63882 (zend_std_compare_objects crash on recursion). (Dmitry) + . Fixed bug #63462 (Magic methods called twice for unset protected +properties). (Stas) + . Fixed bug #62524 (fopen follows redirects for non-3xx statuses). +(Wes Mason) + . Support BITMAPV5HEADER in getimagesize(). (AsamK, Lars) - Date: - . Fixed bug #55397 (comparsion of incomplete DateTime causes SIGSEGV). -(Laruence, Derick) + . Fixed bug #63699 (Performance improvements for various ext/date functions). +(Lars, original patch by njaguar at gmail dot com) + . Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV. +(Derick) - FPM: . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/phar/stream.c
Commit:b5d267aa95aec1e89dc34f0bcc3c46576354cd26 Author:Dmitry Stogov dmi...@zend.com Thu, 21 Feb 2013 15:57:26 +0400 Parents: c16d6befd429a2e55c266b6e8df7fe2f93f68c91 7b113d789df26b2ad560e747cac0b1ed2043adec Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b5d267aa95aec1e89dc34f0bcc3c46576354cd26 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: PHAR should modify entry timestamp when it's modified Changed paths: MM ext/phar/stream.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/libxml/libxml.c ext/libxml/php_libxml.h ext/soap/php_xml.c
Commit:c737b89473df9dba6742b8fc8fbf6d009bf05c36
Author:Dmitry Stogov dmi...@zend.com Wed, 20 Feb 2013 22:27:41
+0400
Parents: 021f57ef0e21868f6bbef34c4b1a1a2bf5461159
8e76d0404b7f664ee6719fd98f0483f0ac4669d6
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=c737b89473df9dba6742b8fc8fbf6d009bf05c36
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed external entity loading
Conflicts:
ext/libxml/libxml.c
ext/libxml/php_libxml.h
Changed paths:
MM ext/libxml/libxml.c
MM ext/libxml/php_libxml.h
MM ext/soap/php_xml.c
Diff:
diff --cc ext/libxml/libxml.c
index 0f1c2bb,920a90c..b1cb45d
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@@ -269,20 -261,9 +269,21 @@@ static PHP_GINIT_FUNCTION(libxml
libxml_globals-stream_context = NULL;
libxml_globals-error_buffer.c = NULL;
libxml_globals-error_list = NULL;
+ libxml_globals-entity_loader.fci.size = 0;
+ libxml_globals-entity_loader_disabled = 0;
}
+static void _php_libxml_destroy_fci(zend_fcall_info *fci)
+{
+ if (fci-size 0) {
+ zval_ptr_dtor(fci-function_name);
+ if (fci-object_ptr != NULL) {
+ zval_ptr_dtor(fci-object_ptr);
+ }
+ fci-size = 0;
+ }
+}
+
/* Channel libxml file io layer through the PHP streams subsystem.
* This allows use of ftps:// and https:// urls */
diff --cc ext/libxml/php_libxml.h
index 8b9acc0,a7d8466..04f8b49
--- a/ext/libxml/php_libxml.h
+++ b/ext/libxml/php_libxml.h
@@@ -43,10 -43,7 +43,11 @@@ ZEND_BEGIN_MODULE_GLOBALS(libxml
zval *stream_context;
smart_str error_buffer;
zend_llist *error_list;
+ struct _php_libxml_entity_resolver {
+ zend_fcall_info fci;
+ zend_fcall_info_cache fcc;
+ } entity_loader;
+ zend_bool entity_loader_disabled;
ZEND_END_MODULE_GLOBALS(libxml)
typedef struct _libxml_doc_props {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/soap/php_xml.c
Commit:4b900f483153b849167c4f45a81b5b882274a2a2 Author:Dmitry Stogov dmi...@zend.com Wed, 13 Feb 2013 22:07:21 +0400 Parents: 050aae2860e1c202e2e9db715beaa97d0a4c9c33 188c196d4da60bdde9190d2fc532650d17f7af2d Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4b900f483153b849167c4f45a81b5b882274a2a2 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Proper bit reset code Changed paths: MM ext/soap/php_xml.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/soap/soap.c
Commit:702b436ef470cc02f8e2cc21f2fadeee42103c74
Author:Dmitry Stogov dmi...@zend.com Thu, 7 Feb 2013 13:10:04
+0400
Parents: e7ce002c01945438fc3d4e10356f7e3241240deb
cc4c318b0c71e1a9c9cf803b5ee5d437344d64db
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=702b436ef470cc02f8e2cc21f2fadeee42103c74
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Check if soap.wsdl_cache_dir confirms to open_basedir
Changed paths:
MM ext/soap/soap.c
Diff:
diff --cc ext/soap/soap.c
index 13f163a,6851a9b..7df84e5
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@@ -479,6 -568,40 +479,36 @@@ ZEND_INI_MH(OnUpdateCacheMode
return SUCCESS;
}
+ static PHP_INI_MH(OnUpdateCacheDir)
+ {
- /* Only do the safemode/open_basedir check at runtime */
++ /* Only do the open_basedir check at runtime */
+ if (stage == PHP_INI_STAGE_RUNTIME || stage == PHP_INI_STAGE_HTACCESS) {
+ char *p;
+
+ if (memchr(new_value, '\0', new_value_length) != NULL) {
+ return FAILURE;
+ }
+
+ /* we do not use zend_memrchr() since path can contain ; itself
*/
+ if ((p = strchr(new_value, ';'))) {
+ char *p2;
+ p++;
+ if ((p2 = strchr(p, ';'))) {
+ p = p2 + 1;
+ }
+ } else {
+ p = new_value;
+ }
+
- if (PG(safe_mode) *p (!php_checkuid(p, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
- return FAILURE;
- }
-
+ if (PG(open_basedir) *p php_check_open_basedir(p
TSRMLS_CC)) {
+ return FAILURE;
+ }
+ }
+
+ OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2,
mh_arg3, stage TSRMLS_CC);
+ return SUCCESS;
+ }
+
PHP_INI_BEGIN()
STD_PHP_INI_ENTRY(soap.wsdl_cache_enabled, 1, PHP_INI_ALL,
OnUpdateBool,
cache_enabled, zend_soap_globals, soap_globals)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/soap/php_xml.c
Commit:1a18e84822cf7d9196961052e38cde9404de86e7 Author:Dmitry Stogov dmi...@zend.com Thu, 7 Feb 2013 16:09:12 +0400 Parents: 702b436ef470cc02f8e2cc21f2fadeee42103c74 afe98b7829d50806559acac9b530acb8283c3bf4 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a18e84822cf7d9196961052e38cde9404de86e7 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Disabled external entities loading Changed paths: MM ext/soap/php_xml.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/spl/spl_array.c ext/spl/spl_fixedarray.c
Commit:bb4d11b405ae1f37a8b0e4db630e80c5678f0746 Author:Nikita Popov ni...@php.net Wed, 30 Jan 2013 20:25:59 +0100 Parents: 31468401b790e439734cb2ac8de928adaad74a85 321f4f18e52bfabe19fb9217dff0bf661d48e5d3 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bb4d11b405ae1f37a8b0e4db630e80c5678f0746 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/spl/spl_array.c MM ext/spl/spl_fixedarray.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_API.h
Commit:1433854681d8cd37803873b2f891a8d60d77cc3c Author:Johannes Schlüter johan...@php.net Tue, 29 Jan 2013 19:49:43 +0100 Parents: 264279439b5707ecbc21ad06c8f48d3ffd6bd862 ec53b60072799704a0d94cdd935bdf54bd5e5344 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1433854681d8cd37803873b2f891a8d60d77cc3c Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM Zend/zend_API.h Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS Zend/zend_object_handlers.c
Commit:9e7c2e5906d1ec943afe7f6a0daf613a36ba2137 Author:Stanislav Malyshev s...@php.net Fri, 18 Jan 2013 13:32:43 -0800 Parents: b69fd9c9b8052b1ae2442f03b09be615146fc6c5 33b104c778c5c0e5446671397aaddd66efa4a7bc Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9e7c2e5906d1ec943afe7f6a0daf613a36ba2137 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: fix bug #63462 (Magic methods called twice for unset protected properties) Bugs: https://bugs.php.net/63462 Changed paths: MM NEWS MM Zend/zend_object_handlers.c Diff: diff --cc NEWS index 81e01cc,d753d28..21892b7 --- a/NEWS +++ b/NEWS @@@ -1,65 -1,19 +1,67 @@@ PHP NEWS ||| -?? ??? 2013, PHP 5.3.23 +?? ??? 2012, PHP 5.4.12 -?? ??? 2013, PHP 5.3.22 - -- Zend Engine: +- Core: + . Fixed bug #64011 (get_html_translation_table() output incomplete with +HTML_ENTITIES and ISO-8859-1). (Gustavo) + . Fixed bug #63982 (isset() inconsistently produces a fatal error on +protected property). (Stas) + . Fixed bug #63943 (Bad warning text from strpos() on empty needle). +(Laruence) . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence) - . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user). -(Johannes) + . Fixed bug #63893 (Poor efficiency of strtr() using array with keys of very +different length). (Gustavo) + . Fixed bug #63882 (zend_std_compare_objects crash on recursion). (Dmitry) + . Fixed bug #63462 (Magic methods called twice for unset protected + properties). (Stas) + . Support BITMAPV5HEADER in getimagesize(). (AsamK, Lars) -- Core - . Fixed bug #63943 (Bad warning text from strpos() on empty needle). -(Laruence) +- Date: + . Fixed bug #63699 (Performance improvements for various ext/date functions). +(Lars, original patch by njaguar at gmail dot com) + . Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV. +(Derick) + +- FPM: + . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam) + +- Litespeed: + . Fixed bug #63228 (-Werror=format-security error in lsapi code). (George) + +- ext/sqlite3: + . Fixed bug #63921 (sqlite3::bindvalue and relative PHP functions aren't +using sqlite3_*_int64 API). (srgoogleguy, Lars) + +- PDO_OCI + . Fixed bug #57702 (Multi-row BLOB fetches). (hswong3i, Laruence) + . Fixed bug #52958 (Segfault in PDO_OCI on cleanup after running a long +testsuite). (hswong3i, Lars) + +- PDO_sqlite: + . Fixed bug #63916 (PDO::PARAM_INT casts to 32bit int internally even +on 64bit builds in pdo_sqlite). (srgoogleguy, Lars) + - ?? ??? 2012, PHP 5.4.11 ++17 Jan 2012, PHP 5.4.11 + +- Core: + . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user). +(Johannes) + . Fixed bug #43177 (Errors in eval()'ed code produce status code 500). +(Todd Ruth, Stas). + +- Filter: + . Fixed bug #63757 (getenv() produces memory leak with CGI SAPI). (Dmitry) + . Fixed bug #54096 (FILTER_VALIDATE_INT does not accept +0 and -0). +(martin at divbyzero dot net, Lars) + +- JSON: + . Fixed bug #63737 (json_decode does not properly decode with options +parameter). (Adam) + +- CLI server + . Update list of common mime types. Added webm, ogv, ogg. (Lars, +pascalc at gmail dot com) - cURL extension: . Fixed bug (segfault due to libcurl connection caching). (Pierrick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/standard/file.c
Commit:b1bf524140f3825d161c6e8f922b696d91b93969 Author:Adam Harvey ahar...@php.net Tue, 15 Jan 2013 17:35:34 +0800 Parents: 374ebc87416d9e31efd961a3176510e3a901355b c077074c1379b5faed386106fdbb53f5d17fd6e7 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b1bf524140f3825d161c6e8f922b696d91b93969 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Revert Update fputcsv() to escape all characters equally. Changed paths: MM NEWS MM ext/standard/file.c Diff: diff --cc NEWS index 5f45667,e78af23..8201ce1 --- a/NEWS +++ b/NEWS @@@ -1,58 -1,17 +1,56 @@@ PHP NEWS ||| -?? ??? 2013, PHP 5.3.23 +?? ??? 2012, PHP 5.4.12 -?? ??? 2013, PHP 5.3.22 - -- Zend Engine: +- Core: + . Fixed bug #63982 (isset() inconsistently produces a fatal error on +protected property). (Stas) + . Fixed bug #63943 (Bad warning text from strpos() on empty needle). +(Laruence) . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence) + . Fixed bug #63882 (zend_std_compare_objects crash on recursion). (Dmitry) - . Fixed bug #43225 (fputcsv incorrectly handles cells ending in \ followed - by ). (Adam) + . Support BITMAPV5HEADER in getimagesize(). (AsamK, Lars) + +- Date: + . Fixed bug #63699 (Performance improvements for various ext/date functions). +(Lars, original patch by njaguar at gmail dot com) + . Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV. +(Derick) + +- Litespeed: + . Fixed bug #63228 (-Werror=format-security error in lsapi code). (George) + +- ext/sqlite3: + . Fixed bug #63921 (sqlite3::bindvalue and relative PHP functions aren't +using sqlite3_*_int64 API). (srgoogleguy, Lars) + +- PDO_sqlite: + . Fixed bug #63916 (PDO::PARAM_INT casts to 32bit int internally even +on 64bit builds in pdo_sqlite). (srgoogleguy, Lars) + . Fixed bug #57702 (Multi-row BLOB fetches). (hswong3i, Laruence) + . Fixed bug #52958 (Segfault in PDO_OCI on cleanup after running a long +testsuite). (hswong3i, Lars) + +?? ??? 2012, PHP 5.4.11 + +- Core: . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user). (Johannes) + . Fixed bug #43177 (Errors in eval()'ed code produce status code 500). +(Todd Ruth, Stas). -- Core - . Fixed bug #63943 (Bad warning text from strpos() on empty needle). -(Laruence) +- Filter: + . Fixed bug #63757 (getenv() produces memory leak with CGI SAPI). (Dmitry) + . Fixed bug #54096 (FILTER_VALIDATE_INT does not accept +0 and -0). +(martin at divbyzero dot net, Lars) + +- JSON: + . Fixed bug #63737 (json_decode does not properly decode with options +parameter). (Adam) + +- CLI server + . Update list of common mime types. Added webm, ogv, ogg. (Lars, +pascalc at gmail dot com) - cURL extension: . Fixed bug (segfault due to libcurl connection caching). (Pierrick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS
Commit:142c40f32c075a8eb706f2e630b934f39e711b70 Author:Adam Harvey ahar...@php.net Wed, 16 Jan 2013 10:18:00 +0800 Parents: 9498cf6194496a1dd6b400e3e9a85ff005dc3dcd f63a9f6c11c05aa76158b6cae0e05340d303a6af Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=142c40f32c075a8eb706f2e630b934f39e711b70 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Update the arguments in the prototype of fpm_socket_unix_test_connect(). Changed paths: MM NEWS Diff: diff --cc NEWS index bcff155,928d829..8fc3d6c --- a/NEWS +++ b/NEWS @@@ -1,58 -1,17 +1,61 @@@ PHP NEWS ||| -?? ??? 2013, PHP 5.3.23 +?? ??? 2012, PHP 5.4.12 -?? ??? 2013, PHP 5.3.22 - -- Zend Engine: +- Core: + . Fixed bug #63982 (isset() inconsistently produces a fatal error on +protected property). (Stas) + . Fixed bug #63943 (Bad warning text from strpos() on empty needle). +(Laruence) . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence) + . Fixed bug #63893 (Poor efficiency of strtr() using array with keys of very +different length). (Gustavo) + . Fixed bug #63882 (zend_std_compare_objects crash on recursion). (Dmitry) + . Support BITMAPV5HEADER in getimagesize(). (AsamK, Lars) + +- Date: + . Fixed bug #63699 (Performance improvements for various ext/date functions). +(Lars, original patch by njaguar at gmail dot com) + . Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV. +(Derick) + ++- FPM: ++ . Fixed bug #63999 (php with fpm fails to build on Solaris 10 or 11). (Adam) ++ +- Litespeed: + . Fixed bug #63228 (-Werror=format-security error in lsapi code). (George) + +- ext/sqlite3: + . Fixed bug #63921 (sqlite3::bindvalue and relative PHP functions aren't +using sqlite3_*_int64 API). (srgoogleguy, Lars) + +- PDO_sqlite: + . Fixed bug #63916 (PDO::PARAM_INT casts to 32bit int internally even +on 64bit builds in pdo_sqlite). (srgoogleguy, Lars) + . Fixed bug #57702 (Multi-row BLOB fetches). (hswong3i, Laruence) + . Fixed bug #52958 (Segfault in PDO_OCI on cleanup after running a long +testsuite). (hswong3i, Lars) + +?? ??? 2012, PHP 5.4.11 + +- Core: . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user). (Johannes) + . Fixed bug #43177 (Errors in eval()'ed code produce status code 500). +(Todd Ruth, Stas). -- Core - . Fixed bug #63943 (Bad warning text from strpos() on empty needle). -(Laruence) +- Filter: + . Fixed bug #63757 (getenv() produces memory leak with CGI SAPI). (Dmitry) + . Fixed bug #54096 (FILTER_VALIDATE_INT does not accept +0 and -0). +(martin at divbyzero dot net, Lars) + +- JSON: + . Fixed bug #63737 (json_decode does not properly decode with options +parameter). (Adam) + +- CLI server + . Update list of common mime types. Added webm, ogv, ogg. (Lars, +pascalc at gmail dot com) - cURL extension: . Fixed bug (segfault due to libcurl connection caching). (Pierrick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/standard/file.c
Commit:a4191b0aad94fb7bebb8fd5c4233006849845c31 Author:Adam Harvey ahar...@php.net Tue, 15 Jan 2013 15:24:21 +0800 Parents: 6a065876b9212404daaf8fee1708834da83dac56 9b5cb0e8059b1e8bec096067491ed8d75f878938 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a4191b0aad94fb7bebb8fd5c4233006849845c31 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Update fputcsv() to escape all characters equally. Changed paths: MM NEWS MM ext/standard/file.c Diff: diff --cc NEWS index 58a50bb,a7c2fa4..14ee211 --- a/NEWS +++ b/NEWS @@@ -1,31 -1,10 +1,33 @@@ PHP NEWS ||| -?? ??? 2013, PHP 5.3.23 +?? ??? 2012, PHP 5.4.12 -?? ??? 2013, PHP 5.3.22 +- Core: + . Fixed bug #63982 (isset() inconsistently produces a fatal error on +protected property). (Stas) + . Fixed bug #63943 (Bad warning text from strpos() on empty needle). +(Laruence) + . Fixed bug #63882 (zend_std_compare_objects crash on recursion). (Dmitry) ++ . Fixed bug #43225 (fputcsv incorrectly handles cells ending in \ followed ++by ). (Adam) + . Support BITMAPV5HEADER in getimagesize(). (AsamK, Lars) -- Zend Engine: +- Litespeed: + . Fixed bug #63228 (-Werror=format-security error in lsapi code). (George) + +- ext/sqlite3: + . Fixed bug #63921 (sqlite3::bindvalue and relative PHP functions aren't +using sqlite3_*_int64 API). (srgoogleguy, Lars) + +- PDO_sqlite: + . Fixed bug #63916 (PDO::PARAM_INT casts to 32bit int internally even +on 64bit builds in pdo_sqlite). (srgoogleguy, Lars) + . Fixed bug #52958 (Segfault in PDO_OCI on cleanup after running a long +testsuite) (hswong3i, Lars) + +?? ??? 2012, PHP 5.4.11 + +- Core: . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence) . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user). (Johannes) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_compile.c Zend/zend_language_parser.y
Commit:625000ab442dd4c1bfc6975a4a979f2c5f60a78d
Author:Dmitry Stogov dmi...@zend.com Wed, 9 Jan 2013 17:36:44
+0400
Parents: f9e8678dd3a41ed8a100d8201153a41d6fd25f2e
d4650c5d69ffb49d476a2969c6200879bd424caf
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=625000ab442dd4c1bfc6975a4a979f2c5f60a78d
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed compilator bug that might cause jump depended on unitialized value
Changed paths:
MM Zend/zend_compile.c
MM Zend/zend_language_parser.y
Diff:
diff --cc Zend/zend_compile.c
index 9acdc5b,8382b48..8f4f9c4
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -4912,28 -3527,12 +4913,28 @@@ void zend_do_end_class_declaration(cons
}
}
- ce-line_end = zend_get_compiled_lineno(TSRMLS_C);
+ ce-info.user.line_end = zend_get_compiled_lineno(TSRMLS_C);
+
+ /* Check for traits and proceed like with interfaces.
+ * The only difference will be a combined handling of them in the end.
+ * Thus, we need another opcode here. */
+ if (ce-num_traits 0) {
+ zend_op *opline;
+
+ ce-traits = NULL;
+ ce-num_traits = 0;
+ ce-ce_flags |= ZEND_ACC_IMPLEMENT_TRAITS;
+
+ /* opcode generation: */
+ opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+ opline-opcode = ZEND_BIND_TRAITS;
+ SET_NODE(opline-op1, CG(implementing_class));
+ }
if (!(ce-ce_flags
(ZEND_ACC_INTERFACE|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS))
-((parent_token-op_type != IS_UNUSED) || (ce-num_interfaces
0))) {
+(parent_token || (ce-num_interfaces 0))) {
zend_verify_abstract_class(ce TSRMLS_CC);
- if (ce-num_interfaces) {
+ if (ce-num_interfaces !(ce-ce_flags
ZEND_ACC_IMPLEMENT_TRAITS)) {
do_verify_abstract_class(TSRMLS_C);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/mysqlnd/mysqlnd.c
Commit:6a6ec195acb0a67b8728dd32fad5c82b37b31192
Author:Andrey Hristov and...@php.net Wed, 9 Jan 2013 18:27:50
+0100
Parents: 625000ab442dd4c1bfc6975a4a979f2c5f60a78d
12e759c2eaafbf85ef8595e4c2ed0711a25091ef
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=6a6ec195acb0a67b8728dd32fad5c82b37b31192
Log:
Merge branch 'PHP-5.3' into PHP-5.4
Changed paths:
MM ext/mysqlnd/mysqlnd.c
Diff:
diff --cc ext/mysqlnd/mysqlnd.c
index 9e40846,20bab91..3483d86
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@@ -772,8 -688,11 +772,10 @@@ MYSQLND_METHOD(mysqlnd_conn_data, conne
goto err;
}
/* we allow load data local infile by default */
- mysql_flags |= CLIENT_LOCAL_FILES | CLIENT_PS_MULTI_RESULTS;
mysql_flags |= MYSQLND_CAPABILITIES;
+ mysql_flags |= conn-options.flags; /* use the flags from
set_client_option() */
+
if (db) {
mysql_flags |= CLIENT_CONNECT_WITH_DB;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/string.c
Commit:15aaa9c6605b9ee5dfd568a13704f36a721433a0 Author:Xinchen Hui larue...@php.net Wed, 9 Jan 2013 10:54:23 +0800 Parents: 6e684e6a6ceac89ad51f822493f702a6925a2d37 c05ee74e7ff28b49018bf3e8f452bfd5386d1b68 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=15aaa9c6605b9ee5dfd568a13704f36a721433a0 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/standard/string.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/proc_open.c
Commit:a71e91626a3a72d360c285d0c78a16dbac6a0840 Author:Pierre Joye pierre@gmail.com Mon, 7 Jan 2013 13:04:04 +0100 Parents: 954e7a3b3ca115b619b1b326ae4ae31a7cf196db c0fae054c92cf73e5f7a7c32d624e43afabfd8e0 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a71e91626a3a72d360c285d0c78a16dbac6a0840 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: - fix the fix for bug #50524 Bugs: https://bugs.php.net/50524 Changed paths: MM ext/standard/proc_open.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/date/php_date.c
Commit:ba35ae32b7e9858e6590a616c4d5c2f0020cc7ab Author:Derick Rethans git...@derickrethans.nl Sun, 6 Jan 2013 15:07:13 + Parents: d7da1aa694a9a29ca7ec772e5d51d96b6dc8dda0 ff9c1b12ff9c9533367d0d6200eb39189ad0124c Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ba35ae32b7e9858e6590a616c4d5c2f0020cc7ab Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/date/php_date.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/mysqlnd/mysqlnd.c ext/mysqlnd/mysqlnd.h ext/mysqlnd/mysqlnd_charset.c ext/mysqlnd/mysqlnd_charset.h ext/mysqlnd/mysqlnd_debug.c ext/mysq
Commit:c2f8e9050439a2987d18a8ec4c060805ddc0dc8a Author:Xinchen Hui larue...@php.net Sun, 6 Jan 2013 10:20:00 +0800 Parents: 2feea39a3320d100bae8a1193aba9022726a24ea bc11e6fdbbafbd0969fc47fa087c2245317cd31f Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c2f8e9050439a2987d18a8ec4c060805ddc0dc8a Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/mysqlnd/mysqlnd.c MM ext/mysqlnd/mysqlnd.h MM ext/mysqlnd/mysqlnd_charset.c MM ext/mysqlnd/mysqlnd_charset.h MM ext/mysqlnd/mysqlnd_debug.c MM ext/mysqlnd/mysqlnd_debug.h MM ext/mysqlnd/mysqlnd_enum_n_def.h MM ext/mysqlnd/mysqlnd_loaddata.c MM ext/mysqlnd/mysqlnd_net.c MM ext/mysqlnd/mysqlnd_net.h MM ext/mysqlnd/mysqlnd_priv.h MM ext/mysqlnd/mysqlnd_ps.c MM ext/mysqlnd/mysqlnd_ps_codec.c MM ext/mysqlnd/mysqlnd_result.c MM ext/mysqlnd/mysqlnd_result.h MM ext/mysqlnd/mysqlnd_result_meta.c MM ext/mysqlnd/mysqlnd_result_meta.h MM ext/mysqlnd/mysqlnd_statistics.c MM ext/mysqlnd/mysqlnd_statistics.h MM ext/mysqlnd/mysqlnd_structs.h MM ext/mysqlnd/mysqlnd_wireprotocol.c MM ext/mysqlnd/mysqlnd_wireprotocol.h MM ext/mysqlnd/php_mysqlnd.c MM ext/mysqlnd/php_mysqlnd.h MM ext/phar/func_interceptors.c MM ext/phar/phar.c MM ext/phar/phar_internal.h MM ext/phar/phar_object.c MM ext/phar/phar_path_check.c MM ext/phar/stream.c MM ext/phar/util.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_compile.c
Commit:aff5d084a5c1a8efeeb81d1fc9c5e56692543a0b Author:Xinchen Hui larue...@php.net Fri, 4 Jan 2013 11:03:52 +0800 Parents: 5894aa09503eb700b1779d0d6c41b3e2ae698722 c3e6de2227f0200b9db318e181603ffba7991489 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aff5d084a5c1a8efeeb81d1fc9c5e56692543a0b Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM Zend/zend_compile.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/tests/file/bug52820.phpt
Hi, Laruence, why didn't you merged your commits related to bug 63377 from the 5.3 branch upwards? Pierrick: it seems that you tried to merge the fix to the bug63377 test which isn't present in the 5.4 branch. Even if the bug isn't present in the new output buffer code it would be nice imo if we would add the test to the 5.4, 5.5 and master branches so we can catch regressions, etc. On Fri, Dec 21, 2012 at 6:24 PM, Pierrick Charron pierr...@php.net wrote: Commit:59a4514dc0e8950ce210036332cc64c414fdcc22 Author:Pierrick Charron pierr...@php.net Fri, 21 Dec 2012 12:24:52 -0500 Parents: 763bce0303b3afd19d109d96c37d6d33a899e990 63659ce52678500ec024f1146ebf30e70624b935 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=59a4514dc0e8950ce210036332cc64c414fdcc22 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fix test to work on every libcurl version - Fixed typo on SKIPIF (causing make test to abort on some systems) Conflicts: tests/output/bug63377.phpt Bugs: https://bugs.php.net/63377 Changed paths: MM ext/standard/tests/file/bug52820.phpt Diff: diff --cc ext/standard/tests/file/bug52820.phpt index 8a1e7cc,19d0e9e..91976b0 --- a/ext/standard/tests/file/bug52820.phpt +++ b/ext/standard/tests/file/bug52820.phpt @@@ -50,22 -42,8 +50,22 @@@ About to rewind memory stream (close after): About to rewind! * About to connect() to 127.0.0.1 port 37349%r.*%r - * Trying 127.0.0.1... * Connection refused - * couldn't connect to host + * Trying 127.0.0.1...%A* Connection refused + * couldn't connect to host%S * Closing connection #0 +temp stream (leak): +About to rewind! +* About to connect() to 127.0.0.1 port 37349%r.*%r - * Trying 127.0.0.1... * Connection refused - * couldn't connect to host ++* Trying 127.0.0.1...%A* Connection refused ++* couldn't connect to host%S +* Closing connection #0 + +memory stream (leak): +About to rewind! +* About to connect() to 127.0.0.1 port 37349%r.*%r - * Trying 127.0.0.1... * Connection refused - * couldn't connect to host ++* Trying 127.0.0.1...%A* Connection refused ++* couldn't connect to host%S +* Closing connection #0 + Done. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Ferenc Kovács @Tyr43l - http://tyrael.hu
Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/tests/file/bug52820.phpt
Hi On 23 December 2012 12:47, Ferenc Kovacs tyr...@gmail.com wrote: Hi, Laruence, why didn't you merged your commits related to bug 63377 from the 5.3 branch upwards? His commit was I think merged, what you're seeing in this merge is only commit 56d9edbbb93 which was a typo corrected by Felipe. Pierrick: it seems that you tried to merge the fix to the bug63377 test which isn't present in the 5.4 branch. It's only git who tried to merge the 56d9edbbb93 commit into 5.4 since it wasn't merged before. Because the file doesn't exists in 5.4, git made a conflict that I had to resolve by just saying that the file don't exists and that it was normal. Even if the bug isn't present in the new output buffer code it would be nice imo if we would add the test to the 5.4, 5.5 and master branches so we can catch regressions, etc. Agree On Fri, Dec 21, 2012 at 6:24 PM, Pierrick Charron pierr...@php.net wrote: Commit:59a4514dc0e8950ce210036332cc64c414fdcc22 Author:Pierrick Charron pierr...@php.net Fri, 21 Dec 2012 12:24:52 -0500 Parents: 763bce0303b3afd19d109d96c37d6d33a899e990 63659ce52678500ec024f1146ebf30e70624b935 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=59a4514dc0e8950ce210036332cc64c414fdcc22 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fix test to work on every libcurl version - Fixed typo on SKIPIF (causing make test to abort on some systems) Conflicts: tests/output/bug63377.phpt Bugs: https://bugs.php.net/63377 Changed paths: MM ext/standard/tests/file/bug52820.phpt Diff: diff --cc ext/standard/tests/file/bug52820.phpt index 8a1e7cc,19d0e9e..91976b0 --- a/ext/standard/tests/file/bug52820.phpt +++ b/ext/standard/tests/file/bug52820.phpt @@@ -50,22 -42,8 +50,22 @@@ About to rewind memory stream (close after): About to rewind! * About to connect() to 127.0.0.1 port 37349%r.*%r - * Trying 127.0.0.1... * Connection refused - * couldn't connect to host + * Trying 127.0.0.1...%A* Connection refused + * couldn't connect to host%S * Closing connection #0 +temp stream (leak): +About to rewind! +* About to connect() to 127.0.0.1 port 37349%r.*%r - * Trying 127.0.0.1... * Connection refused - * couldn't connect to host ++* Trying 127.0.0.1...%A* Connection refused ++* couldn't connect to host%S +* Closing connection #0 + +memory stream (leak): +About to rewind! +* About to connect() to 127.0.0.1 port 37349%r.*%r - * Trying 127.0.0.1... * Connection refused - * couldn't connect to host ++* Trying 127.0.0.1...%A* Connection refused ++* couldn't connect to host%S +* Closing connection #0 + Done. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Ferenc Kovács @Tyr43l - http://tyrael.hu -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/tests/file/bug52820.phpt
On Sun, Dec 23, 2012 at 7:21 PM, Pierrick Charron pierr...@php.net wrote: His commit was I think merged, what you're seeing in this merge is If it was merged then why is the testfile missing (causing your merge conflict)? -- Ferenc Kovács @Tyr43l - http://tyrael.hu
Re: [PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/tests/file/bug52820.phpt
When merging you can specify that a file don't need to be on the destination branch. That's probably what Laurence did :) Pierrick On 23 December 2012 14:22, Ferenc Kovacs tyr...@gmail.com wrote: On Sun, Dec 23, 2012 at 7:21 PM, Pierrick Charron pierr...@php.net wrote: His commit was I think merged, what you're seeing in this merge is If it was merged then why is the testfile missing (causing your merge conflict)? -- Ferenc Kovács @Tyr43l - http://tyrael.hu -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/curl/interface.c
Commit:b10a3b9466b77bccf7e9a6e6207df2de1a997855 Author:Pierrick Charron pierr...@php.net Sat, 22 Dec 2012 19:04:45 -0500 Parents: 5499c7d201ad22f551dfc370ae09132acf4f75ec a2b6d9c1047a4e5f3419ebc3489a66d62aa12d07 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b10a3b9466b77bccf7e9a6e6207df2de1a997855 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed segfault due to libcurl connection caching Changed paths: MM ext/curl/interface.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/tests/file/bug52820.phpt
Commit:59a4514dc0e8950ce210036332cc64c414fdcc22 Author:Pierrick Charron pierr...@php.net Fri, 21 Dec 2012 12:24:52 -0500 Parents: 763bce0303b3afd19d109d96c37d6d33a899e990 63659ce52678500ec024f1146ebf30e70624b935 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=59a4514dc0e8950ce210036332cc64c414fdcc22 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fix test to work on every libcurl version - Fixed typo on SKIPIF (causing make test to abort on some systems) Conflicts: tests/output/bug63377.phpt Bugs: https://bugs.php.net/63377 Changed paths: MM ext/standard/tests/file/bug52820.phpt Diff: diff --cc ext/standard/tests/file/bug52820.phpt index 8a1e7cc,19d0e9e..91976b0 --- a/ext/standard/tests/file/bug52820.phpt +++ b/ext/standard/tests/file/bug52820.phpt @@@ -50,22 -42,8 +50,22 @@@ About to rewind memory stream (close after): About to rewind! * About to connect() to 127.0.0.1 port 37349%r.*%r - * Trying 127.0.0.1... * Connection refused - * couldn't connect to host + * Trying 127.0.0.1...%A* Connection refused + * couldn't connect to host%S * Closing connection #0 +temp stream (leak): +About to rewind! +* About to connect() to 127.0.0.1 port 37349%r.*%r - * Trying 127.0.0.1... * Connection refused - * couldn't connect to host ++* Trying 127.0.0.1...%A* Connection refused ++* couldn't connect to host%S +* Closing connection #0 + +memory stream (leak): +About to rewind! +* About to connect() to 127.0.0.1 port 37349%r.*%r - * Trying 127.0.0.1... * Connection refused - * couldn't connect to host ++* Trying 127.0.0.1...%A* Connection refused ++* couldn't connect to host%S +* Closing connection #0 + Done. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/curl/interface.c ext/curl/streams.c
Commit:5499c7d201ad22f551dfc370ae09132acf4f75ec
Author:Pierrick Charron pierr...@php.net Fri, 21 Dec 2012
19:24:28 -0500
Parents: 59a4514dc0e8950ce210036332cc64c414fdcc22
1c553eba196b823439e69f003e63afd6d202d582
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=5499c7d201ad22f551dfc370ae09132acf4f75ec
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Update NEWS file
Fixed bug #63352 (Can't enable hostname validation when using curl stream
wrappers)
CURL = 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)
Conflicts:
ext/curl/interface.c
ext/curl/tests/bug63363.phpt
Bugs:
https://bugs.php.net/63352
https://bugs.php.net/63363
Changed paths:
MM NEWS
MM ext/curl/interface.c
MM ext/curl/streams.c
Diff:
diff --cc NEWS
index 81bc7a6,8dcd896..3d860b1
--- a/NEWS
+++ b/NEWS
@@@ -1,19 -1,16 +1,23 @@@
PHP
NEWS
|||
-?? ??? 2013, PHP 5.3.21
+?? ??? 2012, PHP 5.4.11
-- Zend Engine:
- . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user).
-(Johannes)
+- Filter:
+ . Fixed bug #63757 (getenv() produces memory leak with CGI SAPI). (Dmitry)
+
+- JSON:
+ . Fixed bug #63737 (json_decode does not properly decode with options
+parameter). (Adam)
+
+- CLI server
+ . Update list of common mime types. Added webm, ogv, ogg. (Lars,
+pascalc at gmail dot com)
- cURL extension:
+ . Fixed bug #63795 (CURL = 7.28.0 no longer support value 1 for
+ CURLOPT_SSL_VERIFYHOST). (Pierrick)
+ . Fixed bug #63352 (Can't enable hostname validation when using curl stream
+ wrappers). (Pierrick)
. Fixed bug #55438 (Curlwapper is not sending http header randomly).
(php...@lostreality.org, Pierrick)
diff --cc ext/curl/interface.c
index dbe4896,9ac89c5..1106037
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@@ -1683,10 -1679,15 +1683,16 @@@ static int _php_curl_setopt(php_curl *c
CURLcode error=CURLE_OK;
switch (option) {
+ /* Long options */
case CURLOPT_SSL_VERIFYHOST:
- if(Z_TYPE_PP(zvalue)==IS_BOOL Z_BVAL_PP(zvalue)) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
CURLOPT_SSL_VERIFYHOST set to true which disables common name validation
(setting CURLOPT_SSL_VERIFYHOST to 2 enables common name validation));
+ if(Z_BVAL_PP(zvalue) == 1) {
+ #if LIBCURL_VERSION_NUM = 0x071c00 /* 7.28.0 */
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
CURLOPT_SSL_VERIFYHOST with value 1 is deprecated and will be removed as of
libcurl 7.28.1. It is recommended to use value 2 instead);
+ #else
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
CURLOPT_SSL_VERIFYHOST no longer accepts the value 1, value 2 will be used
instead);
+ error = curl_easy_setopt(ch-cp, option, 2);
+ break;
+ #endif
}
case CURLOPT_INFILESIZE:
case CURLOPT_VERBOSE:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/curl/streams.c
Commit:66b88c92bb7796b65f2f1da4b04ef91c0ce7a850 Author:Pierrick Charron pierr...@php.net Wed, 19 Dec 2012 19:44:08 -0500 Parents: 59692de77facceada2dd19167c4706c0c2a80ba2 c46e1cdcae70254cfc0b7d5781f2c71162a3734d Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=66b88c92bb7796b65f2f1da4b04ef91c0ce7a850 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug #55438 (Curlwapper is not sending http header randomly) Bugs: https://bugs.php.net/55438 Changed paths: MM NEWS MM ext/curl/streams.c Diff: diff --cc NEWS index 2a8660e,bb3a7df..81bc7a6 --- a/NEWS +++ b/NEWS @@@ -1,25 -1,20 +1,29 @@@ PHP NEWS ||| -?? ??? 2013, PHP 5.3.21 +?? ??? 2012, PHP 5.4.11 -- Zend Engine: - . Fixed bug #63762 (Sigsegv when Exception::$trace is changed by user). -(Johannes) +- Filter: + . Fixed bug #63757 (getenv() produces memory leak with CGI SAPI). (Dmitry) + +- JSON: + . Fixed bug #63737 (json_decode does not properly decode with options +parameter). (Adam) + +- CLI server + . Update list of common mime types. Added webm, ogv, ogg. (Lars, +pascalc at gmail dot com) + - cURL extension: + . Fixed bug #55438 (Curlwapper is not sending http header randomly). + (php...@lostreality.org, Pierrick) + -20 Dec 2012, PHP 5.3.20 +?? ??? 2012, PHP 5.4.10 -- Zend Engine: +- Core: + . Fixed bug #63726 (Memleak with static properties and internal/user +classes). (Laruence) . Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry) - . Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes + . Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes from value). (Pierrick) . Fixed bug #63468 (wrong called method as callback with inheritance). (Laruence) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/spl/spl_observer.c
Commit:1f516510b77eade91e56de4f64183ea44d0cde0f Author:Xinchen Hui larue...@php.net Thu, 13 Dec 2012 10:44:56 +0800 Parents: 2d1694d4ebd51ab61f12e6bc545a17e3baf3b4a0 39a3007ab2f88d860beb524024ab97fb13110561 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1f516510b77eade91e56de4f64183ea44d0cde0f Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/spl/spl_observer.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/date/php_date.c
Commit:92a5e4def0c9e6e12a5641aa041cac5bbee71646
Author:Remi Collet r...@php.net Sat, 1 Dec 2012 10:24:02 +0100
Parents: 35f636019dbc969fd33dace041814b7b8d2ae3bf
c2554b4bb43700ae16db34d9706db1db85ec78a4
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=92a5e4def0c9e6e12a5641aa041cac5bbee71646
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
Bugs:
https://bugs.php.net/63435
Changed paths:
MM ext/date/php_date.c
Diff:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS Zend/zend_gc.c
Commit:f877d7fee6efe6457e665e60f99fc2f524d26d52
Author:Dmitry Stogov dmi...@zend.com Thu, 29 Nov 2012 12:38:34
+0400
Parents: c37d7a9456ff12fc60654a2b33aadedfcf6e7476
92e2f2938115d2cdae185848d535380fb7694598
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=f877d7fee6efe6457e665e60f99fc2f524d26d52
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #63635 (Segfault in gc_collect_cycles)
Conflicts:
NEWS
Bugs:
https://bugs.php.net/63635
Changed paths:
MM NEWS
MM Zend/zend_gc.c
Diff:
diff --cc NEWS
index 79b4f28,09b9995..20ef5e3
--- a/NEWS
+++ b/NEWS
@@@ -1,24 -1,24 +1,25 @@@
PHP
NEWS
|||
-?? ??? 2012, PHP 5.3.20
+?? ??? 2012, PHP 5.4.10
-- Zend Engine:
+- Core:
+ . Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry)
- . Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes
-from value). (Pierrick)
. Fixed bug #63468 (wrong called method as callback with inheritance).
(Laruence)
+ . Fixed bug #61272 (ob_start callback gets passed empty string).
+(Mike, casper at langemeijer dot eu)
-- Core:
- . Fixed bug #63451 (config.guess file does not have AIX 7 defined,
-shared objects are not created). (kemcline at au1 dot ibm dot com)
+- Imap:
+ . Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array (Remi)
-- Apache2 Handler SAPI:
- . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
+- Json:
+ . Fixed bug #63588 use php_next_utf8_char and remove duplicate
+implementation. (Remi)
+
+- mysqli:
+ . Fixed bug #63361 missing header. (Remi)
- Fileinfo:
- . Fixed bug #63248 (Load multiple magic files from a directory under
Windows).
-(Anatoliy)
. Fixed bug #63590 (Different results in TS and NTS under Windows).
(Anatoliy)
diff --cc Zend/zend_gc.c
index 84a99c1,2b27de8..e877eab
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@@ -644,37 -553,13 +644,38 @@@ tail_call
struct _store_object *obj =
EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].bucket.obj;
if (obj-buffered == (gc_root_buffer*)GC_WHITE) {
- GC_SET_BLACK(obj-buffered);
+ /* PURPLE instead of BLACK to prevent buffering
in nested gc calls */
+ GC_SET_PURPLE(obj-buffered);
if
(EXPECTED(EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(pz)].valid
- Z_OBJ_HANDLER_P(pz,
get_properties) != NULL)) {
- HashTable *props = Z_OBJPROP_P(pz);
- if(!props) {
+ (get_gc = Z_OBJ_HANDLER_P(pz,
get_gc)) != NULL)) {
+ int i, n;
+ zval **table, *zv;
+ HashTable *props = get_gc(pz, table,
n TSRMLS_CC);
+
+ if (!props) {
+ /* restore refcount and put
into list to free */
+ pz-refcount__gc++;
+ ((zval_gc_info*)pz)-u.next =
GC_G(zval_to_free);
+ GC_G(zval_to_free) =
(zval_gc_info*)pz;
+ }
+
+ while (n 0 !table[n-1]) n--;
+ for (i = 0; i n; i++) {
+ if (table[i]) {
+ zv = table[i];
+ if (Z_TYPE_P(zv) !=
IS_ARRAY || Z_ARRVAL_P(zv) != EG(symbol_table)) {
+
zv-refcount__gc++;
+ }
+ if (!props i == n -
1) {
+ pz = zv;
+ goto tail_call;
+ } else {
+
zval_collect_white(zv TSRMLS_CC);
+ }
+ }
+ }
+ if (!props) {
return;
}
p = props-pListHead;
@@@ -715,24 -599,13 +716,25 @@@ static void
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/soap/soap.c
Commit:7f7cff0bbbdda0626839e7f1aee40bcf9d6c9df5
Author:Dmitry Stogov dmi...@zend.com Thu, 29 Nov 2012 16:41:09
+0400
Parents: 1a09bf8023356c65a461076c6525749bdd005b58
dc2192c08766939700260128684255772ba4296f
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=7f7cff0bbbdda0626839e7f1aee40bcf9d6c9df5
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)
Conflicts:
NEWS
ext/soap/soap.c
Bugs:
https://bugs.php.net/63271
Changed paths:
MM NEWS
MM ext/soap/soap.c
Diff:
diff --cc NEWS
index e8ad77a,53f0112..2a4b66e
--- a/NEWS
+++ b/NEWS
@@@ -38,12 -31,13 +38,16 @@@ PH
- Reflection:
. Fixed Bug #63614 (Fatal error on Reflection). (Laruence)
+ - SOAP
+ . Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests).
+ (John Jawed, Dmitry)
+
-22 Nov 2012, PHP 5.3.19
+22 Nov 2012, PHP 5.4.9
-- Core
+- Core:
+ . Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence)
+ . Fixed bug #63369 ((un)serialize() leaves dangling pointers, causes
crashes).
+(Tony, Andrew Sitnikov)
. Fixed bug #63241 (PHP fails to open Windows deduplicated files).
(daniel dot stelter-gliese at innogames dot de)
. Fixed bug #62444 (Handle leak in is_readable on windows).
diff --cc ext/soap/soap.c
index abeab53,7576466..cd45ec6
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@@ -463,19 -548,10 +463,6 @@@ zend_module_entry soap_module_entry =
ZEND_GET_MODULE(soap)
#endif
- ZEND_INI_MH(OnUpdateCacheEnabled)
- {
- if (OnUpdateBool(entry, new_value, new_value_length, mh_arg1, mh_arg2,
mh_arg3, stage TSRMLS_CC) == FAILURE) {
- return FAILURE;
- }
- if (SOAP_GLOBAL(cache_enabled)) {
- SOAP_GLOBAL(cache) = SOAP_GLOBAL(cache_mode);
- } else {
- SOAP_GLOBAL(cache) = 0;
- }
- return SUCCESS;
- }
-
-#ifndef ZEND_ENGINE_2
-# define OnUpdateLong OnUpdateInt
-#endif
-
ZEND_INI_MH(OnUpdateCacheMode)
{
char *p;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/mysqli/mysqli_nonapi.c
Commit:b6898195674a26bf6588c284a6a2616bbaaa908f Author:Xinchen Hui larue...@php.net Fri, 30 Nov 2012 14:29:13 +0800 Parents: 7f7cff0bbbdda0626839e7f1aee40bcf9d6c9df5 40fabf68edd5524b9ce0cda925d6c7888d8441c3 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b6898195674a26bf6588c284a6a2616bbaaa908f Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM NEWS MM ext/mysqli/mysqli_nonapi.c Diff: diff --cc NEWS index 2a4b66e,68a88ed..383950e --- a/NEWS +++ b/NEWS @@@ -1,27 -1,24 +1,30 @@@ PHP NEWS ||| -?? ??? 2012, PHP 5.3.20 +?? ??? 2012, PHP 5.4.10 -- Zend Engine: +- Core: . Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry) - . Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes -from value). (Pierrick) . Fixed bug #63468 (wrong called method as callback with inheritance). (Laruence) + . Fixed bug #61557 (Crasher in tt-rss backend.php). +(i dot am dot jack dot mail at gmail dot com) + . Fixed bug #61272 (ob_start callback gets passed empty string). +(Mike, casper at langemeijer dot eu) -- Core: - . Fixed bug #63451 (config.guess file does not have AIX 7 defined, -shared objects are not created). (kemcline at au1 dot ibm dot com) +- Imap: + . Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array (Remi) -- Apache2 Handler SAPI: - . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy) +- Json: + . Fixed bug #63588 use php_next_utf8_char and remove duplicate +implementation. (Remi) + +- mysqli: + . Fixed bug #63361 missing header. (Remi) + ++- MySQLnd: ++ . Fixed bug #63398 (Segfault when polling closed link). (Laruence) + - Fileinfo: - . Fixed bug #63248 (Load multiple magic files from a directory under Windows). -(Anatoliy) . Fixed bug #63590 (Different results in TS and NTS under Windows). (Anatoliy) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/fileinfo/libmagic.patch ext/fileinfo/libmagic/apprentice.c ext/fileinfo/tests/finfo_open_error.phpt
Commit:d88017e992d03dc6909b1a1c120668b90f52ae39
Author:Anatoliy Belsky a...@php.net Tue, 27 Nov 2012 16:45:25
+0100
Parents: e0ad33c24aa874dd31053829414f45a9d95ad46a
e6b727d3b7eef06d8b7b6a4638a95e7a571d97b5
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=d88017e992d03dc6909b1a1c120668b90f52ae39
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under
Windows
Conflicts:
NEWS
ext/fileinfo/libmagic.patch
ext/fileinfo/tests/finfo_open_error-win32.phpt
Bugs:
https://bugs.php.net/63590
Changed paths:
MM NEWS
MM ext/fileinfo/libmagic.patch
MM ext/fileinfo/libmagic/apprentice.c
MM ext/fileinfo/tests/finfo_open_error.phpt
Diff:
diff --cc NEWS
index e587eb6,eb4238a..d5a63c9
--- a/NEWS
+++ b/NEWS
@@@ -6,22 -8,21 +6,26 @@@ PH
. Fixed bug #63468 (wrong called method as callback with inheritance).
(Laruence)
-- Core:
- . Fixed bug #63451 (config.guess file does not have AIX 7 defined,
-shared objects are not created). (kemcline at au1 dot ibm dot com)
+- Imap:
+ . Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array (Remi)
-- Apache2 Handler SAPI:
- . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
+- Json:
+ . Fixed bug #63588 use php_next_utf8_char and remove duplicate
+implementation. (Remi)
+
+- mysqli:
+ . Fixed bug #63361 missing header. (Remi)
+ - Fileinfo:
- . Fixed bug #63248 (Load multiple magic files from a directory under
Windows).
-(Anatoliy)
+ . Fixed bug #63590 (Different results in TS and NTS under Windows).
+ (Anatoliy)
+
-- Imap:
- . Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array (Remi)
+- Pdo_sqlite:
+ . Fixed Bug #63149 getColumnMeta should return the table name
+when system SQLite used. (Remi)
+
+- Apache2 Handler SAPI:
+ . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
- Reflection:
. Fixed Bug #63614 (Fatal error on Reflection). (Laruence)
diff --cc ext/fileinfo/libmagic.patch
index ecb178f,9be317b..ded9490
--- a/ext/fileinfo/libmagic.patch
+++ b/ext/fileinfo/libmagic.patch
@@@ -1,6 -1,6 +1,6 @@@
- diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
- --- libmagic.origin/apprentice.c Sat Dec 17 18:17:18 2011
- +++ libmagic/apprentice.c Tue Oct 16 10:21:49 2012
+ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
+ --- libmagic.orig/apprentice.cSat Dec 17 18:17:18 2011
-+++ libmagic/apprentice.c Tue Nov 27 16:25:57 2012
+ libmagic/apprentice.c Tue Nov 27 16:35:47 2012
@@ -29,6 +29,8 @@
* apprentice - make one pass through /etc/magic, learning its secrets.
*/
@@@ -269,11 -269,11 +269,11 @@@
+ size_t lineno = 0;
+
+ php_stream *stream;
+++
+++ TSRMLS_FETCH();
- FILE *f = fopen(ms-file = fn, r);
- if (f == NULL) {
--+ TSRMLS_FETCH();
--+
+#if PHP_API_VERSION 20100412
+ stream = php_stream_open_wrapper((char *)fn, rb,
REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
+#else
@@@ -765,7 -765,7 +765,7 @@@
if (strip) {
if ((p = strrchr(fn, '/')) != NULL)
- @@ -2370,14 +2406,14 @@
-@@ -2370,14 +2405,18 @@
++@@ -2370,14 +2406,18 @@
q++;
/* Compatibility with old code that looked in .mime */
if (ms-flags MAGIC_MIME) {
@@@ -784,7 -788,7 +788,7 @@@
/* Compatibility with old code that looked in .mime */
if (strstr(p, .mime) != NULL)
- @@ -2467,7 +2503,7 @@
-@@ -2467,7 +2506,7 @@
++@@ -2467,7 +2507,7 @@
m-offset = swap4((uint32_t)m-offset);
m-in_offset = swap4((uint32_t)m-in_offset);
m-lineno = swap4((uint32_t)m-lineno);
@@@ -2336,10 -2340,10 +2340,10 @@@ diff -u libmagic.orig/magic.h libmagic/
int magic_list(magic_t, const char *);
int magic_errno(magic_t);
- diff -u libmagic.origin/print.c libmagic/print.c
- --- libmagic.origin/print.c Tue Sep 20 17:28:09 2011
- +++ libmagic/print.c Tue Oct 16 10:13:39 2012
+ diff -u libmagic.orig/print.c libmagic/print.c
+ --- libmagic.orig/print.c Tue Sep 20 17:28:09 2011
-+++ libmagic/print.c Tue Nov 27 16:24:35 2012
-@@ -29,6 +29,9 @@
+ libmagic/print.c Tue Nov 27 16:34:56 2012
+@@ -29,12 +29,16 @@
* print.c - debugging printout routines
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/reflection/php_reflection.c
Commit:070239a19447c2737bc4fddbcce00c2e16f362d0 Author:Xinchen Hui larue...@php.net Tue, 27 Nov 2012 13:35:41 +0800 Parents: 7751a6882485de64365661f4e7918535c3992982 df3b9a1e0791803b1d9f9300d8f36dd981126bc7 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=070239a19447c2737bc4fddbcce00c2e16f362d0 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM NEWS MM ext/reflection/php_reflection.c Diff: diff --cc NEWS index d55c467,dc1b8a1..e587eb6 --- a/NEWS +++ b/NEWS @@@ -6,29 -8,27 +6,32 @@@ PH . Fixed bug #63468 (wrong called method as callback with inheritance). (Laruence) -- Core: - . Fixed bug #63451 (config.guess file does not have AIX 7 defined, -shared objects are not created). (kemcline at au1 dot ibm dot com) +- Imap: + . Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array (Remi) -- Apache2 Handler SAPI: - . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy) +- Json: + . Fixed bug #63588 use php_next_utf8_char and remove duplicate +implementation. (Remi) -- Fileinfo: - . Fixed bug #63248 (Load multiple magic files from a directory under Windows). -(Anatoliy) +- mysqli: + . Fixed bug #63361 missing header. (Remi) -- Imap: - . Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array (Remi) +- Pdo_sqlite: + . Fixed Bug #63149 getColumnMeta should return the table name +when system SQLite used. (Remi) + +- Apache2 Handler SAPI: + . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy) + - Reflection: + . Fixed Bug #63614 (Fatal error on Reflection). (Laruence) + +22 Nov 2012, PHP 5.4.9 -22 Nov 2012, PHP 5.3.19 - -- Core +- Core: + . Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence) + . Fixed bug #63369 ((un)serialize() leaves dangling pointers, causes crashes). +(Tony, Andrew Sitnikov) . Fixed bug #63241 (PHP fails to open Windows deduplicated files). (daniel dot stelter-gliese at innogames dot de) . Fixed bug #62444 (Handle leak in is_readable on windows). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/imap/php_imap.c
Commit:7cd2f4b6a6a522c813fc93df00993b77cc43c3a2 Author:Remi Collet r...@php.net Sat, 24 Nov 2012 15:01:24 +0100 Parents: 9d8ed21bd52a730b6dde3a66e3ba544433b61a11 f55bed9dad0ffbec170b857c0b3b1b33426fe9d5 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7cd2f4b6a6a522c813fc93df00993b77cc43c3a2 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array Bugs: https://bugs.php.net/63126 Changed paths: MM ext/imap/php_imap.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS Zend/zend_API.c
Commit:111aa9fd2ecbfcc1d8048dca96932b3b954614bf Author:Dmitry Stogov dmi...@zend.com Tue, 20 Nov 2012 12:54:40 +0400 Parents: 75746d60b6e6a45512842e222429c127be58b733 396c1e990a0e513cf2e8510e9b6f82ab425c9e3a Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=111aa9fd2ecbfcc1d8048dca96932b3b954614bf Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug #63468 (wrong called method as callback with inheritance) Conflicts: NEWS Bugs: https://bugs.php.net/63468 Changed paths: MM NEWS MM Zend/zend_API.c Diff: diff --cc NEWS index 3672fe0,717a382..d02a8c9 --- a/NEWS +++ b/NEWS @@@ -1,11 -1,27 +1,13 @@@ PHP NEWS ||| -?? ??? 2ß12, PHP 5.3.20 +?? ??? 2012, PHP 5.4.9 -- Zend Engine: - . Fixed bug #63512 (parse_ini_file() with INI_SCANNER_RAW removes quotes -from value). (Pierrick) +- Core: + . Fixed bug #63468 (wrong called method as callback with inheritance). + (Laruence) -- Core: - . Fixed bug #63451 (config.guess file does not have AIX 7 defined, -shared objects are not created). (kemcline at au1 dot ibm dot com) -- Apache2 Handler SAPI: - . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy) - - -?? ??? 2012, PHP 5.3.19 - -! -ADD NEWS ONLY ABOVE IN 5.3.20 SECTION -! -RM will merge 5.3.19 entries when merging to release branch - -- Core + . Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence) + . Fixed bug #63369 ((un)serialize() leaves dangling pointers, causes crashes). +(Tony, Andrew Sitnikov) . Fixed bug #63241 (PHP fails to open Windows deduplicated files). (daniel dot stelter-gliese at innogames dot de) . Fixed bug #62444 (Handle leak in is_readable on windows). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_ini_scanner.c Zend/zend_ini_scanner_defs.h
Commit:99edb55e417aeb7e5a9eaad4eac68a9e074bfc0f
Author:Pierrick Charron pierr...@php.net Fri, 16 Nov 2012
18:24:42 -0500
Parents: 15ab75be8ad014c6fff5f2b908824ef18150a7ea
c886691100eb554c01f14b69bd142e21c84ae6f6
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=99edb55e417aeb7e5a9eaad4eac68a9e074bfc0f
Log:
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Regenerate Zend ini scanner
Conflicts:
Zend/zend_ini_scanner.c
Zend/zend_ini_scanner_defs.h
Changed paths:
MM Zend/zend_ini_scanner.c
MM Zend/zend_ini_scanner_defs.h
Diff:
diff --cc Zend/zend_ini_scanner.c
index 94c48c8,b713163..a481cbd
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.13.5 on Thu Jun 7 17:48:25 2012 */
-/* Generated by re2c 0.13.5 on Fri Nov 16 17:44:02 2012 */
++/* Generated by re2c 0.13.5 on Fri Nov 16 18:24:06 2012 */
#line 1 Zend/zend_ini_scanner.l
/*
+--+
diff --cc Zend/zend_ini_scanner_defs.h
index 0c04713,50a5aea..1fe4c0c
--- a/Zend/zend_ini_scanner_defs.h
+++ b/Zend/zend_ini_scanner_defs.h
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.13.5 on Thu Jun 7 17:48:25 2012 */
-/* Generated by re2c 0.13.5 on Fri Nov 16 17:44:02 2012 */
++/* Generated by re2c 0.13.5 on Fri Nov 16 18:24:06 2012 */
#line 3 Zend/zend_ini_scanner_defs.h
enum YYCONDTYPE {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: sapi/apache2handler/config.w32
Commit:117d2dd6882b906ecc92fffe0b627535a48cd0c6 Author:Anatoliy Belsky a...@php.net Tue, 13 Nov 2012 19:40:22 +0100 Parents: 4f36aeb1209d1521bcba912bdeb0d67a69df3af8 019bdff3951f415e2d5c44933da30a4669c628e8 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=117d2dd6882b906ecc92fffe0b627535a48cd0c6 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Enabled apache 2.4 handler build option Conflicts: sapi/apache2handler/config.w32 Changed paths: MM sapi/apache2handler/config.w32 Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/mbstring/mb_gpc.c
Commit:e222837f6eefa757619533266ed149ab5dd91940 Author:Xinchen Hui larue...@php.net Wed, 7 Nov 2012 17:08:34 +0800 Parents: 6ef09012aa2aed339109007c2caa3d0e42cbd4ee 7fcbe4d5467300a0acee78330a0cdc9d1cbf05ad Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e222837f6eefa757619533266ed149ab5dd91940 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/mbstring/mb_gpc.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS TSRM/tsrm_win32.c
Commit:153bfada90b0733943c31e9d7e2bee57c5e7bcac
Author:Xinchen Hui larue...@php.net Fri, 2 Nov 2012 18:54:27 +0800
Parents: 24e4af0b8f8ca86e26a6e536c3827ae3f33bfebc
3fe3029ecb9f121eb6f535970d5cd18ecc8373a6
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=153bfada90b0733943c31e9d7e2bee57c5e7bcac
Log:
Merge branch 'PHP-5.3' into PHP-5.4
Changed paths:
MM NEWS
MM TSRM/tsrm_win32.c
Diff:
diff --cc NEWS
index 503a9d5,2e1f13b..293dcb0
--- a/NEWS
+++ b/NEWS
@@@ -1,22 -1,13 +1,24 @@@
PHP
NEWS
|||
-?? ??? 2012, PHP 5.3.19
+?? ??? 2012, PHP 5.4.9
-- Core
+- Core:
+ . Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence)
+ . Fixed bug #63369 ((un)serialize() leaves dangling pointers, causes
crashes).
+(Tony, Andrew Sitnikov)
- . Fixed bug #63241 PHP fails to open Windows deduplicated files.
+ . Fixed bug #63241 (PHP fails to open Windows deduplicated files).
(daniel dot stelter-gliese at innogames dot de)
+ . Fixed bug #62444 (Handle leak in is_readable on windows).
+ (krazyest at seznam dot cz)
+- Curl:
+ . Fixed bug #63363 (Curl silently accepts boolean true for SSL_VERIFYHOST).
+Patch by John Jawed GitHub PR #221 (Anthony)
+
+- Fileinfo:
+ . Fixed bug #63248 (Load multiple magic files from a directory under
Windows).
+(Anatoliy)
+
- Libxml
. Fixed bug #63389 (Missing context check on libxml_set_streams_context()
causes memleak). (Laruence)
diff --cc TSRM/tsrm_win32.c
index b40af77,0332768..c33b599
--- a/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@@ -190,10 -190,10 +190,10 @@@ Finished
return NULL;
}
-TSRM_API int tsrm_win32_access(const char *pathname, int mode)
+TSRM_API int tsrm_win32_access(const char *pathname, int mode TSRMLS_DC)
{
time_t t;
- HANDLE thread_token;
+ HANDLE thread_token = NULL;
PSID token_sid;
SECURITY_INFORMATION sec_info = OWNER_SECURITY_INFORMATION |
GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;
GENERIC_MAPPING gen_map = { FILE_GENERIC_READ, FILE_GENERIC_WRITE,
FILE_GENERIC_EXECUTE, FILE_ALL_ACCESS };
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/mysqlnd/mysqlnd_wireprotocol.c
Commit:965bd32fec803c4ca20157c621ee663dccfaeb29 Author:Andrey Hristov and...@php.net Wed, 31 Oct 2012 18:29:31 +0100 Parents: 7886f46b560c51f235da35a33c8cd0e6479c9360 a17559d4224eea0148ad67de9bb1cca22cbef7f6 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=965bd32fec803c4ca20157c621ee663dccfaeb29 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/mysqlnd/mysqlnd_wireprotocol.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS TSRM/tsrm_virtual_cwd.c
Commit:24e4af0b8f8ca86e26a6e536c3827ae3f33bfebc Author:Anatoliy Belsky a...@php.net Wed, 31 Oct 2012 22:55:32 +0100 Parents: 965bd32fec803c4ca20157c621ee663dccfaeb29 a2e4404bc8155e6b6d9deefa22a172857d4b5e08 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=24e4af0b8f8ca86e26a6e536c3827ae3f33bfebc Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fixed bug #63241 PHP fails to open Windows deduplicated files. Bugs: https://bugs.php.net/63241 Changed paths: MM NEWS MM TSRM/tsrm_virtual_cwd.c Diff: diff --cc NEWS index 7a1438a,9b87011..503a9d5 --- a/NEWS +++ b/NEWS @@@ -1,20 -1,11 +1,22 @@@ PHP NEWS ||| -?? ??? 2012, PHP 5.3.19 +?? ??? 2012, PHP 5.4.9 -- Core +- Core: + . Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence) + . Fixed bug #63369 ((un)serialize() leaves dangling pointers, causes crashes). +(Tony, Andrew Sitnikov) + . Fixed bug #63241 PHP fails to open Windows deduplicated files. + (daniel dot stelter-gliese at innogames dot de) +- Curl: + . Fixed bug #63363 (Curl silently accepts boolean true for SSL_VERIFYHOST). +Patch by John Jawed GitHub PR #221 (Anthony) + +- Fileinfo: + . Fixed bug #63248 (Load multiple magic files from a directory under Windows). +(Anatoliy) + - Libxml . Fixed bug #63389 (Missing context check on libxml_set_streams_context() causes memleak). (Laruence) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/libxml/libxml.c
Commit:3342e7276c4d0ff0a8546c2f16eb706d6aadf185 Author:Xinchen Hui larue...@php.net Tue, 30 Oct 2012 11:09:53 +0800 Parents: 4c08ee069cc1e299f5cc09c198f97bad30293cb1 2f1c4064f8fd971166df3099729e74e0ecb5d6bc Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3342e7276c4d0ff0a8546c2f16eb706d6aadf185 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM NEWS MM ext/libxml/libxml.c Diff: diff --cc NEWS index d95f5f4,ba96950..74dab3c --- a/NEWS +++ b/NEWS @@@ -1,20 -1,14 +1,24 @@@ PHP NEWS ||| -?? ??? 2012, PHP 5.3.19 +?? ??? 2012, PHP 5.4.9 + +- Core: + . Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence) + . Fixed bug #63369 ((un)serialize() leaves dangling pointers, causes crashes). +(Tony, Andrew Sitnikov) + +- Curl: + . Fixed bug #63363 (Curl silently accepts boolean true for SSL_VERIFYHOST). +Patch by John Jawed GitHub PR #221 (Anthony) + +- Fileinfo: + . Fixed bug #63248 (Load multiple magic files from a directory under Windows). +(Anatoliy) + - Libxml + . Fixed bug #63389 (Missing context check on libxml_set_streams_context() + causes memleak). (Laruence) + -- MySQL: - . Fixed compilation failure on mixed 32/64 bit systems. (Andrey) - - OCI8: . Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro) (Chris Jones) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/pcre/php_pcre.c
Commit:54cef2bb6d4d0527ac161b900b0b475d2ce312fb Author:Xinchen Hui larue...@php.net Thu, 18 Oct 2012 17:32:48 +0800 Parents: 4d509708a454c736a2f15f1a4ec7567c26659086 8bd5e15ff7a57791956c4017ee8fb4a8ac0d8d2e Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=54cef2bb6d4d0527ac161b900b0b475d2ce312fb Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM NEWS MM ext/pcre/php_pcre.c Diff: diff --cc NEWS index eca6698,009f082..49980d1 --- a/NEWS +++ b/NEWS @@@ -1,29 -1,25 +1,33 @@@ PHP NEWS ||| -?? ??? 2012, PHP 5.3.19 +?? ??? 2012, PHP 5.4.9 -- MySQL: - . Fixed compilation failure on mixed 32/64 bit systems. (Andrey) +- Fileinfo: + . Fixed bug #63248 (Load multiple magic files from a directory under Windows). +(Anatoliy) + - PCRE: + . Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite). + (Dmitry, Laruence) + -- PDO: - . Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec). -(Martin Osvald, Remi) - -- Streams: - . Fixed bug #63240 (stream_get_line() return contains delimiter string). -(Tjerk, Gustavo) +?? ??? 2012, PHP 5.4.8 -18 Oct 2012, PHP 5.3.18 +- CLI server: + . Implemented FR #63242 (Default error page in PHP built-in web server uses +outdated html/css). (pascal.chev...@free.fr) + . Changed response to unknown HTTP method to 501 according to RFC. +(Niklas Lindgren). + . Support HTTP PATCH method. Patch by Niklas Lindgren, GitHub PR #190. +(Lars) - Core: + . Fixed bug #63219 (Segfault when aliasing trait method when autoloader +throws excpetion). (Laruence) + . Added optional second argument for assert() to specify custom message. Patch +by Lonny Kapelushnik (lo...@lonnylot.com). (Lars) + . Support building PHP with the native client toolchain. (Stuart Langley) + . Added --offline option for tests. (Remi) + . Fixed bug #63162 (parse_url does not match password component). (husman) . Fixed bug #63111 (is_callable() lies for abstract static method). (Dmitry) . Fixed bug #63093 (Segfault while load extension failed in zts-build). (Laruence) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_variables.c ext/pcre/php_pcre.c
Commit:1f8fd609b0a61cc4e7815f93a0932b11b697e3a4 Author:Xinchen Hui larue...@php.net Thu, 18 Oct 2012 20:11:32 +0800 Parents: 54cef2bb6d4d0527ac161b900b0b475d2ce312fb e88cdaa0143aacd2d765eb0560452ea28e327e41 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1f8fd609b0a61cc4e7815f93a0932b11b697e3a4 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM Zend/zend_variables.c MM ext/pcre/php_pcre.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/pcre/php_pcre.c
Commit:f1478bbf9d7cd312607e829a32ed5582e386adac Author:Xinchen Hui larue...@php.net Thu, 18 Oct 2012 20:13:36 +0800 Parents: 1f8fd609b0a61cc4e7815f93a0932b11b697e3a4 db2dc7a6a48982b8a483861a7fa1de0d634bc3a4 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f1478bbf9d7cd312607e829a32ed5582e386adac Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/pcre/php_pcre.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/mysql/config.m4
Commit:82fb5df380c726ab919355caf46c54207d0f1253 Author:Johannes Schlüter johan...@php.net Wed, 17 Oct 2012 18:26:27 +0200 Parents: 7aa3d0ae658d3eb386915311929c48ba300b8493 3899adb46feb7a2dbd8f976ee02218b994c9f9ad Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=82fb5df380c726ab919355caf46c54207d0f1253 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/mysql/config.m4 Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: main/streams/streams.c
Commit:f8e26d95f27779276a2dcf9d3aefb6b2b604ba63 Author:Gustavo Lopes glo...@nebm.ist.utl.pt Fri, 12 Oct 2012 20:24:13 +0200 Parents: 9eff1a217885d9ea4750bdabd9d6ba88b2565e21 76601c4fd1052bd46e8db4addb1bb9dd3b001f98 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f8e26d95f27779276a2dcf9d3aefb6b2b604ba63 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fix bug #63240 on stream_get_line() Bugs: https://bugs.php.net/63240 Changed paths: MM main/streams/streams.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/tests/array_type_hint_001.phpt Zend/tests/bug35655.phpt Zend/tests/bug39304.phpt Zend/tests/constants_005.phpt Zend/tests/multibyte/mul
Commit:e081c55fb50d5a088d93a15834e7ec8129097fb3 Author:Xinchen Hui larue...@php.net Wed, 10 Oct 2012 10:31:31 +0800 Parents: e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916 610c7fbe7b93498154b17e4e81018b72fa15ec45 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e081c55fb50d5a088d93a15834e7ec8129097fb3 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM Zend/tests/array_type_hint_001.phpt MM Zend/tests/bug35655.phpt MM Zend/tests/bug39304.phpt MM Zend/tests/constants_005.phpt MM Zend/tests/multibyte/multibyte_encoding_001.phpt MM Zend/tests/multibyte/multibyte_encoding_002.phpt MM Zend/tests/multibyte/multibyte_encoding_003.phpt MM ext/dom/tests/DOMAttr_value_basic_001.phpt MM ext/dom/tests/DOMCharacterData_data_error_002.phpt MM ext/dom/tests/DOMCharacterData_length_error_001.phpt MM ext/exif/tests/bug34704.phpt MM ext/mysql/tests/mysql_pconn_kill.phpt MM ext/phar/tests/019b.phpt MM ext/phar/tests/019c.phpt MM ext/phar/tests/028.phpt MM ext/phar/tests/rename_dir_and_mount.phpt MM ext/simplexml/tests/034.phpt MM ext/spl/tests/array_001.phpt MM ext/spl/tests/array_004.phpt MM ext/spl/tests/array_008.phpt MM ext/spl/tests/array_010.phpt MM ext/spl/tests/iterator_026.phpt MM ext/spl/tests/iterator_041b.phpt MM ext/spl/tests/iterator_044.phpt MM ext/spl/tests/iterator_047.phpt MM ext/spl/tests/iterator_050.phpt MM ext/spl/tests/iterator_052.phpt MM ext/spl/tests/iterator_054.phpt MM ext/spl/tests/spl_004.phpt MM ext/standard/tests/array/bug29253.phpt MM ext/standard/tests/file/glob_variation.phpt MM ext/standard/tests/file/stream_rfc2397_006.phpt MM ext/standard/tests/general_functions/getservbyname_variation10.phpt MM ext/standard/tests/general_functions/getservbyname_variation9.phpt MM ext/xml/tests/xml_closures_001.phpt MM tests/classes/array_access_010.phpt MM tests/classes/ctor_in_interface_01.phpt MM tests/classes/ctor_in_interface_02.phpt MM tests/classes/ctor_in_interface_03.phpt MM tests/classes/ctor_in_interface_04.phpt MM tests/classes/inheritance_003.phpt MM tests/classes/inheritance_004.phpt MM tests/classes/type_hinting_003.phpt MM tests/lang/bug29566.phpt MM tests/lang/bug35176.phpt diff --cc Zend/tests/array_type_hint_001.phpt index a676992,533319b..a676992 mode 100755,100644..100644 --- a/Zend/tests/array_type_hint_001.phpt +++ b/Zend/tests/array_type_hint_001.phpt diff --cc Zend/tests/bug35655.phpt index bbb1377,10d9c0c..bbb1377 mode 100755,100644..100644 --- a/Zend/tests/bug35655.phpt +++ b/Zend/tests/bug35655.phpt diff --cc Zend/tests/bug39304.phpt index 8303b82,0129d21..8303b82 mode 100755,100644..100644 --- a/Zend/tests/bug39304.phpt +++ b/Zend/tests/bug39304.phpt diff --cc Zend/tests/constants_005.phpt index d2a205b,55f90fd..d2a205b mode 100755,100644..100644 --- a/Zend/tests/constants_005.phpt +++ b/Zend/tests/constants_005.phpt diff --cc Zend/tests/multibyte/multibyte_encoding_001.phpt index 38aa80a,19b6064..38aa80a mode 100755,100644..100644 --- a/Zend/tests/multibyte/multibyte_encoding_001.phpt +++ b/Zend/tests/multibyte/multibyte_encoding_001.phpt diff --cc Zend/tests/multibyte/multibyte_encoding_002.phpt index 6e1ad80,813222d..6e1ad80 mode 100755,100644..100644 --- a/Zend/tests/multibyte/multibyte_encoding_002.phpt +++ b/Zend/tests/multibyte/multibyte_encoding_002.phpt diff --cc Zend/tests/multibyte/multibyte_encoding_003.phpt index 0f873dd,badfcc5..0f873dd mode 100755,100644..100644 Binary files differ diff --cc ext/dom/tests/DOMAttr_value_basic_001.phpt index 51c4ac9,40e00bc..51c4ac9 mode 100755,100644..100644 --- a/ext/dom/tests/DOMAttr_value_basic_001.phpt +++ b/ext/dom/tests/DOMAttr_value_basic_001.phpt diff --cc ext/dom/tests/DOMCharacterData_data_error_002.phpt index 401e0f2,9dae096..401e0f2 mode 100755,100644..100644 --- a/ext/dom/tests/DOMCharacterData_data_error_002.phpt +++ b/ext/dom/tests/DOMCharacterData_data_error_002.phpt diff --cc ext/dom/tests/DOMCharacterData_length_error_001.phpt index e8bf16a,0dda492..e8bf16a mode 100755,100644..100644 --- a/ext/dom/tests/DOMCharacterData_length_error_001.phpt +++ b/ext/dom/tests/DOMCharacterData_length_error_001.phpt diff --cc ext/exif/tests/bug34704.phpt index 7688ce8,b6b26de..7688ce8 mode 100755,100644..100644 --- a/ext/exif/tests/bug34704.phpt +++ b/ext/exif/tests/bug34704.phpt diff --cc ext/mysql/tests/mysql_pconn_kill.phpt index efef421,20dfbe9..efef421 mode 100755,100644..100644 --- a/ext/mysql/tests/mysql_pconn_kill.phpt +++ b/ext/mysql/tests/mysql_pconn_kill.phpt diff --cc ext/phar/tests/019b.phpt index 5a0ef71,22d193e..5a0ef71 mode 100755,100644..100644 --- a/ext/phar/tests/019b.phpt +++ b/ext/phar/tests/019b.phpt diff --cc ext/phar/tests/019c.phpt index 2cb508c,23afa26..2cb508c mode 100755,100644..100644 --- a/ext/phar/tests/019c.phpt +++ b/ext/phar/tests/019c.phpt diff --cc ext/phar/tests/028.phpt index 087f822,8cead29..087f822
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/phar/phar/pharcommand.inc ext/spl/examples/dbaarray.inc ext/spl/internal/regexiterator.inc
Commit:69a4301f6c235fb4535bdd31a9de5f730f07574d Author:Xinchen Hui larue...@php.net Wed, 10 Oct 2012 10:45:07 +0800 Parents: 45e938ec343ba566a3effd7a2247a00a08f683cd 1b9e0de2ccab0d6ae6f77b53b5c3a306ec154496 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=69a4301f6c235fb4535bdd31a9de5f730f07574d Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/phar/phar/pharcommand.inc MM ext/spl/examples/dbaarray.inc MM ext/spl/internal/regexiterator.inc Diff: diff --cc ext/phar/phar/pharcommand.inc index cb34367,9e96869..cb34367 mode 100755,100644..100644 --- a/ext/phar/phar/pharcommand.inc +++ b/ext/phar/phar/pharcommand.inc diff --cc ext/spl/examples/dbaarray.inc index d448ad7,fcd6bb3..d448ad7 mode 100755,100644..100644 --- a/ext/spl/examples/dbaarray.inc +++ b/ext/spl/examples/dbaarray.inc diff --cc ext/spl/internal/regexiterator.inc index c6addb9,96b8f81..c6addb9 mode 100755,100644..100644 --- a/ext/spl/internal/regexiterator.inc +++ b/ext/spl/internal/regexiterator.inc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS
Commit:931571260b28bec7c53e57803e03ee0c38e8595e Author:Xinchen Hui larue...@php.net Tue, 9 Oct 2012 13:14:31 +0800 Parents: 67611c67fa5a3b2c199d41ef7df3307308c56faa 45e0d452c5c369f0141fde780a6cbdd35d8f55b4 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=931571260b28bec7c53e57803e03ee0c38e8595e Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM NEWS Diff: diff --cc NEWS index fcd3bdd,46c9bf4..5938d98 --- a/NEWS +++ b/NEWS @@@ -53,10 -36,9 +53,14 @@@ PH . Fixed bug #62887 (Only /status?plainfull gives last request cpu). (fat) . Fixed bug #62216 (Add PID to php-fpm init.d script). (fat) -- Intl: - . Fix bug #62915 (defective cloning in several intl classes). (Gustavo) +- OpenSSL: + . Implemented FR #61421 (OpenSSL signature verification missing RMD160, +SHA224, SHA256, SHA384, SHA512). (Mark Jones) + ++- PDO: ++ . Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec). ++(Martin Osvald, Remi) + - SOAP . Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: Zend/zend_interfaces.c Zend/zend_interfaces.h Zend/zend_iterators.c ext/com_dotnet/com_persist.c ext/enchant/enchant.c ext/pcntl/pcntl.c ext
Commit:e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916 Author:Xinchen Hui larue...@php.net Tue, 9 Oct 2012 13:29:51 +0800 Parents: 931571260b28bec7c53e57803e03ee0c38e8595e 6284ef112ef870b791b8dfab36a39c4664744cc5 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916 Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM Zend/zend_interfaces.c MM Zend/zend_interfaces.h MM Zend/zend_iterators.c MM ext/com_dotnet/com_persist.c MM ext/enchant/enchant.c MM ext/pcntl/pcntl.c MM ext/pdo/pdo.c MM ext/pdo/pdo_dbh.c MM ext/pdo/pdo_stmt.c MM ext/pdo/php_pdo_driver.h MM ext/pdo_mysql/mysql_driver.c MM ext/pdo_mysql/mysql_statement.c MM ext/pdo_mysql/pdo_mysql.c MM ext/pdo_mysql/php_pdo_mysql_int.h MM ext/pdo_oci/oci_driver.c MM ext/pdo_odbc/pdo_odbc.c MM ext/spl/php_spl.c MM ext/spl/php_spl.h MM ext/spl/spl_array.c MM ext/spl/spl_directory.c MM ext/spl/spl_functions.c MM ext/spl/spl_functions.h MM ext/spl/spl_iterators.c MM ext/spl/spl_iterators.h MM ext/spl/spl_observer.c MM ext/standard/winver.h MM main/php_streams.h MM main/streams/glob_wrapper.c MM main/streams/streams.c Diff: diff --cc Zend/zend_interfaces.c index aee0d61,47dbe0b..aee0d61 mode 100755,100644..100644 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c diff --cc Zend/zend_interfaces.h index e3e3629,2b05bbd..e3e3629 mode 100755,100644..100644 --- a/Zend/zend_interfaces.h +++ b/Zend/zend_interfaces.h diff --cc Zend/zend_iterators.c index d0572b2,1c5ba32..d0572b2 mode 100755,100644..100644 --- a/Zend/zend_iterators.c +++ b/Zend/zend_iterators.c diff --cc ext/com_dotnet/com_persist.c index 7c035f6,fb94021..7c035f6 mode 100755,100644..100644 --- a/ext/com_dotnet/com_persist.c +++ b/ext/com_dotnet/com_persist.c diff --cc ext/enchant/enchant.c index 357f3cb,dcc39e2..357f3cb mode 100755,100644..100644 --- a/ext/enchant/enchant.c +++ b/ext/enchant/enchant.c diff --cc ext/pcntl/pcntl.c index 8647e10,b840066..8647e10 mode 100755,100644..100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c diff --cc ext/pdo/pdo.c index e0a1c3c,e1d8235..e0a1c3c mode 100755,100644..100644 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c diff --cc ext/pdo/pdo_dbh.c index acdc0dd,4035b2b..acdc0dd mode 100755,100644..100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c diff --cc ext/pdo/pdo_stmt.c index 31932eb,0cf0cf8..31932eb mode 100755,100644..100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c diff --cc ext/pdo/php_pdo_driver.h index b9c46ba,17b23a3..b9c46ba mode 100755,100644..100644 --- a/ext/pdo/php_pdo_driver.h +++ b/ext/pdo/php_pdo_driver.h diff --cc ext/pdo_mysql/mysql_driver.c index 5cf35b1,727357a..5cf35b1 mode 100755,100644..100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c diff --cc ext/pdo_mysql/mysql_statement.c index fc5ec51,115e74c..fc5ec51 mode 100755,100644..100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c diff --cc ext/pdo_mysql/pdo_mysql.c index ea69c3c,e8e215f..ea69c3c mode 100755,100644..100644 --- a/ext/pdo_mysql/pdo_mysql.c +++ b/ext/pdo_mysql/pdo_mysql.c diff --cc ext/pdo_mysql/php_pdo_mysql_int.h index 0b6d775,f8caa9f..0b6d775 mode 100755,100644..100644 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h diff --cc ext/pdo_oci/oci_driver.c index cb920ab,b3aa765..cb920ab mode 100755,100644..100644 --- a/ext/pdo_oci/oci_driver.c +++ b/ext/pdo_oci/oci_driver.c diff --cc ext/pdo_odbc/pdo_odbc.c index 72553c4,5c02f47..72553c4 mode 100755,100644..100644 --- a/ext/pdo_odbc/pdo_odbc.c +++ b/ext/pdo_odbc/pdo_odbc.c diff --cc ext/spl/php_spl.c index cd00866,e2bd7cf..cd00866 mode 100755,100644..100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c diff --cc ext/spl/php_spl.h index 855a78c,fb0765a..855a78c mode 100755,100644..100644 --- a/ext/spl/php_spl.h +++ b/ext/spl/php_spl.h diff --cc ext/spl/spl_array.c index 3c6b41e,11540de..3c6b41e mode 100755,100644..100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c diff --cc ext/spl/spl_directory.c index b86e686,8c1810e..b86e686 mode 100755,100644..100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c diff --cc ext/spl/spl_functions.c index b9fd5dc,3a3cdcc..b9fd5dc mode 100755,100644..100644 --- a/ext/spl/spl_functions.c +++ b/ext/spl/spl_functions.c diff --cc ext/spl/spl_functions.h index 394de6a,8cf98e5..394de6a mode 100755,100644..100644 --- a/ext/spl/spl_functions.h +++ b/ext/spl/spl_functions.h diff --cc ext/spl/spl_iterators.c index 098d7dc,a46b7d4..098d7dc mode 100755,100644..100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c diff --cc ext/spl/spl_iterators.h index 4a2c999,525a25c..4a2c999 mode 100755,100644..100644 --- a/ext/spl/spl_iterators.h +++ b/ext/spl/spl_iterators.h diff --cc ext/spl/spl_observer.c index 4b8be82,85bbeec..4b8be82 mode 100755,100644..100644 --- a/ext/spl/spl_observer.c +++
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/gd/gd.c
Commit:9a99426e802f554237658a5e8e8fe4c91ddf716a Author:Anatoliy Belsky a...@php.net Thu, 4 Oct 2012 18:21:07 +0200 Parents: 34eb787828d3ef7a773464ace6db40444dcef9a3 5d9fb8ffeb58d51c44f8a4b9f6b2eaabe271ce82 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9a99426e802f554237658a5e8e8fe4c91ddf716a Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: exposing the libxpm version in phpinfo Changed paths: MM ext/gd/gd.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/gd/config.w32
Commit:45351eaab4d8f065c5948de5f28df975b36d592c Author:Anatoliy Belsky a...@php.net Tue, 2 Oct 2012 09:40:42 +0200 Parents: 60a280936e52b3ab20f0ece06e80088a5bd8fd0c 0165eec1ea63d4b4a063d68e7b78947f038d67ba Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=45351eaab4d8f065c5948de5f28df975b36d592c Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: fixed include checks for libpng under win Changed paths: MM ext/gd/config.w32 Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/gd/config.w32
Commit:26e492f2f3d3e26f7320957172e37ee49f6e6112 Author:Anatoliy Belsky a...@php.net Tue, 2 Oct 2012 10:00:09 +0200 Parents: 45351eaab4d8f065c5948de5f28df975b36d592c 92a46fe07e4407d52eb384c48aec5a3538731341 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=26e492f2f3d3e26f7320957172e37ee49f6e6112 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: reverted the previous fix for libpng include Changed paths: MM ext/gd/config.w32 Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/var.c
Commit:60a280936e52b3ab20f0ece06e80088a5bd8fd0c Author:Xinchen Hui larue...@php.net Tue, 2 Oct 2012 00:30:49 +0800 Parents: 8e9805bb792c193377d2525667e18035ab5aad18 4f860a44126bf4cd87e7eb4eaa0ea4d44f96abc5 Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=60a280936e52b3ab20f0ece06e80088a5bd8fd0c Log: Merge branch 'PHP-5.3' into PHP-5.4 Changed paths: MM ext/standard/var.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/curl/streams.c
Commit:a2a82201277259a50f064c5b46983cf99e974198 Author:Pierrick Charron pierr...@php.net Fri, 28 Sep 2012 15:21:33 -0400 Parents: 34c3985979cb27cd1fff1ca767b3162357da7b0b 936553d666405bc783511979b17d78d51905b9cd Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a2a82201277259a50f064c5b46983cf99e974198 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: FD_ZERO file descriptors before calling curl_multi_fdset Changed paths: MM ext/curl/streams.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS
Commit:f495e9305716a6b2ce448e56cf463169b196d08c Author:Pierrick Charron pierr...@php.net Fri, 28 Sep 2012 15:28:37 -0400 Parents: a2a82201277259a50f064c5b46983cf99e974198 ec3619239025979977e4bbe0998e03eff0afacf4 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f495e9305716a6b2ce448e56cf463169b196d08c Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Update NEWS Changed paths: MM NEWS Diff: diff --cc NEWS index ca00e47,a050852..e8ad173 --- a/NEWS +++ b/NEWS @@@ -17,19 -8,17 +17,23 @@@ PH (Laruence) . Fixed bug #62976 (Notice: could not be converted to int when comparing some builtin classes). (Laruence) + . Fixed bug #62955 (Only one directive is loaded from Per Directory Values +Windows registry). (aserbulov at parallels dot com) + . Fixed bug #62907 (Double free when use traits). (Dmitry) . Fixed bug #61767 (Shutdown functions not called in certain error situation). (Dmitry) - . Fixed bug #61442 (exception threw in __autoload can not be catched). -(Laruence) . Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function). (Dmitry) + . Fixed bug #60723 (error_log error time has changed to UTC ignoring default +timezo). (Laruence) + - cURL: + . Fixed bug #62085 (file_get_contents a remote file by Curl wrapper will + cause cpu Soaring). (Pierrick) + +- DOM: + . Fixed bug #63015 (Incorrect arginfo for DOMErrorHandler). (Rob) + - FPM: . Fixed bug #62954 (startup problems fpm / php-fpm). (fat) . Fixed bug #62886 (PHP-FPM may segfault/hang on startup). (fat) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
