Dmitry Stogov
2f5ab04c5f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed tests
2013-12-02 12:04:07 +04:00
Dmitry Stogov
edbefd1d5c
Fixed tests
2013-12-02 11:53:35 +04:00
Anatol Belski
696d286911
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
And here is the real fix for #66124
Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
2013-11-21 21:29:35 +01:00
Anatol Belski
ad5a63e8bc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed test
2013-11-21 21:29:02 +01:00
Anatol Belski
345032946c
fixed test
2013-11-21 21:24:47 +01:00
Yasuo Ohgaki
bf91f101a6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:25:04 +09:00
Yasuo Ohgaki
b8b92bd790
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:23:54 +09:00
Yasuo Ohgaki
0d558afc05
Fix WS in serialization_error_002.phpt
2013-11-20 07:17:53 +09:00
Aaron Hamid
050dd59c63
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:14:53 +09:00
Jeff Welch
72a8489a12
Fixed tests that fail with non-default serialize_precision
configurations.
...
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
2013-11-20 06:17:34 +09:00
Jeff Welch
101c780500
Fixed tests that fail with non-default serialize_precision
configurations.
...
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
2013-11-20 06:17:23 +09:00
Jeff Welch
b4210efe76
Fixed tests that fail with non-default serialize_precision
configurations.
...
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
2013-11-20 06:14:32 +09:00
Xinchen Hui
140a42f779
Merge branch 'PHP-5.5' into PHP-5.6
2013-11-17 17:20:13 +08:00
Xinchen Hui
de79c51555
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-17 17:05:04 +08:00
Xinchen Hui
823e330c75
Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string)
2013-11-17 17:04:37 +08:00
Remi Collet
74ab30e216
fix merge
2013-11-13 13:21:12 +01:00
Remi Collet
018b9445da
Fix failed test with recent glibc
...
In recent version of strptime glibc upstream has fixed a discrepancy between
documentation and actual behaviour by skipping over the sequence that would match %Z.
See ddc7e412ab
So when %Z is used in format
glibc <= 2.18 returns the GMT as unparsed
glibc >= 2.19 returns empty string
Removing %Z from tested format gives the same behavior with all version.
2013-11-13 13:19:10 +01:00
Nikita Popov
dc4bf922d9
Allow $num=0 in array_fill()
...
Implemented request #49824 .
2013-11-12 22:02:51 +01:00
Dmitry Stogov
4e6a0bd5a9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added tests for PHAR/OPCahce incompatibilities
Update NEWS
Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
Update NEWS
Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
NEWS entry
NEWS entry
Conflicts:
NEWS
2013-11-08 14:15:41 +04:00
Xinchen Hui
5f17c4d08e
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-08 15:33:27 +08:00
Xinchen Hui
cf2626f10c
Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
...
previous codes: "#define php_mblen(ptr, len) ((ptr) == NULL ? mbsinit(&BG(mblen_state)):
(int)mbrlen(ptr, len, &BG(mblen_state)))#
it use mbsinit there, seems try to initialize the mblen_state, but:
"This function does not change the state identified by ps. Typical ways
to make the state pointed by ps an initial state are:
memset (ps,0,sizeof(*ps)); // ps points to zero-valued object
"
http://www.cplusplus.com/reference/cwchar/mbsinit/?kw=mbsinit
2013-11-08 15:32:28 +08:00
Ferenc Kovacs
91108818e1
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/spl/tests/SplFileObject_rewind_error001.phpt
2013-11-06 10:46:34 +01:00
Sara Golemon
8b6b39fdcf
Add a couple more test cases to parse_url() tests
...
http://::# (valid but silly)
http://# (invalid)
2013-11-06 10:32:11 +01:00
ptarjan
290becb1f1
fix missing change from 'tcp_socket' to the more common 'server'
2013-11-06 10:32:00 +01:00
ptarjan
9c1e1bbc05
fix many parallel test issues
...
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.
Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
2013-11-06 10:31:47 +01:00
Sherif Ramadan
98c9e56ef0
Merge branch 'pull-request/287'
...
Add ability to use array keys with array_filter().
This adds a third (optional) argument to array_filter() that will determine
what gets passed to the callback, the array key, value or both.
The third argument can be one of two constants: ARRAY_FILTER_USE_BOTH or,
ARRAY_FILTER_USE_KEY.
2013-10-30 09:36:19 -04:00
Nikita Popov
82eca388d2
Fix ZTS build
2013-10-29 20:01:37 +01:00
Yasuo Ohgaki
416f8fce5c
Implemented Change crypt() behavior w/o salt RFC
2013-10-29 18:53:45 +09:00
Yasuo Ohgaki
3cf2682083
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:30:58 +09:00
Yasuo Ohgaki
d04bcb8969
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:28:35 +09:00
Yasuo Ohgaki
4dc4302a30
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:24:23 +09:00
Dmitry Stogov
b0f9768e02
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improved performance of array_merge() by eliminating useless copying
Conflicts:
NEWS
2013-10-28 13:47:37 +04:00
Dmitry Stogov
5c0890ba8a
Improved performance of array_merge() by eliminating useless copying
2013-10-28 13:31:44 +04:00
Antony Dovgal
605b3c2ca1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #65936 (dangling context pointer causes crash)
2013-10-21 15:10:15 +04:00
Antony Dovgal
b636c03426
fix bug #65936 (dangling context pointer causes crash)
...
reported by Leon Sorokin
2013-10-21 15:09:29 +04:00
Michael Wallner
6764993358
Merge branch 'PHP-5.5'
...
* PHP-5.5:
remove TRAVIS check in test source
Just SKIP that test on travis
2013-10-21 12:21:21 +02:00
Michael Wallner
fb610b4e80
remove TRAVIS check in test source
2013-10-21 12:18:58 +02:00
Michael Wallner
825174e480
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Just SKIP that test on travis
2013-10-21 12:18:10 +02:00
Michael Wallner
2ecf94e07e
Just SKIP that test on travis
2013-10-21 12:16:41 +02:00
Nikita Popov
9b46a15a6e
Remove extraneous NULL check of Z_ARRVAL_P()
...
Z_ARRVAL_P() is never NULL
2013-10-19 23:52:23 +02:00
Nikita Popov
870d3e75ca
Remove dead comparison (size_t < 0)
2013-10-19 23:46:09 +02:00
Nikita Popov
1292091670
Fix misleading sizeof
...
An array of zval* is allocated, but sizeof(zval **) is used.
Makes no practical difference as sizeof(zval *) == sizeof(zval **).
2013-10-19 23:43:05 +02:00
Michael Wallner
3f2fba4c34
Merge branch 'updated_tls_support' of https://github.com/rdlowrey/php-src
...
* 'updated_tls_support' of https://github.com/rdlowrey/php-src :
Added support for TLSv1.1 and TLSv1.2
Conflicts:
ext/openssl/xp_ssl.c
2013-10-17 15:27:15 +02:00
Michael Wallner
dd3a4c303b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert "TLS news"
Revert "Added support for TLSv1.1 and TLSv1.2"
2013-10-17 15:22:07 +02:00
Michael Wallner
8aaecef524
Revert "Added support for TLSv1.1 and TLSv1.2"
...
This reverts commit 2aaa3d538a
.
2013-10-17 15:20:38 +02:00
Michael Wallner
5a7ca69e56
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added support for TLSv1.1 and TLSv1.2
Conflicts:
ext/openssl/xp_ssl.c
2013-10-17 14:53:50 +02:00
Daniel Lowrey
2aaa3d538a
Added support for TLSv1.1 and TLSv1.2
...
Conflicts:
ext/openssl/xp_ssl.c
2013-10-17 14:49:44 +02:00
Michael Wallner
bd666e2f99
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Assume the free space is correct on Travis CI.
2013-10-17 12:12:26 +02:00
Tjerk Meesters
51b809e3ad
Assume the free space is correct on Travis CI.
2013-10-17 12:12:05 +02:00
Paul Tarjan
a2eacd8a2c
fix typo in copy_variation16 test
2013-10-14 23:54:59 -07:00
Daniel Lowrey
2ddefbd2b3
Added support for TLSv1.1 and TLSv1.2
2013-10-08 14:09:17 -04:00
Michael Wallner
5d430ad902
fix bad cast
2013-10-08 11:16:53 +02:00
Michael Wallner
f72ed22749
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
2013-10-04 16:17:46 +02:00
Michael Wallner
d72a4d1634
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
2013-10-04 16:17:37 +02:00
Michael Wallner
8973390541
fix bug #64146 (serialize incorrectly saving objects when they are
...
cloned)
2013-10-04 16:16:15 +02:00
Michael Wallner
39022ba227
Merge branch 'PHP-5.5'
...
* PHP-5.5:
such a weird hack probably helps in finding regressions in the future
2013-10-04 16:12:41 +02:00
Michael Wallner
adfb5ab7ce
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
such a weird hack probably helps in finding regressions in the future
2013-10-04 16:12:23 +02:00
Michael Wallner
e8ae795529
such a weird hack probably helps in finding regressions in the future
2013-10-04 16:11:49 +02:00
Michael Wallner
d29a01de3f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #61548
Conflicts:
ext/standard/http_fopen_wrapper.c
2013-10-01 11:11:48 +02:00
Michael Wallner
ad139d9a00
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #61548
2013-10-01 11:08:20 +02:00
Michael Wallner
18b04b480e
Fixed bug #61548
2013-10-01 11:07:55 +02:00
Tjerk Meesters
75ba75e205
Using only two constants to signal use type intent.
2013-09-28 00:06:04 +08:00
datibbaw
0492145e58
added bitmask variation
2013-09-28 00:06:04 +08:00
Tjerk Anne Meesters
b8653d3457
fixed test case to pass on other systems than my own
2013-09-28 00:06:03 +08:00
datibbaw
6442e49b22
forgot introspection changes
2013-09-28 00:06:03 +08:00
datibbaw
a88c7be88b
added use_keys argument to array_filter()
2013-09-28 00:06:03 +08:00
Sara Golemon
92fe33c570
Merge branch 'pull-request/473'
2013-09-26 13:24:08 -07:00
Nikita Popov
0d7a638866
Implement variadic function syntax
...
As per RFC: https://wiki.php.net/rfc/variadics
2013-09-26 18:39:17 +02:00
ptarjan
361e984e46
fix missing change from 'tcp_socket' to the more common 'server'
2013-09-26 01:06:36 -07:00
ptarjan
ecbe4af0de
fix many parallel test issues
...
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.
Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
2013-09-26 00:30:23 -07:00
Michael Wallner
002763fb7b
fix test concurrency
2013-09-18 10:52:18 +02:00
Michael Wallner
e6084da473
final bits
2013-09-17 13:59:49 +02:00
Michael Wallner
423c70fb4d
Merge branch 'slim-postdata-merge'
...
* slim-postdata-merge:
remove unused code
tests
make reading php://input JIT if enable_post_data_reading=0
revert stream cast
fix ZTS build
slim post data
Conflicts:
ext/soap/soap.c
ext/standard/php_fopen_wrapper.c
main/SAPI.c
2013-09-17 13:52:25 +02:00
Michael Wallner
0f78d8612a
we need to use the full stream wrapper for filters
2013-09-17 13:44:50 +02:00
Michael Wallner
1c15d70cbd
Merge branch 'slim-postdata'
...
* slim-postdata:
slim post data
add NEWS entry; add simple test
more precise condition
make this work in vc11 too
Use int64_t and atoll() after discussion with johannes
ws
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
2013-09-17 10:50:49 +02:00
Michael Wallner
ca3d5d06e4
use 65k of data to get a more explicit result
2013-09-16 10:50:02 +02:00
Michael Wallner
52bd9f05ea
this test is fragile on travis, let's see why
2013-09-16 09:29:42 +02:00
Michael Wallner
2e692b22e9
fix broken sha2 configure tests
...
see http://patch-tracker.debian.org/patch/series/view/php5/5.5.3+dfsg-1/fix_broken_sha2_test.patch
2013-09-13 12:56:38 +02:00
Michael Wallner
9eaffd34c1
fix broken sha2 configure tests
...
see http://patch-tracker.debian.org/patch/series/view/php5/5.5.3+dfsg-1/fix_broken_sha2_test.patch
2013-09-13 12:56:26 +02:00
Adam Harvey
8983a38d51
Request non-keep-alive connections by default in HTTP 1.1 requests.
...
As noted in FR #65634 , at present we don't send a Connection request header
when the protocol version is set to 1.1, which means that RFC-compliant Web
servers should respond with keep-alive connections. Since there's no way of
reusing the HTTP connection at present, this simply means that PHP will appear
to hang until the remote server hits its connection timeout, which may be quite
some time.
This commit sends a "Connection: close" header by default when HTTP 1.1 (or
later) is requested by the user via the context options. It can be overridden
by specifying a Connection header in the context options. It isn't possible to
disable sending of the Connection header, but given "Connection: keep-alive" is
the same as the default HTTP 1.1 behaviour, I don't see this as a significant
issue — users who want to opt in for that still can.
As a note, although I've removed an efree(protocol_version), this doesn't
result in a memory leak: protocol_version is freed in the out: block at the end
of the function anyway, and there are no returns between the removed efree()
and the later call. Yes, I ran the tests with valgrind to check that. ☺
Implements FR #65634 (HTTP wrapper is very slow with protocol_version 1.1).
2013-09-11 14:11:29 -07:00
Michael Wallner
71bee63fad
remove unused code
2013-09-10 13:16:24 +02:00
Michael Wallner
449d4c0b1c
make reading php://input JIT if enable_post_data_reading=0
2013-09-10 13:13:33 +02:00
Nikita Popov
47ee470992
Make use of direct returns in some places
2013-08-31 13:16:50 +02:00
Michael Wallner
bb1f9d3826
slim post data
2013-08-27 13:43:22 +02:00
Michael Wallner
2438490add
slim post data
2013-08-27 13:31:35 +02:00
Stanislav Malyshev
524fab3e41
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Expose fputcsv's escape_char to userland
2013-08-24 20:46:03 -07:00
Joey Smith
2139d2702d
Expose fputcsv's escape_char to userland
...
Allows users to assert that something other than the backslash
should be considered an escape char; also follows the RFC 4180
recommendation that fields containing a " be enclosed.
2013-08-24 20:45:14 -07:00
Stanislav Malyshev
8ee126f0bb
Merge branch 'pull-request/414'
...
* pull-request/414:
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
2013-08-24 19:49:59 -07:00
Stanislav Malyshev
bdccf0a61d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
Update NEWS
2013-08-24 19:49:27 -07:00
Michael M Slusarz
3f9af558e7
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
2013-08-24 19:45:54 -07:00
Michael Wallner
4abee3730f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:18:29 +02:00
Michael Wallner
6181948592
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:18:11 +02:00
Michael Wallner
d8023d13eb
Fix pointer sign warning showing up in EVERY build
2013-08-21 19:17:22 +02:00
Anthony Ferrara
90b489f826
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix return types of password API helper functions.
2013-08-21 12:11:10 -04:00
Anthony Ferrara
83e3466898
Fix return types of password API helper functions.
...
This fixes issues that were found during static analysis by cjones where failure was impossible to detect due to return type mangling (casting an int to a char, then comparing to an int).
2013-08-21 12:10:40 -04:00
Anatol Belski
827100df82
split the glob() test to test different basedir
2013-08-20 13:40:19 +02:00
Michael M Slusarz
5201a2d566
Fix #65483 : quoted-printable encode stream filter incorrectly encoding spaces
2013-08-20 01:12:12 -06:00
Michael Wallner
73cd2e0ab1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #65481 (shutdown segfault due to serialize)
2013-08-20 00:09:26 +02:00
Michael Wallner
9d2cdacf4a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #65481 (shutdown segfault due to serialize)
Conflicts:
ext/standard/var_unserializer.c
2013-08-20 00:08:55 +02:00
Michael Wallner
1ac4d8f2c6
fix bug #65481 (shutdown segfault due to serialize)
2013-08-20 00:05:11 +02:00
Anatol Belski
f4df40108b
fixed glob() edge case on windows, ref bug #47358
2013-08-19 14:21:16 +02:00
Anatol Belski
f61b648da4
modified the new glob() test for master
2013-08-19 11:22:18 +02:00
Anatol Belski
6c570ad322
Merge branch 'PHP-5.5'
...
* PHP-5.5:
added new glob() test
2013-08-19 11:21:47 +02:00
Anatol Belski
cdc64f0345
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added new glob() test
2013-08-19 11:19:42 +02:00
Anatol Belski
4bad49e3bc
added new glob() test
2013-08-19 11:17:13 +02:00
Stanislav Malyshev
03b2603ce0
Merge branch 'PHP-5.5'
...
* PHP-5.5:
code related typo fixes
Fix duplicated 5.5.2 NEWS in my tree
2013-08-18 13:47:00 -07:00
Veres Lajos
144eab0889
code related typo fixes
2013-08-18 13:46:32 -07:00
Christopher Jones
4824d0f43e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reduce compiler noise by removing unused variables and labels
2013-08-14 21:08:55 -07:00
Christopher Jones
cd14de94d2
Reduce compiler noise by removing unused variables and labels
2013-08-14 21:06:59 -07:00
Christopher Jones
3c166c4758
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/gmp/gmp.c
2013-08-14 20:47:00 -07:00
Christopher Jones
39612afc72
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/dba/libinifile/inifile.c
2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
2013-08-14 20:36:50 -07:00
Christopher Jones
759517651e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:47:42 -07:00
Christopher Jones
8c61758dc7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:45:46 -07:00
Christopher Jones
9d62807190
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:45:06 -07:00
Michael Wallner
14caf174ff
unify stdint type usage
...
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
Stanislav Malyshev
68e8326e0e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
non living code related typo fixes
2013-08-04 16:07:13 -07:00
Stanislav Malyshev
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
Xinchen Hui
55d335fa95
Merge branch 'PHP-5.5'
2013-08-02 18:43:17 +08:00
Xinchen Hui
47ac4f8670
Fixed tests (inet_pton behaves differently on Darwin)
2013-08-02 18:43:08 +08:00
Andrey Hristov
92d27ccb05
Constify streams API and a few other calls down the rabbit hole.
...
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
2013-07-30 12:49:36 +02:00
Stanislav Malyshev
46cc826770
Merge branch 'pull-request/231'
...
* pull-request/231:
update Zend Engine logo as per Zeev, and tweak PHP logos ... :)
fix for scrolling, other minor tweaks
Bump up table width a bit more and make columns consistent
Bringing CSS up to this decade's standards.
2013-07-21 22:49:26 -07:00
Stanislav Malyshev
02457554a3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
backward compatibility
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:10:31 -07:00
Veres Lajos
4749457a49
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:09:53 -07:00
Xinchen Hui
a522f2d1c9
Merge branch 'PHP-5.5'
2013-07-21 21:07:50 +08:00
Xinchen Hui
c7b58e4967
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-21 21:07:27 +08:00
Xinchen Hui
3380de9774
Fixed bug #65304 (Use of max int in array_sum)
2013-07-21 21:07:19 +08:00
Arpad Ray
b594949144
Merge branch 'PHP-5.5'
...
* PHP-5.5:
regenerate url scanner
Fixed bug #50308 - session id not appended properly for empty anchor tags
2013-07-17 16:28:12 +01:00
Arpad Ray
31edf4df56
regenerate url scanner
2013-07-17 16:28:01 +01:00
Arpad Ray
94ab37f06a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #50308 - session id not appended properly for empty anchor tags
2013-07-17 16:19:53 +01:00
Arpad Ray
e6ae977082
Fixed bug #50308 - session id not appended properly for empty anchor tags
...
The issue was actually because a lack of space before a "/" marking the tag
as empty. This was being swallowed in the rule for unquoted values. Fixed
by making that rule exclude quotes (as per spec anyway).
2013-07-17 16:07:26 +01:00
Anatol Belski
12aec9ec8e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
added sapi check for dl() test
2013-07-16 15:43:59 +02:00
Anatol Belski
f37ac6f591
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added sapi check for dl() test
2013-07-16 15:43:37 +02:00
Anatol Belski
135f81c5ae
added sapi check for dl() test
2013-07-16 15:42:38 +02:00
Veres Lajos
2c73ce4363
revert false fix
2013-07-15 00:23:17 -07:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
b79b13b4ef
less serious compatAbility fixes
2013-07-15 00:21:39 -07:00
Veres Lajos
c2088f8b81
revert false fix
2013-07-15 00:19:56 -07:00
Veres Lajos
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
Veres Lajos
d17e8ac32f
less serious compatAbility fixes
2013-07-15 00:19:39 -07:00
Veres Lajos
f23a5fbc8e
revert false fix
2013-07-15 00:19:07 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Veres Lajos
227556c6a2
less serious compatAbility fixes
2013-07-15 00:17:35 -07:00
Anatol Belski
14b67ed6da
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix uninitialized memory usage
2013-07-14 20:46:48 +02:00
Anatol Belski
168a5bb6df
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix uninitialized memory usage
2013-07-14 20:46:19 +02:00
Anatol Belski
add0833681
fix uninitialized memory usage
2013-07-14 20:44:29 +02:00
Anatol Belski
ecf057d197
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #65226 chroot() does not get enabled
2013-07-11 00:49:41 +02:00
Anatol Belski
2acc386270
Fixed bug #65226 chroot() does not get enabled
2013-07-11 00:48:12 +02:00
Sara Golemon
95017c0522
Add a couple more test cases to parse_url() tests
...
http://::# (valid but silly)
http://# (invalid)
2013-07-10 08:26:47 -07:00
Anatol Belski
ecb55dd9f5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
Fixed bug #65226 chroot() does not get enabled
2013-07-11 00:52:08 +02:00
Yasuo Ohgaki
870d238b06
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added warning for hex2bin() when input is invalid string
Update NEWS
2013-07-08 19:15:04 +09:00
Yasuo Ohgaki
bde0f1318a
Added warning for hex2bin() when input is invalid string
2013-07-08 19:14:45 +09:00
Xinchen Hui
11b757d53e
Merge branch 'PHP-5.5'
2013-07-08 11:21:54 +08:00
Ben Ramsey
d1c261d7f8
array_column: Changing integer in test output to use %d
2013-07-06 20:50:34 +00:00
Felipe Pena
c743d0c9dc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed test
2013-06-26 13:36:50 -03:00
Felipe Pena
32f11e4ee6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed test
2013-06-26 13:36:41 -03:00
Felipe Pena
f477ad22c2
- Fixed test
2013-06-26 13:36:36 -03:00
Andrey Hristov
793694b9d8
Merge branch 'PHP-5.5'
2013-06-26 16:51:42 +02:00
Andrey Hristov
781be5f1d7
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-06-26 16:50:08 +02:00
Andrey Hristov
b34e8d2e3e
add new test
2013-06-26 16:44:26 +02:00
Felipe Pena
f0823ac493
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
- BFN
2013-06-25 18:00:47 -03:00
Felipe Pena
adb116dd48
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
- BFN
2013-06-25 18:00:42 -03:00
Felipe Pena
41b73e4cee
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
2013-06-25 18:00:33 -03:00
David Soria Parra
c1b8fbc112
Update credits
2013-06-19 22:03:18 +02:00
Anatol Belski
d9f538bc68
Merge branch 'PHP-5.5'
...
* PHP-5.5:
added some tests based on bug #64395
2013-06-19 16:25:08 +02:00
Anatol Belski
2873b5b6eb
added some tests based on bug #64395
2013-06-19 16:24:30 +02:00
Stanislav Malyshev
1143f58a70
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'pull-request/320'
Merge branch 'pull-request/320'
2013-06-17 01:07:28 -07:00
Stanislav Malyshev
af5e2eaf8d
Merge branch 'pull-request/320'
...
* pull-request/320:
this is test 5 not 6
fix race condition
more shared names that create race conditions
change to a unique filename
more shared filenames
yet another shared filename
don't share a filename to stop race conditions
fix race condition for 2-4 and normalize names for others
fix race condition when running tests in parallel
clean up after test
Fix #64572 : Clean up after the test
Fix #64572 : Clean up after the test
2013-06-17 01:06:20 -07:00
Stanislav Malyshev
6b896fa57f
Merge branch 'pull-request/320'
...
* pull-request/320:
this is test 5 not 6
fix race condition
more shared names that create race conditions
change to a unique filename
more shared filenames
yet another shared filename
don't share a filename to stop race conditions
fix race condition for 2-4 and normalize names for others
fix race condition when running tests in parallel
clean up after test
Fix #64572 : Clean up after the test
Fix #64572 : Clean up after the test
2013-06-17 01:06:01 -07:00
Stanislav Malyshev
e3cd0d1417
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add more tests for bug #64166
Move unsigned char declaration to top of block
trailing ws
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
2013-06-16 16:39:06 -07:00
Stanislav Malyshev
7d1fef15cf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add more tests for bug #64166
Move unsigned char declaration to top of block
trailing ws
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
2013-06-16 16:38:49 -07:00
Stanislav Malyshev
7bb052ee3e
add more tests for bug #64166
2013-06-16 16:34:34 -07:00
Michael M Slusarz
0dc98208ee
Move unsigned char declaration to top of block
2013-06-16 16:04:29 -07:00
Michael M Slusarz
d9c034ee5e
trailing ws
2013-06-16 16:04:24 -07:00
Michael M Slusarz
b5b0a53b09
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
...
Second attempt: need to use lookaheadto determine whether to encode ws
2013-06-16 16:04:19 -07:00
Michael M Slusarz
600d6deef9
Fix #64166 : quoted-printable-encode stream filter incorrectly discarding whitespace
...
If trailing whitespace on a line is detected, mark the linebreak as a
soft linebreak.
2013-06-16 16:04:14 -07:00
Anatol Belski
fd706595d4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix test
2013-06-17 00:11:05 +02:00
Anatol Belski
3625b83aaa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
2013-06-17 00:10:32 +02:00
Anatol Belski
b6dd1ec60d
fix test
...
breach introduced in ac40c0b562
2013-06-17 00:09:05 +02:00
Anatol Belski
c1772cc3df
Merge branch 'PHP-5.5'
...
* PHP-5.5:
ensure the error_reporting level to get expected notice
2013-06-12 13:15:32 +02:00
Anatol Belski
a0cb61b292
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
ensure the error_reporting level to get expected notice
2013-06-12 13:15:18 +02:00
Anatol Belski
ed2690477c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
ensure the error_reporting level to get expected notice
2013-06-12 13:14:53 +02:00
Anatol Belski
cd1b44c4b6
ensure the error_reporting level to get expected notice
2013-06-12 13:13:48 +02:00
Stanislav Malyshev
8ac131503d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
2013-06-10 14:31:57 -07:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Stanislav Malyshev
09bc6d7cf6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
typo fixes (argument)
typo fixes (accommodate, parameter)
2013-06-10 13:37:56 -07:00
Stanislav Malyshev
84e35fb2e0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typo fixes (argument)
typo fixes (accommodate, parameter)
2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa
typo fixes (argument)
2013-06-10 13:36:17 -07:00
Veres Lajos
ed2e84e239
typo fixes (accommodate, parameter)
2013-06-10 13:36:03 -07:00
Anatol Belski
c6b569011a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #64934 Apache2 TS crash with get_browser()
2013-06-06 18:53:41 +02:00
Anatol Belski
bbdbef40db
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64934 Apache2 TS crash with get_browser()
2013-06-06 18:52:39 +02:00
Anatol Belski
25cae37b13
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64934 Apache2 TS crash with get_browser()
2013-06-06 18:51:32 +02:00
Anatol Belski
1aee7ad636
Fixed bug #64934 Apache2 TS crash with get_browser()
...
In favour of reading the browscap.ini into a true global var
only once in MINIT, the price for that is to deep copy the
any data from it.
2013-06-06 18:49:04 +02:00
Stanislav Malyshev
3c8c200d0a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 22:01:02 -07:00
Stanislav Malyshev
785f4c5fc6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 22:00:45 -07:00
Stanislav Malyshev
efdeec3c0e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 21:58:44 -07:00
Stanislav Malyshev
93e0d78ec6
fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 21:56:33 -07:00
Sara Golemon
cfd1045822
Add optional second arg to unserialize()
...
Returns the number of bytes consumed by reference for
streaming unserialization.
Actual unserialization behavior is not modified at all.
The need for this came up while trying to parse SplDoublyLinkedList's
serialization format which uses a non-standard stream of serialized values.
2013-05-16 15:18:35 -07:00
David Soria Parra
c5841f8cb7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix array_colum segfault
2013-05-15 14:43:03 +02:00
David Soria Parra
139e9824ad
Fix array_colum segfault
...
Separate zval to avoid gc from freeing
2013-05-15 14:42:39 +02:00
Anatol Belski
a14a809aff
Merge branch 'PHP-5.5'
...
* PHP-5.5:
better fix for bug #64770
better fix for bug #64770
2013-05-04 12:20:36 +02:00
Anatol Belski
b2ef8672c7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
better fix for bug #64770
better fix for bug #64770
2013-05-04 12:20:19 +02:00
Anatol Belski
ec4388158d
better fix for bug #64770
2013-05-04 12:19:52 +02:00
Anatol Belski
5c701d19ac
better fix for bug #64770
2013-05-04 12:16:38 +02:00
Anatol Belski
88c83469b5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #64770 stream_select() fails with pipes
2013-05-03 17:06:16 +02:00
Anatol Belski
6d41711fd9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed bug #64770 stream_select() fails with pipes
2013-05-03 17:04:53 +02:00
Anatol Belski
aa4762572e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #64770 stream_select() fails with pipes
2013-05-03 17:03:16 +02:00
Anatol Belski
b1ea0b7a7a
Fixed bug #64770 stream_select() fails with pipes
...
returned by proc_open() on Windows x64
2013-05-03 17:01:33 +02:00
Matt Ficken
67a72ceb93
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix Test Bug #64714
2013-04-25 11:37:36 -07:00
Matt Ficken
7d0dd957eb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix Test Bug #64714
2013-04-25 11:37:25 -07:00
Matt Ficken
5adf1be45d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix Test Bug #64714
2013-04-25 11:37:09 -07:00
Matt Ficken
bf5506f511
Fix Test Bug #64714
2013-04-25 11:34:57 -07:00
Stanislav Malyshev
84e5c8a0e2
update credits
2013-04-23 22:02:57 -07:00
Stanislav Malyshev
50800356af
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:46:27 -07:00
Stanislav Malyshev
5e24a6e74d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:45:49 -07:00
Stanislav Malyshev
2a15aed399
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:45:10 -07:00
Stanislav Malyshev
f87d2ab893
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:43:55 -07:00
Stanislav Malyshev
18fdab5a09
Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:43:35 -07:00
Pierrick Charron
74394733ed
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove curl wrappers
2013-04-23 17:01:50 -04:00
Pierrick Charron
b79e65f268
Remove curl wrappers
2013-04-23 17:01:17 -04:00
Sara Golemon
231e2d762a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
array_column() - Use entire subject array when NULL passed for second param.
2013-04-22 16:20:41 -07:00
Sara Golemon
734e165d4e
array_column() - Use entire subject array when NULL passed for second param.
...
This starts to look like array_values(), except that you can reindex the arrays
using the third parameter.
2013-04-22 16:19:21 -07:00
Sara Golemon
35df484b5b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Allow array_column() to take -1 as a valid value in third param
2013-04-22 15:55:38 -07:00
Sara Golemon
1a03bd5dee
Allow array_column() to take -1 as a valid value in third param
...
Also do some cleanup and simplification to make this code more
readable in the long term.
2013-04-22 15:54:21 -07:00
Sara Golemon
caff01e751
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Harden array_column_basic.phpt against resource renumbering.
2013-04-22 13:37:36 -07:00
Sara Golemon
f63db963c4
Harden array_column_basic.phpt against resource renumbering.
...
We don't care what resource number it is, so long as there's a
stream resource returned.
2013-04-22 13:36:40 -07:00
Anatol Belski
8febe2ad08
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed stream_socket_pair() on Windows x64 and
2013-04-22 18:59:11 +02:00
Anatol Belski
f082d6311b
Fixed stream_socket_pair() on Windows x64 and
...
improved errorhandling in the socketpair() implementation.
2013-04-22 18:55:32 +02:00
Sara Golemon
70c700cf8c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix handling of double keys in array_column
2013-04-21 23:33:20 -07:00
Anatol Belski
8645309c4e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
updated NEWS
Fixed stream_socket_pair() on Windows x64 and
2013-04-22 19:01:07 +02:00
Anatol Belski
f578bb0388
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed stream_socket_pair() on Windows x64 and
2013-04-22 19:00:13 +02:00
Sara Golemon
7b34324f84
Fix handling of double keys in array_column
...
Also fix resource test to not localize __FILE__ to cwd.
2013-04-21 22:35:04 -07:00
Johannes Schlüter
e9cc55a803
Merge branch 'PHP-5.5'
2013-04-04 15:38:35 +02:00
Johannes Schlüter
9587cf385e
Improve warning when trying to load zend ext as PHP module
2013-04-04 15:36:46 +02:00
Xinchen Hui
2794d455ea
Merge branch 'PHP-5.5'
2013-04-04 19:31:21 +08:00
Xinchen Hui
01ca2bf8c3
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/curl/interface.c
2013-04-04 19:31:14 +08:00
Xinchen Hui
185e5e15ae
s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED,
2013-04-04 19:28:17 +08:00
Xinchen Hui
e15a97f924
Merge branch 'PHP-5.5'
2013-04-03 18:51:44 +08:00
Xinchen Hui
bbb4a44f98
Merge branch 'PHP-5.4' into PHP-5.5
2013-04-03 18:51:19 +08:00
ptarjan
99ad08f9a5
Fix #64572 : Clean up after the test
...
Lets not leave stuff lying around.
2013-04-03 18:50:27 +08:00
Xinchen Hui
bd6a90dac7
Merge branch 'PHP-5.5'
2013-04-03 10:17:49 +08:00
Xinchen Hui
6ace9c646b
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/curl/interface.c
2013-04-03 10:15:41 +08:00
Xinchen Hui
78a9489f6a
Use new constant replace ugly trick
2013-04-03 10:12:49 +08:00
Xinchen Hui
aa1c764e3e
Merge branch 'PHP-5.5'
2013-04-01 19:16:44 +08:00
Xinchen Hui
d8a5f41a60
Fixed bug parameter is casted to string of array_column
2013-04-01 19:11:45 +08:00
Xinchen Hui
971676e859
Merge branch 'PHP-5.5'
2013-03-31 21:27:22 +08:00
Xinchen Hui
ad7c0b1928
Merge branch 'PHP-5.4' into PHP-5.5
2013-03-31 21:26:26 +08:00
Xinchen Hui
72426a446d
Skip test when --with-curlwrappers enabled.
2013-03-31 21:22:48 +08:00