]>
granicus.if.org Git - php/log
Ferenc Kovacs [Wed, 1 Oct 2014 09:16:40 +0000 (11:16 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update NEWS about the release date of 5.6.1
Ferenc Kovacs [Wed, 1 Oct 2014 09:15:59 +0000 (11:15 +0200)]
update NEWS about the release date of 5.6.1
Remi Collet [Wed, 1 Oct 2014 08:15:13 +0000 (10:15 +0200)]
only no_NO.ISO-8859-1 have to be ignored (merged)
Remi Collet [Wed, 1 Oct 2014 08:14:14 +0000 (10:14 +0200)]
only no_NO.ISO-8859-1 have to be ignored
krakjoe [Thu, 21 Aug 2014 09:03:48 +0000 (10:03 +0100)]
remove bogus locale use from test
Remi Collet [Wed, 1 Oct 2014 07:27:18 +0000 (09:27 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
use $PHP_LIBDIR instread of "lib" in skel example
Remi Collet [Wed, 1 Oct 2014 07:26:46 +0000 (09:26 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
use $PHP_LIBDIR instread of "lib" in skel example
Remi Collet [Wed, 1 Oct 2014 07:26:21 +0000 (09:26 +0200)]
use $PHP_LIBDIR instread of "lib" in skel example
Dmitry Stogov [Wed, 1 Oct 2014 06:46:13 +0000 (10:46 +0400)]
Removed zend_execute_data->prev_nested_call. Reuse prev_execute_data instead.
Dmitry Stogov [Tue, 30 Sep 2014 11:19:51 +0000 (15:19 +0400)]
Micro optimization
Nikita Popov [Mon, 29 Sep 2014 20:59:57 +0000 (22:59 +0200)]
Drop unused INIT_STRING opcode
INIT_STRING has been implemented as an UNUSED op1 to ADD_* for
some time now.
Nikita Popov [Mon, 29 Sep 2014 20:50:56 +0000 (22:50 +0200)]
Drop unused RAISE_ABSTRACT_ERROR opcode
Abstract methods are being prevented from being called in DO_FCALL
etc.
Nikita Popov [Sun, 28 Sep 2014 21:17:29 +0000 (23:17 +0200)]
CT substitute unqualified true/false/null in namespaces
Substituation now always happens on the resolved name and
unqualified usages of true/false/null in namespaced code are
substituted as well.
Nikita Popov [Sun, 28 Sep 2014 19:30:49 +0000 (21:30 +0200)]
Fix a couple compile warnings
Anatol Belski [Mon, 29 Sep 2014 18:31:02 +0000 (20:31 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix test filename
Anatol Belski [Mon, 29 Sep 2014 18:30:43 +0000 (20:30 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test filename
Anatol Belski [Mon, 29 Sep 2014 18:30:18 +0000 (20:30 +0200)]
fix test filename
Anatol Belski [Mon, 29 Sep 2014 18:19:51 +0000 (20:19 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
one more test to illustrate transfer of an arbitrary data amount throug pipes
Anatol Belski [Mon, 29 Sep 2014 18:19:31 +0000 (20:19 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
one more test to illustrate transfer of an arbitrary data amount throug pipes
Anatol Belski [Mon, 29 Sep 2014 18:18:33 +0000 (20:18 +0200)]
one more test to illustrate transfer of an arbitrary data amount throug pipes
Anatol Belski [Mon, 29 Sep 2014 16:13:16 +0000 (18:13 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix tests on linux
better test cleanup
Anatol Belski [Mon, 29 Sep 2014 16:12:56 +0000 (18:12 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix tests on linux
better test cleanup
Anatol Belski [Mon, 29 Sep 2014 16:12:25 +0000 (18:12 +0200)]
fix tests on linux
Anatol Belski [Mon, 29 Sep 2014 16:11:06 +0000 (18:11 +0200)]
better test cleanup
and even force the XFAIL to fail as it would take too long anyway, even if it passes
Dmitry Stogov [Mon, 29 Sep 2014 15:41:00 +0000 (19:41 +0400)]
Use more readable inline functions
Anatol Belski [Mon, 29 Sep 2014 15:29:00 +0000 (17:29 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
increase the polling period to not to break existing behaviours
Anatol Belski [Mon, 29 Sep 2014 15:28:27 +0000 (17:28 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
increase the polling period to not to break existing behaviours
Anatol Belski [Mon, 29 Sep 2014 15:27:24 +0000 (17:27 +0200)]
increase the polling period to not to break existing behaviours
Anatol Belski [Mon, 29 Sep 2014 14:30:40 +0000 (16:30 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #51800 proc_open on Windows hangs forever
Conflicts:
main/streams/plain_wrapper.c
Anatol Belski [Mon, 29 Sep 2014 14:28:12 +0000 (16:28 +0200)]
updated NEWS
Anatol Belski [Mon, 29 Sep 2014 14:27:33 +0000 (16:27 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #51800 proc_open on Windows hangs forever
Anatol Belski [Mon, 29 Sep 2014 14:24:34 +0000 (16:24 +0200)]
Fixed bug #51800 proc_open on Windows hangs forever
This loop can block for some minutes, theoretically. Practially
however, this is a 99% non issue for a normal use case. This is
required because read() is synchronous. The PHP streams API wants
to fill its internal buffers, therefore it might try to read some
more data than user has demanded. Also, for a case where we want
to read X bytes, but neither enough data nor EOF arrives, read()
will block until it could fill the buffer. If a counterpart station
runs slowly or delivers not all the data at once, read() would
still be waiting. If we quit too early, we possibly could loose
some data from the pipe. Thus it has to emulate the read()
behaviour, but obviously not completely, just to some grade.
Reading big data amount is for sure an issue on any platforms, it
depends on the pipe buffer size, which is controlled by the system.
On Windows, the buffer size seems to be way too small, which causes
buffer congestion and a dead lock. It is essential to read the pipe
descriptors simultaneously and possibly in the same order as the
opposite writes them.
Thus, this will work with smaller buffer data sizes passed through
pipes. As MSDN states, anonymous pipes don't support asynchronous
operations. Neither anonymous pipes do support select() as they are
not SOCKETs but file descriptors. Consequently - bigger data sizes
will need a better solution based on threads. However it is much
more expencive. Maybe a better solution could be exporting a part
of the internal doing as a userspace function which could perform
some kind of lookahead operation on the pipe descriptor.
This is just the first stone, depending on the user feedback we
might go for further improvements in this area.
Xinchen Hui [Mon, 29 Sep 2014 04:06:56 +0000 (12:06 +0800)]
Fixed segfault
Stanislav Malyshev [Sun, 28 Sep 2014 19:28:30 +0000 (12:28 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Set an LDAP error code when failing ldap_bind due to null bytes
Conflicts:
ext/ldap/ldap.c
Stanislav Malyshev [Sun, 28 Sep 2014 19:25:49 +0000 (12:25 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Set an LDAP error code when failing ldap_bind due to null bytes
Stanislav Malyshev [Sun, 28 Sep 2014 19:25:24 +0000 (12:25 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Set an LDAP error code when failing ldap_bind due to null bytes
Matthew Daley [Sun, 28 Sep 2014 04:49:35 +0000 (17:49 +1300)]
Set an LDAP error code when failing ldap_bind due to null bytes
Some applications check a LDAP link's error code after seeing ldap_bind
fail due to a null byte bind attempt and hence incorrectly receive the
last set error code.
Fix by setting an LDAP error code before returning in this case.
Timm Friebe [Sat, 27 Sep 2014 19:24:19 +0000 (19:24 +0000)]
Fix segmentation fault in debug_backtrace()
Nikita Popov [Sun, 28 Sep 2014 18:39:19 +0000 (20:39 +0200)]
Drop support for GMP 4.1
* Consistent base conversion support (max: 62)
* mpz_remroot always available
* Use gmp_randinit_mt instead of LCG
Leigh [Wed, 24 Sep 2014 21:55:13 +0000 (22:55 +0100)]
Make gmp_setbit and gmp_clrbit return values consistent
Anatol Belski [Sun, 28 Sep 2014 17:02:09 +0000 (19:02 +0200)]
removed *.dsw and *.dsp files
Nikita Popov [Sun, 28 Sep 2014 10:31:52 +0000 (12:31 +0200)]
Opcache compatibility for coalesce operator
Nikita Popov [Sun, 28 Sep 2014 10:20:04 +0000 (12:20 +0200)]
Update operand types for coalesce operator
Andrea Faulds [Sat, 27 Sep 2014 23:07:04 +0000 (00:07 +0100)]
Merge branch 'coalesce_operator'
* coalesce_operator:
Extended coalesce operator test case for ordering/short-circuiting
Ensure not evaluated twice
Added test
Initial coalesce operator implementation
Johannes Schlüter [Sat, 27 Sep 2014 00:18:54 +0000 (02:18 +0200)]
Merge branch 'PHP-5.6'
Johannes Schlüter [Sat, 27 Sep 2014 00:18:29 +0000 (02:18 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Johannes Schlüter [Sat, 27 Sep 2014 00:17:52 +0000 (02:17 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Sat, 27 Sep 2014 00:17:26 +0000 (02:17 +0200)]
This test should pass
Derick Rethans [Fri, 26 Sep 2014 15:27:09 +0000 (16:27 +0100)]
Merge branch 'PHP-5.6'
Derick Rethans [Fri, 26 Sep 2014 15:27:05 +0000 (16:27 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Fri, 26 Sep 2014 15:27:00 +0000 (16:27 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Fri, 26 Sep 2014 15:26:59 +0000 (16:26 +0100)]
- Updated to version 2014.8 (2014h)
Stanislav Malyshev [Fri, 26 Sep 2014 08:02:38 +0000 (01:02 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix date
update NEWS
Revert xp_ssl.c to the state of 5.4.32 due to regressions
Stanislav Malyshev [Fri, 26 Sep 2014 08:01:39 +0000 (01:01 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix date
update NEWS
Revert xp_ssl.c to the state of 5.4.32 due to regressions
Stanislav Malyshev [Fri, 26 Sep 2014 08:00:20 +0000 (01:00 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update NEWS
Revert xp_ssl.c to the state of 5.4.32 due to regressions
Conflicts:
ext/openssl/xp_ssl.c
Stanislav Malyshev [Fri, 26 Sep 2014 07:56:39 +0000 (00:56 -0700)]
fix date
Stanislav Malyshev [Fri, 26 Sep 2014 07:55:49 +0000 (00:55 -0700)]
update NEWS
Stanislav Malyshev [Fri, 26 Sep 2014 07:44:24 +0000 (00:44 -0700)]
Revert xp_ssl.c to the state of 5.4.32 due to regressions
Remi Collet [Fri, 26 Sep 2014 07:28:02 +0000 (09:28 +0200)]
Fixed bug #68103 Dupplicate entry in Reflection (merged)
Remi Collet [Fri, 26 Sep 2014 07:07:12 +0000 (09:07 +0200)]
NEWS
Remi Collet [Fri, 26 Sep 2014 07:06:51 +0000 (09:06 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fixed bug #68103 Dupplicate entry in Reflection
Remi Collet [Fri, 26 Sep 2014 07:06:12 +0000 (09:06 +0200)]
NEWS
Remi Collet [Fri, 26 Sep 2014 06:56:42 +0000 (08:56 +0200)]
Fixed bug #68103 Dupplicate entry in Reflection
$ php -r '$r=new ReflectionExtension("pthreads"); print_r($r->getClassNames());'
Array
(
[0] => Threaded
[1] => stackable
[2] => Thread
[3] => Worker
[4] => Mutex
[5] => Cond
[6] => Collectable
[7] => Pool
)
In getClasses() output, it is possible to compare key (ex "stackable")
with $obj->name (ex "Threaded") to detect class alias.
...
[Threaded] => ReflectionClass Object
(
[name] => Threaded
)
[stackable] => ReflectionClass Object
(
[name] => Threaded
)
...
Dmitry Stogov [Thu, 25 Sep 2014 21:37:33 +0000 (01:37 +0400)]
Fixed optimizer bug
Anatol Belski [Thu, 25 Sep 2014 18:28:34 +0000 (20:28 +0200)]
fix C89 compat
krakjoe [Thu, 25 Sep 2014 15:31:39 +0000 (16:31 +0100)]
fix indentation
krakjoe [Thu, 25 Sep 2014 15:15:02 +0000 (16:15 +0100)]
fix zts build
Dmitry Stogov [Thu, 25 Sep 2014 13:00:17 +0000 (17:00 +0400)]
Use macro
Dmitry Stogov [Thu, 25 Sep 2014 09:42:46 +0000 (13:42 +0400)]
Optimized (PRE|POST)_(INC|DEC) handlers. Moved proxy object handling into helper function.
Dmitry Stogov [Wed, 24 Sep 2014 16:31:22 +0000 (20:31 +0400)]
Fixed C++ incompatibility
Ferenc Kovacs [Wed, 24 Sep 2014 11:42:32 +0000 (13:42 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
update the certificate used for the test, as it expired recently
Ferenc Kovacs [Wed, 24 Sep 2014 11:40:52 +0000 (13:40 +0200)]
update the certificate used for the test, as it expired recently
Dmitry Stogov [Wed, 24 Sep 2014 11:39:54 +0000 (15:39 +0400)]
Fixed immutable arrays support
Nikita Popov [Wed, 24 Sep 2014 09:58:13 +0000 (11:58 +0200)]
Fix counting of "R:" references in serialize()
Nikita Popov [Wed, 24 Sep 2014 09:26:09 +0000 (11:26 +0200)]
Remove dead code
Nikita Popov [Tue, 23 Sep 2014 19:36:45 +0000 (21:36 +0200)]
Test use($this) being an error
Nikita Popov [Tue, 23 Sep 2014 19:19:11 +0000 (21:19 +0200)]
Move list() condition into assign_znode
The condition in compile_foreach was using ->attr instead of ->kind
and as such never passed. It only worked because assign_znode already
supported this case by indirecting via zend_compile_assign. Now it
implements it with a direct call.
Remi Collet [Wed, 24 Sep 2014 08:42:31 +0000 (10:42 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
typo
Remi Collet [Wed, 24 Sep 2014 08:42:20 +0000 (10:42 +0200)]
typo
Remi Collet [Wed, 24 Sep 2014 08:36:58 +0000 (10:36 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Fix bug #68074 Allow to use system cipher list instead of hardcoded value
Remi Collet [Wed, 24 Sep 2014 08:36:29 +0000 (10:36 +0200)]
NEWS
Remi Collet [Wed, 24 Sep 2014 08:34:55 +0000 (10:34 +0200)]
Fix bug #68074 Allow to use system cipher list instead of hardcoded value
Dmitry Stogov [Wed, 24 Sep 2014 08:20:46 +0000 (12:20 +0400)]
Avoid double checks
Ferenc Kovacs [Wed, 24 Sep 2014 07:41:02 +0000 (09:41 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
the order of the blocks should be Core, then exts in alphabetical order
add missing NEWS entry for the phpdbg compilation fix
Ferenc Kovacs [Wed, 24 Sep 2014 07:40:52 +0000 (09:40 +0200)]
the order of the blocks should be Core, then exts in alphabetical order
Ferenc Kovacs [Wed, 24 Sep 2014 07:39:14 +0000 (09:39 +0200)]
add missing NEWS entry for the phpdbg compilation fix
Ferenc Kovacs [Wed, 24 Sep 2014 07:10:31 +0000 (09:10 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add NEWS entry for #68088
Ferenc Kovacs [Wed, 24 Sep 2014 07:09:34 +0000 (09:09 +0200)]
add NEWS entry for #68088
Dmitry Stogov [Tue, 23 Sep 2014 21:57:40 +0000 (01:57 +0400)]
Make QM_ASSIGN, JMP_SET and CAST return IS_TMP_VAR.
Dmitry Stogov [Tue, 23 Sep 2014 19:27:20 +0000 (23:27 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Drop unused result argument
Fix ct binding for cuf/cufa functions
Fix detection of write to built-in function for references
Test use of string names with \ prefix
Add zend_add_literal_string
Drop dead code
Dmitry Stogov [Tue, 23 Sep 2014 19:26:39 +0000 (23:26 +0400)]
Removed useless helper
Nikita Popov [Tue, 23 Sep 2014 19:04:30 +0000 (21:04 +0200)]
Drop unused result argument
Nikita Popov [Tue, 23 Sep 2014 19:02:32 +0000 (21:02 +0200)]
Fix ct binding for cuf/cufa functions
It was checking against the wrong AST kind, so the binding was
never actually done.
Nikita Popov [Tue, 23 Sep 2014 18:42:22 +0000 (20:42 +0200)]
Fix detection of write to built-in function for references
Nikita Popov [Tue, 23 Sep 2014 18:35:32 +0000 (20:35 +0200)]
Test use of string names with \ prefix
And drop piece of dead code
Nikita Popov [Tue, 23 Sep 2014 18:21:28 +0000 (20:21 +0200)]
Add zend_add_literal_string
And simplify additional of special literals based on it.
Nikita Popov [Tue, 23 Sep 2014 17:32:02 +0000 (19:32 +0200)]
Drop dead code
Andrea Faulds [Tue, 23 Sep 2014 15:28:02 +0000 (16:28 +0100)]
Extended coalesce operator test case for ordering/short-circuiting
Dmitry Stogov [Tue, 23 Sep 2014 13:21:29 +0000 (17:21 +0400)]
Use zval_ptr_dtor_nogc() to free IS_TMP_VAR operands.
Removed ZEND_SWITCH_FREE opcode (ZEND_FREE used instead).
Tjerk Meesters [Tue, 23 Sep 2014 10:12:12 +0000 (18:12 +0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed typo