]>
granicus.if.org Git - php/log
Ferenc Kovacs [Fri, 3 Oct 2014 09:38:32 +0000 (11:38 +0200)]
NEWS entry for previous commit
Robin Gloster [Fri, 3 Oct 2014 09:35:27 +0000 (11:35 +0200)]
add IPv6 support to php-fpm
Sara Golemon [Fri, 3 Oct 2014 01:55:14 +0000 (18:55 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add hash to EXTENSIONS file
Sara Golemon [Fri, 3 Oct 2014 01:54:46 +0000 (18:54 -0700)]
Add hash to EXTENSIONS file
Ferenc Kovacs [Thu, 2 Oct 2014 20:28:19 +0000 (22:28 +0200)]
we also have xz release tarballs since 5.5
Julien Pauli [Wed, 1 Oct 2014 14:16:05 +0000 (16:16 +0200)]
5.5.19 now
Remi Collet [Wed, 1 Oct 2014 07:26:21 +0000 (09:26 +0200)]
use $PHP_LIBDIR instread of "lib" in skel example
Anatol Belski [Mon, 29 Sep 2014 18:30:18 +0000 (20:30 +0200)]
fix test filename
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: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
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: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.
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.
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: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: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: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
)
...
Ard Biesheuvel [Sat, 20 Sep 2014 23:40:02 +0000 (16:40 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
Ard Biesheuvel [Sat, 20 Sep 2014 23:32:31 +0000 (16:32 -0700)]
Fixed bug #66242 (don't assume char is signed)
This fixes a bug in libmagic where a cast to 'char' is assumed to result
in sign extension to occur. However, unqualified 'char' is unsigned on
architectures such as ARM, so the cast needs to be to 'signed char'
explicitly.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Nikita Popov [Sat, 20 Sep 2014 19:46:25 +0000 (21:46 +0200)]
Fixed bug #67633
Anatol Belski [Fri, 19 Sep 2014 18:12:24 +0000 (20:12 +0200)]
fix possible array underflow
there are multiple issues with this code
- php_stream_read() returns an unsigned val, so is >= 0
- if it read less than sizeof(a) bytes, the function operates on garbage
- result->channels is an unsigned val, so >= 0
Matteo Beccati [Tue, 16 Sep 2014 08:22:34 +0000 (10:22 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed freetype test on multiple environments
Matteo Beccati [Tue, 16 Sep 2014 08:17:25 +0000 (10:17 +0200)]
Fixed freetype test on multiple environments
Some environments, apparently regardless to the freetype version, output 155, while others 156. I guess we can accept both ;)
This reverts commit
592df890276604c790d02be26b1b3c3710b3b888 .
Remi Collet [Mon, 15 Sep 2014 11:31:17 +0000 (13:31 +0200)]
NEWS
Remi Collet [Mon, 15 Sep 2014 11:29:55 +0000 (13:29 +0200)]
Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
ProxyPass is unable to provide correct PATH_INFO
as it is not aware of file path (while SetHandler is).
As we can extract PATH_INFO from PATH_TRANSLATED,
we also need to check if present in SCRIPT_NAME
and remove it.
After applying this patch.
With mod_php
_SERVER["REQUEST_URI"] /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"] /info.php
_SERVER["PATH_INFO"] /foor/bar
_SERVER["PHP_SELF"] /info.php/foo/bar
_SERVER["QUERY_STRING"] q=1
With mod_proxy_fcgi + SetHandler
_SERVER["REQUEST_URI"] /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"] /info.php
_SERVER["PATH_INFO"] /foo/bar
_SERVER["PHP_SELF"] /info.php/foo/bar
_SERVER["QUERY_STRING"] q=1
With mod_proxy_fcgi + ProxyPass
_SERVER["REQUEST_URI"] /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"] /info.php
_SERVER["PATH_INFO"] /foo/bar
_SERVER["PHP_SELF"] /info.php/foo/bar
_SERVER["QUERY_STRING"] q=1
Anatol Belski [Mon, 15 Sep 2014 08:27:52 +0000 (10:27 +0200)]
updated NEWS
Remi Collet [Mon, 15 Sep 2014 06:24:10 +0000 (08:24 +0200)]
Fix NEWS
- #65641 mod_proxy-fcgi is not fixed (still open)
- #67606 mod_fastcgi is fixed in
ee275e34c8b303945945c650d4bc90dcc2ac0b17
Remi Collet [Mon, 15 Sep 2014 06:23:40 +0000 (08:23 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in
ee275e34c8b303945945c650d4bc90dcc2ac0b17
Remi Collet [Mon, 15 Sep 2014 06:23:25 +0000 (08:23 +0200)]
Fix NEWS
- #65641 mod_proxy-fcgi is not fixed (still open)
- #67606 mod_fastcgi is fixed in
ee275e34c8b303945945c650d4bc90dcc2ac0b17
Anatol Belski [Fri, 12 Sep 2014 12:36:00 +0000 (14:36 +0200)]
fixed the cast and incompatible pointer warning
Anatol Belski [Thu, 11 Sep 2014 21:30:01 +0000 (23:30 +0200)]
reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
Anatol Belski [Wed, 10 Sep 2014 17:29:11 +0000 (19:29 +0200)]
fix precision when fetching float through mysqlnd
fixes failing ext/mysqli/tests/010.phpt
Michael Wallner [Wed, 10 Sep 2014 11:30:52 +0000 (13:30 +0200)]
make LTP version check a blacklist
Daniel Lowrey [Tue, 9 Sep 2014 15:27:20 +0000 (09:27 -0600)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Bug #41631: Fix regression from first attempt (
6569db8 )
Bug #67965: Fix blocking behavior in non-blocking crypto streams
Daniel Lowrey [Tue, 9 Sep 2014 13:50:15 +0000 (07:50 -0600)]
Bug #41631: Fix regression from first attempt (
6569db8 )
Daniel Lowrey [Tue, 9 Sep 2014 13:37:57 +0000 (07:37 -0600)]
Bug #67965: Fix blocking behavior in non-blocking crypto streams
Tjerk Meesters [Tue, 9 Sep 2014 10:02:45 +0000 (18:02 +0800)]
Updated NEWS for #67985
Tjerk Meesters [Tue, 9 Sep 2014 10:00:49 +0000 (18:00 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed #67985 - Incorrect last used array index copied to new array after unset
Tjerk Meesters [Tue, 9 Sep 2014 09:58:45 +0000 (17:58 +0800)]
Fixed #67985 - Incorrect last used array index copied to new array after unset
In master zend_array_dup() is used to do this properly; this is a workaround.
George Wang [Tue, 9 Sep 2014 03:58:05 +0000 (23:58 -0400)]
Fine tuned the order of adding request variables.
George Wang [Tue, 9 Sep 2014 03:58:05 +0000 (23:58 -0400)]
Fine tuned the order of adding request variables.
Adam Harvey [Mon, 8 Sep 2014 19:25:14 +0000 (19:25 +0000)]
Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
SessionHandler::create_sid() didn't check if PS(default_mod) was initialised
before attempting to call its create_sid() handler.
George Wang [Wed, 3 Sep 2014 15:28:30 +0000 (11:28 -0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
George Wang [Wed, 3 Sep 2014 15:24:45 +0000 (11:24 -0400)]
Update LSAPI to 6.7, added support for 'filter_input'.
Fixed a crash in CLI mode.
George Wang [Wed, 3 Sep 2014 15:24:45 +0000 (11:24 -0400)]
Update LSAPI to 6.7, added support for 'filter_input'.
Fixed a crash in CLI mode.
Julien Pauli [Wed, 3 Sep 2014 08:18:51 +0000 (10:18 +0200)]
5.5.18 now
Matteo Beccati [Wed, 3 Sep 2014 07:44:59 +0000 (09:44 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed test with freetype >= 2.4.12
Matteo Beccati [Wed, 3 Sep 2014 07:43:29 +0000 (09:43 +0200)]
Fixed test with freetype >= 2.4.12
Stanislav Malyshev [Tue, 2 Sep 2014 22:03:54 +0000 (15:03 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.34 is next
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Tue, 2 Sep 2014 22:03:04 +0000 (15:03 -0700)]
5.4.34 is next
Stanislav Malyshev [Tue, 2 Sep 2014 21:16:17 +0000 (14:16 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
Stanislav Malyshev [Tue, 2 Sep 2014 21:15:39 +0000 (14:15 -0700)]
Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
This reverts commit
53fa6c5b6b5b09059ba54c8912d0c0aef57aa4ff .
The change breaks tests, so not putting it into 5.4.
Stanislav Malyshev [Tue, 2 Sep 2014 19:31:29 +0000 (12:31 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67644 - Memory corruption & crash during ob_start function callback
Stanislav Malyshev [Sun, 31 Aug 2014 01:32:12 +0000 (18:32 -0700)]
Fix bug #67644 - Memory corruption & crash during ob_start function callback
Stanislav Malyshev [Mon, 1 Sep 2014 19:14:57 +0000 (12:14 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update NEWS
Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)
Fix typo from commit
32314f6b6
Fix destruction order in zend_shutdown (bug #65463, #66036)
Stanislav Malyshev [Mon, 1 Sep 2014 19:13:43 +0000 (12:13 -0700)]
update NEWS
Stanislav Malyshev [Mon, 1 Sep 2014 19:11:42 +0000 (12:11 -0700)]
Merge branch 'pull-request/770' into PHP-5.4
* pull-request/770:
Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)
Fix typo from commit
32314f6b6
Fix destruction order in zend_shutdown (bug #65463, #66036)
Derick Rethans [Mon, 1 Sep 2014 15:40:50 +0000 (16:40 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Mon, 1 Sep 2014 15:40:49 +0000 (16:40 +0100)]
- Updated to version 2014.7 (2014g)
Stanislav Malyshev [Fri, 29 Aug 2014 06:11:08 +0000 (23:11 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix NEWS for fcgi fix merge
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Stanislav Malyshev [Fri, 29 Aug 2014 06:10:32 +0000 (23:10 -0700)]
fix NEWS for fcgi fix merge
David Zuelke [Sat, 9 Aug 2014 06:26:33 +0000 (08:26 +0200)]
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Lior Kaplan [Wed, 27 Aug 2014 21:44:31 +0000 (00:44 +0300)]
config.guess: add ppc64le / ppcle support by Anton Blanchard <anton@samba.org>
Based on http://git.savannah.gnu.org/cgit/config.git/commit/?id=
29900d3b
Lior Kaplan [Wed, 27 Aug 2014 21:37:01 +0000 (00:37 +0300)]
libtool: powerpc*le-linux support by Alan Modra <amodra@bigpond.net.au>
Patch created using the following changes in libtool:
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=
75ffb257
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=
056889b8
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=
bd998a7e
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=
429d40a0
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=
8a8dfaec
Chris Wright [Wed, 27 Aug 2014 15:01:18 +0000 (16:01 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix stream_select() issue with OpenSSL buffer
Conflicts:
ext/openssl/xp_ssl.c
Chris Wright [Sat, 23 Aug 2014 00:40:19 +0000 (01:40 +0100)]
Fix stream_select() issue with OpenSSL buffer
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed
Addresses bug #65137
https://bugs.php.net/bug.php?id=65137
Conflicts:
ext/openssl/xp_ssl.c
Anatol Belski [Wed, 27 Aug 2014 10:10:35 +0000 (12:10 +0200)]
fixed DBG_INF macro name
Ferenc Kovacs [Tue, 26 Aug 2014 22:47:37 +0000 (00:47 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update the GIT-RULES with the 5.6 and the release branches
Ferenc Kovacs [Tue, 26 Aug 2014 22:47:09 +0000 (00:47 +0200)]
update the GIT-RULES with the 5.6 and the release branches
Daniel Lowrey [Mon, 25 Aug 2014 17:47:35 +0000 (19:47 +0200)]
Update NEWS
Daniel Lowrey [Mon, 25 Aug 2014 15:28:09 +0000 (17:28 +0200)]
Bug #67850: Build when OpenSSL compiled without SSLv3 support
Lior Kaplan [Sun, 24 Aug 2014 21:30:01 +0000 (00:30 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
Lior Kaplan [Sun, 24 Aug 2014 21:29:05 +0000 (00:29 +0300)]
Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
Ferenc Kovacs [Sat, 23 Aug 2014 22:09:00 +0000 (00:09 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
this test depends on the simplexml ext, not just on xml
Ferenc Kovacs [Sat, 23 Aug 2014 22:08:09 +0000 (00:08 +0200)]
this test depends on the simplexml ext, not just on xml
Keyur Govande [Sat, 23 Aug 2014 14:17:37 +0000 (14:17 +0000)]
Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)
Michael Wallner [Thu, 21 Aug 2014 20:42:14 +0000 (22:42 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix bug #67865
Michael Wallner [Thu, 21 Aug 2014 20:41:36 +0000 (22:41 +0200)]
fix bug #67865
Julien Pauli [Thu, 21 Aug 2014 09:34:38 +0000 (11:34 +0200)]
updated NEWS to fit last release
Remi Collet [Thu, 21 Aug 2014 07:11:18 +0000 (09:11 +0200)]
NEWS
Remi Collet [Thu, 21 Aug 2014 07:09:21 +0000 (09:09 +0200)]
Fix bug #67878 program_prefix not honoured in man pages
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
Anatol Belski [Thu, 21 Aug 2014 07:08:44 +0000 (09:08 +0200)]
avoid clash when stdint.h was included after win32/php_stdint.h
Stanislav Malyshev [Wed, 20 Aug 2014 21:42:48 +0000 (14:42 -0700)]
fix test
Remi Collet [Wed, 20 Aug 2014 13:17:05 +0000 (15:17 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Remi Collet [Wed, 20 Aug 2014 13:16:53 +0000 (15:16 +0200)]
NEWS
Remi Collet [Wed, 20 Aug 2014 13:10:02 +0000 (15:10 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed variable corruption under win x64
Anatol Belski [Sat, 11 May 2013 00:47:48 +0000 (02:47 +0200)]
fixed variable corruption under win x64
Lior Kaplan [Tue, 19 Aug 2014 22:10:38 +0000 (01:10 +0300)]
Add NEWS entry for bug #67492
Included in 5.5.14 with commit
d9c5a1d
Lior Kaplan [Tue, 19 Aug 2014 22:05:22 +0000 (01:05 +0300)]
Add NEWS entry for bug #67730
Lior Kaplan [Tue, 19 Aug 2014 22:01:23 +0000 (01:01 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add NEWS entry for bug #67730
Add CVE ID for bug #67539
Lior Kaplan [Tue, 19 Aug 2014 21:54:19 +0000 (00:54 +0300)]
Add NEWS entry for bug #67730
Included in 5.4.32 with commit
706aefb
Lior Kaplan [Tue, 19 Aug 2014 21:51:37 +0000 (00:51 +0300)]
Add CVE ID for bug #67539