Remi Collet
97cab239d7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed bug #68103 Dupplicate entry in Reflection
2014-09-26 09:06:51 +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
Ferenc Kovacs
d27f3e7b64
update the certificate used for the test, as it expired recently
2014-09-24 13:40:52 +02:00
Remi Collet
0d776ef87b
Fix bug #68074 Allow to use system cipher list instead of hardcoded value
2014-09-24 10:34:55 +02:00
Ard Biesheuvel
8312836c74
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-20 16:42:12 -07: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
Anatol Belski
6213d9fc91
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix possible array underflow
2014-09-19 20:13:46 +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
24ed330a22
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed freetype test on multiple environments
2014-09-16 10:22:49 +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
Anatol Belski
13280a9e36
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
2014-09-11 23:31:16 +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
0b89bb83ba
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix precision when fetching float through mysqlnd
2014-09-10 19:31:59 +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
Matteo Beccati
0b648a424f
FR #67990 - Added nowait argument to sem_acquire
2014-09-10 07:31:25 +02:00
Daniel Lowrey
edb2799333
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #41631 : Fix regression from first attempt (6569db8
)
Bug #67965 : Fix blocking behavior in non-blocking crypto streams
2014-09-09 10:24:40 -06: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
Adam Harvey
0cbfdc9df5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
5.5.18 now
Conflicts:
configure.in
main/php_version.h
2014-09-08 19:28:15 +00: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
Nikita Popov
03797a73b2
Split GMP tests testing multiple functions
...
Also drop dummy test
2014-09-04 21:18:37 +02:00
Nikita Popov
9586b15229
Give proper names to GMP test files
2014-09-04 21:10:41 +02:00
Nikita Popov
15c139b99a
Throw warnings when using zero modulus in gmp_powm
...
Also fixes a leak in this case.
2014-09-04 20:55:09 +02:00
Nikita Popov
f10d194c8c
Add GMP tests for some uncovered branches
2014-09-04 20:03:29 +02:00
Tjerk Meesters
fa08ff9245
Fixed #67955 : SoapClient prepends 0-byte to cookie names
2014-09-04 06:58:04 +08:00
Philip Hofstetter
9befa8c5f7
fix bug #67955
...
this fixes a regression from 6c2a806820
.
smart_str_appendl is expecting the length as the length of the string,
but key_length is the byte length of the key, including the 0
terminator.
As such, the cookie name appeneded to the header would now also include
the 0 terminator of the key name which then would be sent to the server.
2014-09-03 14:35:40 +02:00
Matteo Beccati
627704b38e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test with freetype >= 2.4.12
2014-09-03 09:45:09 +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
Nikita Popov
834daa455b
Fixed bug #50175
...
0x and 0b prefix is now only handled if either no base is given
or if the base is 16 (0x) or 2 (0b). Always handling it is incorrect
because 0x and 0b are perfectly valid numbers in other bases.
2014-09-02 19:04:55 +02:00
Nikita Popov
7533243f0c
Fix C89 build and small cleanup
2014-09-02 18:52:13 +02:00
Leigh
47d630e7f0
Implement gmp_import() and gmp_export()
2014-09-02 14:19:18 +02:00
Tjerk Meesters
f54451cf39
Make DOMNode::textContent writeable
2014-09-02 06:34:18 +08:00
Derick Rethans
f89b7ec389
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-01 16:40:54 +01:00
Derick Rethans
21446cd7b6
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-01 16:40:50 +01:00
Derick Rethans
e665a07ab9
- Updated to version 2014.7 (2014g)
2014-09-01 16:40:49 +01:00
Tjerk Meesters
1bf996b324
Added test case
2014-09-01 22:04:25 +08:00
Tjerk Meesters
5270ee1aef
Making ini parser typed
...
- Added ZEND_INI_SCANNER_TYPED mode for parse_ini_string() and parse_ini_file()
- Added NULL_NULL token to separate it from BOOL_FALSE and BOOL_TRUE
- Added zend_ini_copy_typed_value() function for zval initialisation
- Updated RETURN_TOKEN() to observe scanner_mode
2014-09-01 22:04:06 +08:00
Anatol Belski
c301467f9b
Fixed bug #67731 finfo::file() returns invalid mime type for binary files
2014-08-30 04:04:42 +02:00
Nikita Popov
fc5f931663
Fix bug #67917 (gmp compound assignment operator leak)
2014-08-27 22:16:20 +02:00
Chris Wright
db03216e62
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix stream_select() issue with OpenSSL buffer
2014-08-27 16:06:28 +01:00
Chris Wright
30a73658c6
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
2014-08-27 16:01:18 +01:00
Chris Wright
32be79dcfa
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
2014-08-27 13:25:50 +01:00
Anatol Belski
4d667eeaf3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed DBG_INF macro name
2014-08-27 12:11:35 +02:00
Anatol Belski
7fac56e072
fixed DBG_INF macro name
2014-08-27 12:10:35 +02:00
Daniel Lowrey
546a32e2b3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #67850 : Build when OpenSSL compiled without SSLv3 support
Conflicts:
ext/openssl/xp_ssl.c
2014-08-25 18:16:38 +02:00
Daniel Lowrey
640214701c
Bug #67850 : Build when OpenSSL compiled without SSLv3 support
2014-08-25 17:28:09 +02:00