]>
granicus.if.org Git - php/log
Nikita Popov [Wed, 22 Oct 2014 18:13:22 +0000 (20:13 +0200)]
Drop unnecessary zval containers
Anatol Belski [Sat, 6 Dec 2014 11:32:16 +0000 (12:32 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed test
Anatol Belski [Sat, 6 Dec 2014 11:31:55 +0000 (12:31 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed test
Anatol Belski [Sat, 6 Dec 2014 11:31:27 +0000 (12:31 +0100)]
fixed test
Anatol Belski [Sat, 6 Dec 2014 11:18:36 +0000 (12:18 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
C89 compat
add include for missing localeconv_r proto
Anatol Belski [Sat, 6 Dec 2014 11:18:05 +0000 (12:18 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
C89 compat
add include for missing localeconv_r proto
Anatol Belski [Sat, 6 Dec 2014 11:14:17 +0000 (12:14 +0100)]
C89 compat
Anatol Belski [Sat, 6 Dec 2014 11:09:35 +0000 (12:09 +0100)]
add include for missing localeconv_r proto
Anatol Belski [Sat, 6 Dec 2014 11:01:09 +0000 (12:01 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #65230 setting locale randomly broken
Anatol Belski [Sat, 6 Dec 2014 11:00:39 +0000 (12:00 +0100)]
updated NEWS
Anatol Belski [Sat, 6 Dec 2014 11:00:17 +0000 (12:00 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #65230 setting locale randomly broken
Anatol Belski [Sat, 6 Dec 2014 10:59:43 +0000 (11:59 +0100)]
Fixed bug #65230 setting locale randomly broken
Matteo Beccati [Sat, 6 Dec 2014 09:24:56 +0000 (10:24 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix compilation error (ref #68424)
Matteo Beccati [Sat, 6 Dec 2014 09:24:27 +0000 (10:24 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix compilation error (ref #68424)
Matteo Beccati [Sat, 6 Dec 2014 09:23:56 +0000 (10:23 +0100)]
Fix compilation error (ref #68424)
Dmitry Stogov [Sat, 6 Dec 2014 00:03:48 +0000 (03:03 +0300)]
Removed useless handlers
Dmitry Stogov [Fri, 5 Dec 2014 23:14:45 +0000 (02:14 +0300)]
Move checks for references into slow paths of operator functions. Remove duplicate opcode handlers.
Adam Harvey [Fri, 5 Dec 2014 21:58:48 +0000 (13:58 -0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Revert unintentional docblock change
Adam Harvey [Fri, 5 Dec 2014 21:58:19 +0000 (13:58 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Revert unintentional docblock change
Adam Harvey [Fri, 5 Dec 2014 21:57:46 +0000 (13:57 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Revert unintentional docblock change
Chris Christoff [Fri, 5 Dec 2014 20:59:46 +0000 (15:59 -0500)]
Revert unintentional docblock change
Revert unintentional docblock change
It looks like commit
dd8e59da8f5aafd9d77a0f1f17e5e272d09f643f
introduced an unintended docbloc change. I have reverted this
change in this commit.
Andrea Faulds [Fri, 5 Dec 2014 19:47:27 +0000 (19:47 +0000)]
Merge branch 'ZendEngine3'
* ZendEngine3:
Restored zip/oci8 PHP 4 code, add PHP 7 checks
Note macro removal in UPGRADING.INTERNALS
Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!)
Zend Engine 3
Andrea Faulds [Fri, 5 Dec 2014 13:41:38 +0000 (13:41 +0000)]
Restored zip/oci8 PHP 4 code, add PHP 7 checks
Andrea Faulds [Fri, 5 Dec 2014 13:32:01 +0000 (13:32 +0000)]
Note macro removal in UPGRADING.INTERNALS
Andrea Faulds [Thu, 4 Dec 2014 00:55:11 +0000 (00:55 +0000)]
Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!)
Andrea Faulds [Fri, 19 Sep 2014 23:24:03 +0000 (00:24 +0100)]
Zend Engine 3
Julien Pauli [Fri, 5 Dec 2014 16:07:13 +0000 (17:07 +0100)]
Updated NEWS
Julien Pauli [Fri, 5 Dec 2014 16:06:33 +0000 (17:06 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS
Updated NEWS
Start adding new attribute to control multi statements
Julien Pauli [Fri, 5 Dec 2014 16:06:16 +0000 (17:06 +0100)]
Updated NEWS
Julien Pauli [Fri, 5 Dec 2014 16:05:37 +0000 (17:05 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Start adding new attribute to control multi statements
Julien Pauli [Fri, 5 Dec 2014 16:05:21 +0000 (17:05 +0100)]
Updated NEWS
pwolanin [Fri, 7 Nov 2014 22:18:44 +0000 (17:18 -0500)]
Start adding new attribute to control multi statements
Dmitry Stogov [Fri, 5 Dec 2014 15:23:39 +0000 (18:23 +0300)]
Get rid of few more duplicate handlers
Anatol Belski [Fri, 5 Dec 2014 14:51:53 +0000 (15:51 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
. Fixed bug #68120 Update bundled libsqlite
Anatol Belski [Fri, 5 Dec 2014 14:51:26 +0000 (15:51 +0100)]
updated NEWS
Anatol Belski [Fri, 5 Dec 2014 14:50:18 +0000 (15:50 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
. Fixed bug #68120 Update bundled libsqlite
Conflicts:
ext/sqlite3/libsqlite/sqlite3.c
Anatol Belski [Fri, 5 Dec 2014 14:43:53 +0000 (15:43 +0100)]
. Fixed bug #68120 Update bundled libsqlite
Dmitry Stogov [Fri, 5 Dec 2014 14:04:15 +0000 (17:04 +0300)]
Improved BOOL, BOOL_NOT and conditional jumps
Dmitry Stogov [Fri, 5 Dec 2014 12:07:49 +0000 (15:07 +0300)]
Improved ECHO and PRINT
Dmitry Stogov [Fri, 5 Dec 2014 10:45:03 +0000 (13:45 +0300)]
Get rid of duplicare FETCH_DIM_* handlers
Anatol Belski [Fri, 5 Dec 2014 10:09:27 +0000 (11:09 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #65769 localeconv() broken in TS builds
Anatol Belski [Fri, 5 Dec 2014 10:08:55 +0000 (11:08 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #65769 localeconv() broken in TS builds
Anatol Belski [Fri, 5 Dec 2014 10:08:32 +0000 (11:08 +0100)]
updated NEWS
Anatol Belski [Fri, 5 Dec 2014 10:06:06 +0000 (11:06 +0100)]
Fixed bug #65769 localeconv() broken in TS builds
Dmitry Stogov [Fri, 5 Dec 2014 09:40:47 +0000 (12:40 +0300)]
Get rid of duplicate handlers (where the code for IS_TMP_VAR and IS_VAR operands is the same)
Julien Pauli [Fri, 5 Dec 2014 09:18:41 +0000 (10:18 +0100)]
Updated NEWS
Julien Pauli [Fri, 5 Dec 2014 09:14:35 +0000 (10:14 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS
Updated NEWS
Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
Conflicts:
ext/spl/spl_directory.c
Julien Pauli [Fri, 5 Dec 2014 09:12:35 +0000 (10:12 +0100)]
Updated NEWS
Julien Pauli [Fri, 5 Dec 2014 09:12:08 +0000 (10:12 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
Julien Pauli [Fri, 5 Dec 2014 09:11:49 +0000 (10:11 +0100)]
Updated NEWS
Peter Cowburn [Mon, 24 Nov 2014 20:13:14 +0000 (20:13 +0000)]
Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
Anatol Belski [Fri, 5 Dec 2014 06:08:59 +0000 (07:08 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix dir separators in test
Anatol Belski [Fri, 5 Dec 2014 06:08:35 +0000 (07:08 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix dir separators in test
Anatol Belski [Fri, 5 Dec 2014 06:07:58 +0000 (07:07 +0100)]
fix dir separators in test
Xinchen Hui [Fri, 5 Dec 2014 04:10:31 +0000 (12:10 +0800)]
Make it const as Levi asked for
Michael Wallner [Thu, 4 Dec 2014 12:02:30 +0000 (13:02 +0100)]
Fix zend_fcall_info_arg*() to use ZVAL_COPY
As zend_fcall_info_args_clear() calls zval_ptr_dtor() we also have
to increase the refcount of refcounted zvals added as params,
like it is already done in zend_fcall_info_args_ex().
Ferenc Kovacs [Thu, 4 Dec 2014 10:12:42 +0000 (11:12 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add initial install
switch to C travis project instead of PHP
use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
Ferenc Kovacs [Thu, 4 Dec 2014 10:12:32 +0000 (11:12 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add initial install
switch to C travis project instead of PHP
use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
Ferenc Kovacs [Thu, 4 Dec 2014 10:12:17 +0000 (11:12 +0100)]
Merge branch 'pull-request/932' into PHP-5.5
* pull-request/932:
add initial install
switch to C travis project instead of PHP
use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
Tjerk Meesters [Wed, 3 Dec 2014 23:22:54 +0000 (07:22 +0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed #65213 - cannot cast SplFileInfo to boolean
Conflicts:
ext/spl/spl_directory.c
Tjerk Meesters [Wed, 3 Dec 2014 23:18:33 +0000 (07:18 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed #65213 - cannot cast SplFileInfo to boolean
Tjerk Meesters [Wed, 3 Dec 2014 23:17:33 +0000 (07:17 +0800)]
Fixed #65213 - cannot cast SplFileInfo to boolean
Ferenc Kovacs [Wed, 3 Dec 2014 23:12:23 +0000 (00:12 +0100)]
add initial install
Ferenc Kovacs [Sun, 18 May 2014 16:15:51 +0000 (18:15 +0200)]
switch to C travis project instead of PHP
Ferenc Kovacs [Sun, 18 May 2014 18:12:28 +0000 (20:12 +0200)]
use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
Anatol Belski [Wed, 3 Dec 2014 18:50:02 +0000 (19:50 +0100)]
fix TS build
Anatol Belski [Tue, 2 Dec 2014 14:59:38 +0000 (15:59 +0100)]
add config option to target codegen architectures
Anatol Belski [Wed, 3 Dec 2014 15:49:13 +0000 (16:49 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
Fixed bug #55541 errors spawn MessageBox, which blocks test automation
Anatol Belski [Wed, 3 Dec 2014 15:48:49 +0000 (16:48 +0100)]
updated NEWS
Anatol Belski [Wed, 3 Dec 2014 15:48:07 +0000 (16:48 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Fixed bug #55541 errors spawn MessageBox, which blocks test automation
Anatol Belski [Wed, 3 Dec 2014 15:47:38 +0000 (16:47 +0100)]
updated NEWS
Anatol Belski [Wed, 3 Dec 2014 15:33:05 +0000 (16:33 +0100)]
Fixed bug #55541 errors spawn MessageBox, which blocks test automation
With that, also fixed bug #68297 (Application Popup provides too few
information) as a better error message is provided to the event log.
In the second case, the condition for display_startup_error was removed. The
condition was added as a fix for bug #30760 which was preventing the
MessageBox to appear. When display_startup_error=on, the error will be seen
on the console. But when running under a webserver it'll probably get lost,
so we need to log it other way into the event log (would be done automatically
when message box was used, but that would eventually cause issues of blocked
execution).
Generally speaking - any MessageBox or other graphical element is a potential
issue and that was repeatedly reported. Graphical elements shouldn't be used
in the core. Even being a rare one it can cause a bad situation where the
server is blocked. Yet some places have to cleaned up.
Dmitry Stogov [Wed, 3 Dec 2014 15:02:02 +0000 (18:02 +0300)]
Get rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are absolutely the same).
Dmitry Stogov [Wed, 3 Dec 2014 13:56:09 +0000 (16:56 +0300)]
Use zend_string* for op_array->arg_info[]->name and op_array->arg_info[]->class_name. For internal functions we still use char*.
Dmitry Stogov [Wed, 3 Dec 2014 09:13:50 +0000 (12:13 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed __debugInfo() support
Dmitry Stogov [Wed, 3 Dec 2014 09:13:01 +0000 (12:13 +0300)]
Fixed __debugInfo() support
Adam Harvey [Wed, 3 Dec 2014 00:48:12 +0000 (16:48 -0800)]
Merge branch 'PHP-5.6'
Adam Harvey [Wed, 3 Dec 2014 00:47:31 +0000 (16:47 -0800)]
Update UPGRADING for the new variadic functions, and re-sort.
Dmitry Stogov [Tue, 2 Dec 2014 23:47:03 +0000 (02:47 +0300)]
Improved POST INC/DEC
Ferenc Kovacs [Tue, 2 Dec 2014 18:19:30 +0000 (19:19 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
Ferenc Kovacs [Tue, 2 Dec 2014 18:19:16 +0000 (19:19 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
Ferenc Kovacs [Tue, 2 Dec 2014 18:18:57 +0000 (19:18 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
Conflicts:
run-tests.php
Ferenc Kovacs [Tue, 2 Dec 2014 18:17:58 +0000 (19:17 +0100)]
make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
Xinchen Hui [Tue, 2 Dec 2014 14:21:35 +0000 (22:21 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Tue, 2 Dec 2014 14:21:19 +0000 (22:21 +0800)]
Missed closed folder mark
Dmitry Stogov [Tue, 2 Dec 2014 13:47:26 +0000 (16:47 +0300)]
Revert "Unecessary assignment"
This reverts commit
b19333663a872a8b0b8c799781236b5cd5bfa47a .
Dmitry Stogov [Tue, 2 Dec 2014 13:29:54 +0000 (16:29 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Unecessary assignment
Dmitry Stogov [Tue, 2 Dec 2014 13:29:13 +0000 (16:29 +0300)]
Fixed improper memory release
Xinchen Hui [Tue, 2 Dec 2014 13:24:00 +0000 (21:24 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Tue, 2 Dec 2014 13:23:39 +0000 (21:23 +0800)]
Unecessary assignment
Dmitry Stogov [Tue, 2 Dec 2014 13:17:26 +0000 (16:17 +0300)]
Support for different CPU page sizes
Dmitry Stogov [Tue, 2 Dec 2014 13:05:30 +0000 (16:05 +0300)]
Fixed "finally" handling (the bug was introduced by recent removing of EX(delayed_exception))
Anatol Belski [Tue, 2 Dec 2014 10:24:21 +0000 (11:24 +0100)]
fix datatype mismatches and warnings
Anatol Belski [Tue, 2 Dec 2014 09:02:20 +0000 (10:02 +0100)]
add /nologo to ARFLAGS
Anatol Belski [Tue, 2 Dec 2014 08:14:22 +0000 (09:14 +0100)]
fix datatype mismatches
Anatol Belski [Tue, 2 Dec 2014 07:58:39 +0000 (08:58 +0100)]
fix datatype mismatches
Anatol Belski [Tue, 2 Dec 2014 07:37:11 +0000 (08:37 +0100)]
fix datatype mismatch
Anatol Belski [Mon, 1 Dec 2014 13:30:02 +0000 (14:30 +0100)]
fix datatype mismatches
Anatol Belski [Mon, 1 Dec 2014 07:42:21 +0000 (08:42 +0100)]
silence the lib.exe
Remi Collet [Tue, 2 Dec 2014 07:41:35 +0000 (08:41 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Fix Bug #68536 Pack for 64bits integer is broken on bigendian.