]>
granicus.if.org Git - php/log
Xinchen Hui [Sun, 14 Jun 2015 14:56:06 +0000 (22:56 +0800)]
Simplify the condition
Bob Weinand [Sun, 14 Jun 2015 13:46:11 +0000 (15:46 +0200)]
Revert "Revert "Expand optimizations regarding short-circuting a bit""
This reverts commit
3770a5ac666cdd4ff4803743232125948140450b .
Fixes the bug which probably made make install fail on travis
(It never happened to me that all tests passed, but make install failed...)
Anatol Belski [Sun, 14 Jun 2015 11:45:40 +0000 (13:45 +0200)]
update UPGRADING
Anatol Belski [Sun, 14 Jun 2015 10:54:19 +0000 (12:54 +0200)]
update UPGRADING
Xinchen Hui [Sun, 14 Jun 2015 06:27:48 +0000 (14:27 +0800)]
Revert "Expand optimizations regarding short-circuting a bit"
This break the CI (build error)
This reverts commit
3cfa58367b1b85d346d9be6cf9ae116c63571247 .
Xinchen Hui [Sun, 14 Jun 2015 05:44:39 +0000 (13:44 +0800)]
Fixed skipf
Xinchen Hui [Sun, 14 Jun 2015 04:28:40 +0000 (12:28 +0800)]
Fixed Bug #69823 (PHP 7.0.0alpha1 segmentation fault when exactly 33 extensions are loaded)
Bob Weinand [Sun, 14 Jun 2015 04:01:01 +0000 (06:01 +0200)]
Expand optimizations regarding short-circuting a bit
Bob Weinand [Sun, 14 Jun 2015 02:45:56 +0000 (04:45 +0200)]
Add ZEND_ASSERT_CHECK to phpdbg opcode jump list
Bob Weinand [Sun, 14 Jun 2015 00:00:55 +0000 (02:00 +0200)]
Fix short-circuting (bug #69825)
Anatol Belski [Sat, 13 Jun 2015 16:44:56 +0000 (18:44 +0200)]
Fix bug #69814 Enabling php_curl, php_mysqli, and php_openssl causes php-cgi to crash
Christoph M. Becker [Sat, 13 Jun 2015 14:44:52 +0000 (16:44 +0200)]
ext/mysql has been removed as of PHP 7.0.0
So remove all related settings from php.ini-*, and add a respective entry in
UPGRADING (strangly, this part of
fd1578c has been lost).
Matteo Beccati [Sat, 13 Jun 2015 06:08:30 +0000 (08:08 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix copy/paste error in test
Matteo Beccati [Sat, 13 Jun 2015 06:08:21 +0000 (08:08 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix copy/paste error in test
Matteo Beccati [Sat, 13 Jun 2015 06:07:49 +0000 (08:07 +0200)]
Fix copy/paste error in test
Xinchen Hui [Sat, 13 Jun 2015 03:05:05 +0000 (11:05 +0800)]
Revert "We are allowed to break ABI now..."
This reverts commit
30a8000ca11c719f1807c346908b3a4e8537dbbe .
Xinchen Hui [Sat, 13 Jun 2015 03:03:50 +0000 (11:03 +0800)]
We are allowed to break ABI now...
Xinchen Hui [Sat, 13 Jun 2015 02:56:30 +0000 (10:56 +0800)]
typo
Xinchen Hui [Sat, 13 Jun 2015 02:51:15 +0000 (10:51 +0800)]
Merge branch 'master' of git.php.net:php-src
Xinchen Hui [Sat, 13 Jun 2015 02:49:07 +0000 (10:49 +0800)]
Fixed Bug #69761 (Serialization of anonymous classes should be prevented)
And also cleanup anonymous class compiling, it make no sense prefix a
namespace to anonymous class name. and it is always lowcased and
interned string.
Anatol Belski [Fri, 12 Jun 2015 15:56:02 +0000 (17:56 +0200)]
Revert fix for bug #55407
See
8e19705a93d785cd1ff8ba3a69699b00169fea47 and discussion on
github. The suggestion is to target a proper solution in in 7.1.
Bob Weinand [Fri, 12 Jun 2015 15:26:41 +0000 (17:26 +0200)]
Cache the class_name typehint key in arg_info
This leads to up to 2% improvement on one tested real world application by not having to always recalculate the lowercased string and its hash
Anthony Ferrara [Fri, 12 Jun 2015 14:05:07 +0000 (10:05 -0400)]
Add line about scalar type declarations to UPGRADING
Xinchen Hui [Fri, 12 Jun 2015 13:07:23 +0000 (21:07 +0800)]
Fixed bug #69805 (null ptr deref and seg fault in zend_resolve_class_name)
Dmitry Stogov [Fri, 12 Jun 2015 10:33:14 +0000 (13:33 +0300)]
Get rid of more ZVAL_ZVAL() macros
Dmitry Stogov [Fri, 12 Jun 2015 09:33:23 +0000 (12:33 +0300)]
Avoid zval duplication in ZVAL_ZVAL() macro (it was necessary only in few places).
Switch from ZVAL_ZVAL() to simpler macros where possible (it makes sense to review remaining places)
Matteo Beccati [Fri, 12 Jun 2015 00:08:30 +0000 (02:08 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
Fixed bug #61574 - No MSI
Conflicts:
ext/pdo_pgsql/pgsql_statement.c
Matteo Beccati [Fri, 12 Jun 2015 00:07:02 +0000 (02:07 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
Fixed bug #61574 - No MSI
Conflicts:
ext/pdo_pgsql/pgsql_driver.c
Matteo Beccati [Thu, 11 Jun 2015 23:57:22 +0000 (01:57 +0200)]
Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
Matteo Beccati [Thu, 11 Jun 2015 22:27:31 +0000 (00:27 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
Fixed bug #61574 - No MSI
Conflicts:
ext/pdo_pgsql/pgsql_driver.c
win32/install.txt
Matteo Beccati [Thu, 11 Jun 2015 21:41:56 +0000 (23:41 +0200)]
Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
Matteo Beccati [Thu, 11 Jun 2015 21:41:56 +0000 (23:41 +0200)]
Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
Christoph M. Becker [Thu, 11 Jun 2015 21:58:34 +0000 (23:58 +0200)]
Merge branch 'master' of https://git.php.net/push/php-src
Christoph M. Becker [Thu, 11 Jun 2015 21:55:10 +0000 (23:55 +0200)]
Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6
Nikita Popov [Thu, 11 Jun 2015 17:41:43 +0000 (19:41 +0200)]
Make convert_to_* safe with rc>1
This only involves switching zval_dtor to zval_ptr_dtor for arrays
and making the convert_to_object for arrays a bit more generic.
All the other changes outside zend_operators.c just make use of
this new ability (use COPY instead of DUP).
What's still missing: Proper references handling. I've seen many
convert_to* calls that will break when a reference is used.
Also fixes bug #69788.
Christoph M. Becker [Tue, 9 Jun 2015 17:39:59 +0000 (19:39 +0200)]
Fixed bug #61574 - No MSI
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
Christoph M. Becker [Thu, 11 Jun 2015 20:44:14 +0000 (22:44 +0200)]
Fixed bug #61574 - No MSI
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
Christoph M. Becker [Thu, 11 Jun 2015 20:44:14 +0000 (22:44 +0200)]
Fixed bug #61574 - No MSI
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
Nikita Popov [Thu, 11 Jun 2015 20:20:12 +0000 (22:20 +0200)]
Merge branch 'PHP-5.6'
Nikita Popov [Thu, 11 Jun 2015 20:10:08 +0000 (22:10 +0200)]
Fixed bug #69803
Ferenc Kovacs [Thu, 11 Jun 2015 18:31:22 +0000 (20:31 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
this is in 5.6.10, not in 5.6.9
Ferenc Kovacs [Thu, 11 Jun 2015 18:30:56 +0000 (20:30 +0200)]
this is in 5.6.10, not in 5.6.9
Nikita Popov [Thu, 11 Jun 2015 15:44:51 +0000 (17:44 +0200)]
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_generators.c
Nikita Popov [Thu, 11 Jun 2015 15:40:10 +0000 (17:40 +0200)]
Fix bug #69740
Anatol Belski [Thu, 11 Jun 2015 15:07:24 +0000 (17:07 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
rework that test to allow delta for rounding errors
Anatol Belski [Thu, 11 Jun 2015 15:06:46 +0000 (17:06 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
rework that test to allow delta for rounding errors
Anatol Belski [Thu, 11 Jun 2015 15:05:03 +0000 (17:05 +0200)]
rework that test to allow delta for rounding errors
If this workout doesn't make travis happy, the patch needs to be
reviewed as the leak might still persist.
Anatol Belski [Thu, 11 Jun 2015 13:37:06 +0000 (15:37 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
improve test
Anatol Belski [Thu, 11 Jun 2015 13:36:30 +0000 (15:36 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
improve test
Anatol Belski [Thu, 11 Jun 2015 13:36:02 +0000 (15:36 +0200)]
improve test
Anatol Belski [Thu, 11 Jun 2015 10:08:09 +0000 (12:08 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
added test for bug #69646
Anatol Belski [Thu, 11 Jun 2015 10:07:32 +0000 (12:07 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
added test for bug #69646
Anatol Belski [Thu, 11 Jun 2015 10:06:59 +0000 (12:06 +0200)]
added test for bug #69646
Stanislav Malyshev [Thu, 11 Jun 2015 08:52:39 +0000 (01:52 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix bad copypaste
Stanislav Malyshev [Thu, 11 Jun 2015 08:52:23 +0000 (01:52 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix bad copypaste
Stanislav Malyshev [Thu, 11 Jun 2015 08:51:55 +0000 (01:51 -0700)]
fix bad copypaste
Xinchen Hui [Thu, 11 Jun 2015 05:35:43 +0000 (13:35 +0800)]
Fixed Bug #69796 mysqli_stmt::fetch doesn't assign null values to bound variables
Xinchen Hui [Thu, 11 Jun 2015 04:53:56 +0000 (12:53 +0800)]
Fixed internal class flag restore
Dmitry Stogov [Wed, 10 Jun 2015 22:57:37 +0000 (01:57 +0300)]
Compile-time constant folding
Ferenc Kovacs [Wed, 10 Jun 2015 22:14:39 +0000 (00:14 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
make it possible to set the re2c and yacc paths via environment variables for genfiles
Ferenc Kovacs [Wed, 10 Jun 2015 22:13:40 +0000 (00:13 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
make it possible to set the re2c and yacc paths via environment variables for genfiles
Ferenc Kovacs [Wed, 10 Jun 2015 22:13:08 +0000 (00:13 +0200)]
make it possible to set the re2c and yacc paths via environment variables for genfiles
Márcio Almada [Tue, 9 Jun 2015 06:56:34 +0000 (03:56 -0300)]
fix bad formatted "undefined offset" notice when key is negative
Dmitry Stogov [Wed, 10 Jun 2015 19:25:24 +0000 (22:25 +0300)]
Fetch operands of opceodes for binary operators in certain order (from left to right).
Anatol Belski [Wed, 10 Jun 2015 14:43:33 +0000 (16:43 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
fix memory leak in pdo_pgsql closeCursor (bug 69752)
Anatol Belski [Wed, 10 Jun 2015 14:42:52 +0000 (16:42 +0200)]
updated NEWS
Anatol Belski [Wed, 10 Jun 2015 14:41:33 +0000 (16:41 +0200)]
updated NEWS
Anatol Belski [Wed, 10 Jun 2015 14:41:07 +0000 (16:41 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
fix memory leak in pdo_pgsql closeCursor (bug 69752)
Anatol Belski [Wed, 10 Jun 2015 14:40:38 +0000 (16:40 +0200)]
updated NEWS
Philip Hofstetter [Wed, 3 Jun 2015 12:56:02 +0000 (14:56 +0200)]
fix memory leak in pdo_pgsql closeCursor (bug 69752)
the parent PDO closeCursor method resets the pdo_stmt_t's executed flag
which is used by the postgres driver as a flag to check whether to
allocate memory for the column data or not.
This means that after the parent closeCursor() has been called, the
pdo_pgsql driver will allocate a new buffer for the columns, so the
existing buffer should be freed when the cursor is being closed.
Anatol Belski [Wed, 10 Jun 2015 11:17:10 +0000 (13:17 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
regenerated the ini scanner
Anatol Belski [Wed, 10 Jun 2015 11:16:29 +0000 (13:16 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
regenerated the ini scanner
Anatol Belski [Wed, 10 Jun 2015 11:15:01 +0000 (13:15 +0200)]
regenerated the ini scanner
follow up fix for bug #69551
Anatol Belski [Wed, 10 Jun 2015 09:27:24 +0000 (11:27 +0200)]
updated NEWS
Anatol Belski [Wed, 10 Jun 2015 09:26:49 +0000 (11:26 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
Anatol Belski [Wed, 10 Jun 2015 09:26:00 +0000 (11:26 +0200)]
updated NEWS
Anatol Belski [Wed, 10 Jun 2015 09:25:21 +0000 (11:25 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
Anatol Belski [Wed, 10 Jun 2015 09:24:45 +0000 (11:24 +0200)]
updated NEWS
Christian Wenz [Tue, 9 Jun 2015 08:40:36 +0000 (10:40 +0200)]
Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
Christian Wenz [Tue, 9 Jun 2015 08:29:26 +0000 (10:29 +0200)]
Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
This reverts commit
4a05c81b85336b76d05017cc86372fbd04871e3f .
Christian Wenz [Tue, 9 Jun 2015 08:05:27 +0000 (10:05 +0200)]
Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
Anatol Belski [Wed, 10 Jun 2015 08:47:06 +0000 (10:47 +0200)]
updated NEWS
Anatol Belski [Wed, 10 Jun 2015 08:44:44 +0000 (10:44 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
made failing test more meaningful
added failing test
Anatol Belski [Wed, 10 Jun 2015 08:44:02 +0000 (10:44 +0200)]
updated NEWS
Anatol Belski [Wed, 10 Jun 2015 08:43:23 +0000 (10:43 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
made failing test more meaningful
added failing test
Anatol Belski [Wed, 10 Jun 2015 08:42:31 +0000 (10:42 +0200)]
updated NEWS
Christoph M. Becker [Thu, 4 Jun 2015 00:40:05 +0000 (02:40 +0200)]
fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
Christoph M. Becker [Thu, 4 Jun 2015 00:25:43 +0000 (02:25 +0200)]
made failing test more meaningful
Christoph M. Becker [Thu, 4 Jun 2015 00:16:25 +0000 (02:16 +0200)]
added failing test
Ferenc Kovacs [Wed, 10 Jun 2015 07:39:38 +0000 (09:39 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add missing NEWS entries
add missing NEWS entries
Ferenc Kovacs [Wed, 10 Jun 2015 07:37:00 +0000 (09:37 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add missing NEWS entries
Ferenc Kovacs [Wed, 10 Jun 2015 07:36:53 +0000 (09:36 +0200)]
add missing NEWS entries
Ferenc Kovacs [Wed, 10 Jun 2015 07:35:38 +0000 (09:35 +0200)]
add missing NEWS entries
Stanislav Malyshev [Wed, 10 Jun 2015 04:39:59 +0000 (21:39 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add NEWS
Fixed bug #68776
fix test
update NEWS
Fix bug #69646 OS command injection vulnerability in escapeshellarg
Fix #69719 - more checks for nulls in paths
fix test description
Fixed Buf #68812 Unchecked return value.
Conflicts:
ext/dom/document.c
ext/gd/gd.c
ext/standard/exec.c
Stanislav Malyshev [Wed, 10 Jun 2015 04:37:17 +0000 (21:37 -0700)]
Fixed bug #69646 (OS command injection vulnerability in escapeshellarg)
Stanislav Malyshev [Wed, 10 Jun 2015 04:35:41 +0000 (21:35 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add NEWS
Stanislav Malyshev [Wed, 10 Jun 2015 04:35:31 +0000 (21:35 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add NEWS
Stanislav Malyshev [Wed, 10 Jun 2015 04:35:18 +0000 (21:35 -0700)]
add NEWS
Stanislav Malyshev [Wed, 10 Jun 2015 04:34:06 +0000 (21:34 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68776
Stanislav Malyshev [Wed, 10 Jun 2015 04:33:38 +0000 (21:33 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #68776