Rodrigo Prado de Jesus
813830e763
added various tests for XSLTProcessor and one test for iconv extension
2014-09-28 20:29:29 -03:00
Stanislav Malyshev
ef39f40445
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
2014-09-28 12:25:24 -07:00
Matthew Daley
fcbe20d357
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.
2014-09-28 12:23:52 -07:00
Johannes Schlüter
e6105ffb22
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-27 02:17:52 +02:00
Johannes Schlüter
2711948d14
This test should pass
2014-09-27 02:17:26 +02:00
Derick Rethans
5d299509b4
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-26 16:27:00 +01:00
Derick Rethans
16e2d954fc
- Updated to version 2014.8 (2014h)
2014-09-26 16:26:59 +01:00
Stanislav Malyshev
00e99dcafd
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
2014-09-26 01:00:20 -07:00
Stanislav Malyshev
2bfe92c90f
fix date
2014-09-26 00:56:39 -07:00
Stanislav Malyshev
28ed0119ac
update NEWS
2014-09-26 00:55:49 -07:00
Stanislav Malyshev
408b172017
Revert xp_ssl.c to the state of 5.4.32 due to regressions
2014-09-26 00:44:24 -07:00
Remi Collet
bf046d6d66
NEWS
2014-09-26 09:06:12 +02:00
Remi Collet
efa7f87de4
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
)
...
2014-09-26 08:56:42 +02:00
Ard Biesheuvel
7958793342
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-20 16:40:02 -07:00
Ard Biesheuvel
e64da8c20d
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>
2014-09-20 16:39:48 -07:00
Nikita Popov
5e977e69e1
Fixed bug #67633
2014-09-20 21:46:25 +02:00
Anatol Belski
5d9403f56c
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
2014-09-19 20:12:24 +02:00
Matteo Beccati
b8470e19e4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed freetype test on multiple environments
2014-09-16 10:22:34 +02:00
Matteo Beccati
00525b824a
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 592df89027
.
2014-09-16 10:19:29 +02:00
Remi Collet
ad0b63cad4
NEWS
2014-09-15 13:31:17 +02:00
Remi Collet
8cac75969e
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
2014-09-15 13:29:55 +02:00
Anatol Belski
24b41a23b3
updated NEWS
2014-09-15 10:27:52 +02:00
Remi Collet
6dc6daf7e3
Fix NEWS
...
- #65641 mod_proxy-fcgi is not fixed (still open)
- #67606 mod_fastcgi is fixed in ee275e34c8
2014-09-15 08:24:10 +02:00
Remi Collet
3411fe33a2
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 ee275e34c8
2014-09-15 08:23:40 +02:00
Remi Collet
2775dc2b44
Fix NEWS
...
- #65641 mod_proxy-fcgi is not fixed (still open)
- #67606 mod_fastcgi is fixed in ee275e34c8
2014-09-15 08:23:25 +02:00
Anatol Belski
fdfc31a4f7
fixed the cast and incompatible pointer warning
2014-09-12 14:36:00 +02:00
Anatol Belski
69ea7f9509
reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
2014-09-11 23:30:01 +02:00
Anatol Belski
dff820cea3
fix precision when fetching float through mysqlnd
...
fixes failing ext/mysqli/tests/010.phpt
2014-09-10 19:29:11 +02:00
Michael Wallner
3b78a24ee9
make LTP version check a blacklist
2014-09-10 13:30:52 +02:00
Daniel Lowrey
bf2f80b223
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
2014-09-09 09:27:20 -06:00
Daniel Lowrey
372844918a
Bug #41631 : Fix regression from first attempt ( 6569db8
)
2014-09-09 09:01:42 -06:00
Daniel Lowrey
f86b2193a4
Bug #67965 : Fix blocking behavior in non-blocking crypto streams
2014-09-09 07:37:57 -06:00
Tjerk Meesters
b9ac5e23fb
Updated NEWS for #67985
2014-09-09 18:02:45 +08:00
Tjerk Meesters
aca474fa14
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
2014-09-09 18:00:49 +08:00
Tjerk Meesters
99f0760bfb
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.
2014-09-09 17:58:45 +08:00
George Wang
bdac08bcdd
Fine tuned the order of adding request variables.
2014-09-09 00:00:14 -04:00
George Wang
d2e1a04b10
Fine tuned the order of adding request variables.
2014-09-08 23:58:05 -04:00
Adam Harvey
bc44eb6172
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.
2014-09-08 19:25:14 +00:00
George Wang
b16929ca72
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-09-03 11:28:30 -04:00
George Wang
bba16dde5d
Update LSAPI to 6.7, added support for 'filter_input'.
...
Fixed a crash in CLI mode.
2014-09-03 11:27:54 -04:00
George Wang
582f42b8d4
Update LSAPI to 6.7, added support for 'filter_input'.
...
Fixed a crash in CLI mode.
2014-09-03 11:24:45 -04:00
Julien Pauli
9266227402
5.5.18 now
2014-09-03 10:18:51 +02:00
Matteo Beccati
72c9b0e12b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test with freetype >= 2.4.12
2014-09-03 09:44:59 +02:00
Matteo Beccati
592df89027
Fixed test with freetype >= 2.4.12
2014-09-03 09:43:29 +02:00
Stanislav Malyshev
a734acd439
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.34 is next
Conflicts:
configure.in
main/php_version.h
2014-09-02 15:03:54 -07:00
Stanislav Malyshev
5e95b61639
5.4.34 is next
2014-09-02 15:03:04 -07:00
Stanislav Malyshev
70f92aa97e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
2014-09-02 14:18:05 -07:00
Stanislav Malyshev
fe551c089a
Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
...
This reverts commit 53fa6c5b6b
.
The change breaks tests, so not putting it into 5.4.
2014-09-02 14:15:39 -07:00
Stanislav Malyshev
af85eff5b6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67644 - Memory corruption & crash during ob_start function callback
2014-09-02 12:32:03 -07:00
Stanislav Malyshev
53fa6c5b6b
Fix bug #67644 - Memory corruption & crash during ob_start function callback
2014-09-02 12:31:03 -07:00