Joe Watkins
6bd30e8f1a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #74457 Wrong reflection on XMLReader::expand
2017-05-02 06:25:21 +01:00
Fabien Villepinte
4c0e50c88a
Fix bug #74457 Wrong reflection on XMLReader::expand
2017-05-02 06:24:46 +01:00
Joe Watkins
2735318c7b
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #74468 wrong reflection on Collator::sortWithSortKeys
2017-05-02 06:21:54 +01:00
Fabien Villepinte
f50df1d0e3
Fix bug #74468 wrong reflection on Collator::sortWithSortKeys
2017-05-02 06:20:40 +01:00
Anatol Belski
023cbdb2ca
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Tests to ensure BC with undocumented behavior used in hacks
2017-05-01 18:06:09 +02:00
Anatol Belski
a581e64199
Tests to ensure BC with undocumented behavior used in hacks
...
Should become obsolete, once behaviors change.
2017-05-01 18:01:05 +02:00
Nikita Popov
e3f411c9f7
Merge branch 'PHP-7.0' into PHP-7.1
2017-05-01 12:15:41 +02:00
Nikita Popov
1967950dc3
Fix typo in SplFixedArray has_dimension implementation
2017-05-01 12:15:26 +02:00
Jakub Zelenka
6028fe511e
Fix bug #73808 (iv length warning too restrictive for aes-128-ccm)
2017-04-30 19:46:27 +01:00
Andrea Faulds
9891b9ede2
Test ReflectionType support of iterable
2017-04-29 16:12:46 +01:00
Jakub Zelenka
a0b9554f94
Fix possible memory leak in openssl_encrypt and openssl_decrypt
2017-04-27 15:44:26 +01:00
Jakub Zelenka
d83d5f4198
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-27 15:11:52 +01:00
Jakub Zelenka
7b392c7154
Prefer using DIRECTORY_SEPARATOR in OpenSSL config path
2017-04-27 15:10:55 +01:00
Jakub Zelenka
e7166ea9be
Add oid_section to the testing openssl.cnf
...
It tests repeated OID addition
2017-04-27 15:09:58 +01:00
Anatol Belski
392bcba58d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Revert "Detect invalid port in xp_socket parse ip address"
Revert "Follow up patch regarding bug #74216 , see bug #74429 "
2017-04-27 11:11:41 +02:00
Anatol Belski
09ef61e3ca
Revert "Detect invalid port in xp_socket parse ip address"
...
This reverts commit bab0b99f37
.
2017-04-27 02:49:12 +02:00
Jakub Zelenka
c0203c0ceb
Do not add already added object to the internal OpenSSL table
...
This fixes OpenSSL 1.1 where adding object with OID that has been
already added causes an error - preventing of duplication.
2017-04-26 14:59:15 +01:00
Remi Collet
3f6d9fe9cc
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
rely on bundle config, instead of system one
2017-04-26 14:41:54 +02:00
Remi Collet
f639b64dca
rely on bundle config, instead of system one
2017-04-26 14:41:40 +02:00
Remi Collet
7962185ded
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
skip the test on OpenSSL < 1.1 for now
2017-04-26 14:39:14 +02:00
Anatol Belski
8cfaea656c
skip the test on OpenSSL < 1.1 for now
2017-04-26 14:39:03 +02:00
Jakub Zelenka
7260f65c62
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-24 17:12:55 +01:00
Jakub Zelenka
9fa347997a
Fix bug #73833 (null character not allowed in openssl_pkey_get_private)
2017-04-24 17:11:36 +01:00
Anatol Belski
f504e9eb72
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Support also no,shared configure arg vals by default
2017-04-24 16:22:16 +02:00
Anatol Belski
f7b8322b14
Support also no,shared configure arg vals by default
...
This indirectly fixes bug #74398 where --with-extname is expected to be
configured shared with our default dependency package. With a non
default deps, it still can be enforced --with-extname=static
2017-04-24 15:46:22 +02:00
Anatol Belski
f3c4e2f5bf
extend zlib export required for the recent libpng
2017-04-23 21:33:14 +02:00
Jakub Zelenka
ba83b18ce3
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-23 20:31:24 +01:00
Jakub Zelenka
366b1640d0
Fix bug #73711 (Segfault in openssl_pkey_new when generating DSA or DH key)
2017-04-23 20:30:14 +01:00
Anatol Belski
144ddd3b42
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
extend zlib export required for the recent libpng
2017-04-23 21:28:26 +02:00
Anatol Belski
2909742326
extend zlib export required for the recent libpng
2017-04-23 21:27:34 +02:00
Anatol Belski
000fe3aacc
Fixed bug #74489 readline() immediately returns false in interactive console mode
2017-04-22 18:33:53 +02:00
Joe Watkins
aa0a2e8c58
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Avoid exact floating point comparison
2017-04-20 06:42:44 +01:00
Steve Walk
9b7f13cb1b
Avoid exact floating point comparison
2017-04-20 06:42:20 +01:00
Xinchen Hui
0a27a5ba8c
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
...
* 'PHP-7.1' of git.php.net:/php-src:
Fix loop identification
2017-04-17 20:27:07 +08:00
Xinchen Hui
d6315c2fbb
Fixed bug #74456 (Segmentation error while running a script in CLI mode)
...
Instead of make update_op1_by_const supports FETCH_LIST(CASE), I think
disable it is more safe for 7.1
2017-04-17 20:24:39 +08:00
Nikita Popov
abf16c18c7
Fix loop identification
...
When assigning loop headers, we should treat already detected
loops as collapsed to their loop header, instead of ignoring them.
This fixes the loop header of BB2 in mandel2 if live-range CFG
splitting is enabled.
2017-04-17 12:17:32 +02:00
Joe Watkins
f69c108249
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
ext/gettext: respect passed in library directory for all checks
2017-04-17 08:12:02 +01:00
Michael Heimpold
32c5b8efd6
ext/gettext: respect passed in library directory for all checks
...
A directory given to configure by --with-gettext=dir is only
used within the very first AC_CHECK_LIB. This is because the
temporary modified LDFLAGS variable is reset too early.
This results in functions not detected properly.
The original issue and patch was reported for OpenWrt/LEDE
distribution by @Dimazhan at:
https://github.com/openwrt/packages/issues/4250
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-04-17 08:11:40 +01:00
Joe Watkins
bc3c9a06e0
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74080 Add datetime constant for RFC7231
2017-04-17 08:09:24 +01:00
Craig Duncan
618d97962a
Fixed bug #74080 Add datetime constant for RFC7231
2017-04-17 08:08:54 +01:00
Joe Watkins
0959e6f422
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74439 Wrong reflection on the Locale methods
2017-04-17 07:58:22 +01:00
Fabien Villepinte
7dc6b04f45
Fixed bug #74439 Wrong reflection on the Locale methods
2017-04-17 07:56:47 +01:00
Anatol Belski
039ef0143b
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
improve/fix error handling
2017-04-15 19:35:13 +02:00
Anatol Belski
ca543ff01c
improve/fix error handling
...
GetLastError() should not be called, if the function didn't fail.
2017-04-15 19:32:04 +02:00
Nikita Popov
00c6ce0e00
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-15 12:35:53 +02:00
Nikita Popov
0beccc51f1
Fix compact_literals of INIT_METHOD_CALL with CONST op1
2017-04-15 12:35:09 +02:00
Nikita Popov
6c2222796b
Improve fix for bug #74442
...
Make the check less conservative to be consistent with the other
cases.
2017-04-15 01:39:33 +02:00
Rasmus Lerdorf
d80df7a8bf
Credit goes to Eric Norris for this one
2017-04-14 15:48:24 -07:00
Nikita Popov
2f22dffd1a
Fixed bug #74442
2017-04-14 22:20:32 +02:00
Nikita Popov
3ffe2cd251
Fixed bug #74431
...
If the last instruction in a block is a NOP, then `new_opline`
here won't be a copy of `opline`, it will be a copy of the last
non-NOP opline. Avoid performing a spurious update by explicitly
checking for NOP.
2017-04-14 22:03:06 +02:00
ekinhbayar
5d095f80c9
Test for bug 74431
2017-04-14 21:26:02 +02:00
Johannes Schlüter
b760508adc
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-14 16:30:51 +02:00
Johannes Schlüter
35a28fac51
Add support for MySQL 8's Unicode types
2017-04-14 16:30:10 +02:00
Joe Watkins
bd32837acf
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74433 Wrong reflection on the Normalizer methods
2017-04-13 13:21:51 +01:00
Fabien Villepinte
f05d74feb8
Fixed bug #74433 Wrong reflection on the Normalizer methods
2017-04-13 13:21:05 +01:00
Remi Collet
77e3fef64f
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74416 Wrong reflection on DOMNode::cloneNode
2017-04-13 07:07:43 +02:00
Fabien Villepinte
bc4bb7882b
Fixed bug #74416 Wrong reflection on DOMNode::cloneNode
2017-04-13 07:07:24 +02:00
Christopher Jones
241cf47400
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-12 14:03:34 +10:00
Christopher Jones
f4a41fe750
Fixed uninitialized data causing random crash (Dmitry)
2017-04-12 14:02:46 +10:00
Anatol Belski
a334da8b17
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix misleading typo in identifiers
2017-04-11 13:49:19 +02:00
Anatol Belski
8bba2df2eb
Fix misleading typo in identifiers
2017-04-11 13:48:04 +02:00
Joe Watkins
8bbdbd063e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fixed bug #74413 wrong reflection on SQLite3::enableExceptions
2017-04-11 12:15:24 +01:00
Joe Watkins
b74b325aea
fixed bug #74413 wrong reflection on SQLite3::enableExceptions
2017-04-11 12:14:25 +01:00
Sebastian Bergmann
25c941807b
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-11 08:28:55 +02:00
Sebastian Bergmann
7cdf520319
Fix bug #74409
2017-04-11 08:27:17 +02:00
Nikita Popov
9493ebbab2
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-10 22:26:35 +02:00
Nikita Popov
6e23f2bceb
Forgot to commit test file...
2017-04-10 22:26:14 +02:00
Nikita Popov
1df3099f2f
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-10 22:11:47 +02:00
Nikita Popov
6f950e83eb
Fix JMPZ+JMP => NOP+JMP optimization
2017-04-10 22:09:34 +02:00
Joe Watkins
8c53c346d4
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
2017-04-10 12:51:17 +01:00
Joe Watkins
5c518f47e4
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
...
* 'PHP-7.1' of git.php.net:/php-src:
Update NEWS
Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
2017-04-10 12:51:00 +01:00
Joe Watkins
6a84762816
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74404 (wrong reflection on DateTimeZone::getTransitions)
2017-04-10 12:49:44 +01:00
Joe Watkins
d9e2f80375
Fixed bug #74404 (wrong reflection on DateTimeZone::getTransitions)
2017-04-10 12:48:51 +01:00
Xinchen Hui
3431132f18
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
2017-04-10 19:03:09 +08:00
Xinchen Hui
42e576ace2
Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
2017-04-10 19:02:50 +08:00
Xinchen Hui
65d77812fc
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed condition check
2017-04-10 14:47:42 +08:00
Xinchen Hui
4bebcb84ad
Fixed condition check
2017-04-10 14:47:24 +08:00
Joe Watkins
9fe4d2d9cb
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix of Bug #74383 : Wrong reflection on Phar::running
2017-04-10 06:32:40 +01:00
Mitch Hagstrand
d9a05807d2
Fix of Bug #74383 : Wrong reflection on Phar::running
2017-04-10 06:32:15 +01:00
Mitch Hagstrand
775afd5e2d
Fix of Bug #74383 : Wrong reflection on Phar::running
2017-04-10 06:24:57 +01:00
Xinchen Hui
9c7cb2cdcd
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
Add NEWS
Resolve bug #74188 (undefined statics raising with ?? operator)
Fixed bug #72071 : Prevent Max-Age from being negative
Update NEWS with OpenSSL 1.1.0 support info
Add OpenSSL 1.1.0 support to PHP 7.0
2017-04-10 11:49:44 +08:00
Xinchen Hui
c32281d406
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74379 (syntax error compile error in libmagic/apprentice.c)
2017-04-10 11:44:50 +08:00
Xinchen Hui
341ff7119f
Fixed bug #74379 (syntax error compile error in libmagic/apprentice.c)
2017-04-10 11:44:41 +08:00
Nikita Popov
84ef6fa80d
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-09 13:14:57 +02:00
Craig Duncan
ba6561d3cc
Fixed bug #72071 : Prevent Max-Age from being negative
2017-04-09 13:14:40 +02:00
andrewnester
1ce355abb6
Fixed #74298 - IntlDateFormatter->format() doesn't return microseconds/fractions
2017-04-09 12:56:21 +02:00
Jakub Zelenka
cdc33251d2
Add OpenSSL 1.1.0 support to PHP 7.0
2017-04-07 19:21:33 +01:00
Xinchen Hui
e656455eae
Remove unused var
2017-04-07 15:21:19 +08:00
Xinchen Hui
39327b90e3
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix invalid free of persistent results on error/connection loss in mysqlnd (bug 74376)
Conflicts:
ext/mysqlnd/mysqlnd_ps.c
2017-04-07 15:20:53 +08:00
Yussuf Khalil
27120d4412
Fix invalid free of persistent results on error/connection loss in mysqlnd (bug 74376)
2017-04-05 20:57:03 +02:00
Anatol Belski
adc49b1d18
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Revert "extend skip section"
2017-04-04 16:23:49 +02:00
Anatol Belski
4ca3468e78
Revert "extend skip section"
...
This reverts commit 5136048064
.
This is not needed anymore wrt dst handling fix
2017-04-04 16:21:23 +02:00
Nikita Popov
c8034514ed
Fixed bug #74361
2017-04-02 13:19:32 +02:00
Nikita Popov
32dcc1eef0
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-02 01:08:24 +02:00
Moritz Fain
46d286574b
Fixed bug #74341
...
Added support for ASN.1 UTCTime without seconds part (being 11 characters
long instead of 13).
Additionally, fixed incorrect handling of DST on systems without gmtoff.
2017-04-02 01:04:32 +02:00
Joe Watkins
6373ce7c1b
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix bug #74343 compile fails on solaris 11 with system libgd
2017-03-30 16:28:37 +01:00
Joe Watkins
ef3140e544
fix bug #74343 compile fails on solaris 11 with system libgd
2017-03-30 16:27:40 +01:00
Markus Staab
22881e06e2
fixed typo
2017-03-29 09:10:42 +02:00
Markus Staab
175b2d8910
fixed typo
2017-03-29 09:10:41 +02:00
Remi Collet
cec720857a
relax more this test
2017-03-29 07:38:40 +02:00
Remi Collet
012dc336a6
Fix buid with system libsqlite, see bug #74217
...
SQLITE_DETERMINISTIC only exists in recent version
e.g. missing on 3.7 which is the default on RHEL/CentOS-7
and probably others (wheezy have 3.7, jessie 3.8...)
2017-03-29 07:25:01 +02:00
Remi Collet
d11211fb53
relax test failing in fast computer
2017-03-29 07:01:14 +02:00
Ben Scholzen
d896878ad5
Let MessageFormatter and IntlDateFormatter accept DateTimeImmutable as well
2017-03-29 00:20:46 +02:00
Nikita Popov
d6f70f0ee3
Disable block pass for large functions
...
(Backport of 7ea261685f
to 7.0.)
2017-03-28 22:07:37 +02:00
Anatol Belski
6508320936
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
deps updated, cherry-pick 88642decf9
add test for bug #74230
2017-03-27 19:42:24 +02:00
Anatol Belski
ee8b5de5a0
deps updated, cherry-pick 88642decf9
2017-03-27 19:38:20 +02:00
Anatol Belski
6da475367a
add test for bug #74230
2017-03-27 19:33:51 +02:00
x-xiang
e9e860a05b
Don't retain mt_rand() seeds across requests
...
In particular, this prevents manual seeding of mt_rand() to leak
across requests.
2017-03-27 19:02:39 +02:00
Derick Rethans
727b21c839
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-27 18:01:30 +01:00
Derick Rethans
1f8fc0fb56
Forgot to update the output in the test too
2017-03-27 18:01:22 +01:00
Derick Rethans
f326cfc513
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-27 11:28:35 +01:00
Derick Rethans
eb5d4bcd4f
Fixed test for #33415 due to data fixes.
2017-03-27 11:28:16 +01:00
Derick Rethans
1f9e5cc2bc
Updated to version 2017.2 (2017b)
2017-03-24 12:25:26 +00:00
Derick Rethans
eb13003f6c
Updated to version 2017.2 (2017b)
2017-03-24 12:25:25 +00:00
Derick Rethans
ee49d4b4be
Added a test case to make sure microseconds work.
2017-03-24 11:39:32 +00:00
Dmitry Stogov
a0331127fe
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed uninitialized data
2017-03-23 18:59:56 +03:00
Dmitry Stogov
1517fdb36c
Fixed uninitialized data
2017-03-23 18:59:27 +03:00
Anatol Belski
9e3672eaef
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
explicitly ignore php.ini for proc open tests
2017-03-21 12:44:36 +01:00
Anatol Belski
bc2b500d3e
explicitly ignore php.ini for proc open tests
...
In some cases, when an environment is unclean, tests might get stuck fe
when some incorrect ini file is loaded. As the test depends on the core
only, it is safer to explicitly ignore the ini. Any ini can be passed in
the cmd itself, if needed.
2017-03-21 12:39:40 +01:00
Derick Rethans
2b7c3831cd
Fix for #73837 : "new DateTime()" with a cast to double
2017-03-20 17:48:15 +00:00
Jakub Zelenka
7dd52cbcdd
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-20 16:08:16 +00:00
Jakub Zelenka
6d066dc421
Lower timeout in test for but #72333
2017-03-20 16:07:12 +00:00
Nikita Popov
f2c35fdda8
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-17 20:20:43 +01:00
Nikita Popov
2e83082605
Fix bug #74265
2017-03-17 20:19:40 +01:00
Jakub Zelenka
ebc75dab50
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-17 19:08:26 +00:00
Jakub Zelenka
df135ffa7a
Make test 002 for bug #65538 not to use https in cafile
2017-03-17 19:07:32 +00:00
Jakub Zelenka
b0ba8c68cd
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-17 18:12:37 +00:00
Jakub Zelenka
53e2c9158d
Consume data by server in test for bug #72333
...
Client should be able to write more data and prevent time out
2017-03-17 18:11:50 +00:00
Nikita Popov
7ea261685f
Disable block pass for large functions
...
This is the last fix for bug #74250 .
2017-03-17 12:49:20 +01:00
Jakub Zelenka
3becfb9be4
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-16 18:12:54 +00:00
Jakub Zelenka
0c8ad36d92
Make test for bug #72333 a bit more reliable
2017-03-16 18:11:56 +00:00
Sebastian Bergmann
ccc35d1903
Fugbix typo
2017-03-16 19:10:07 +01:00
Nikita Popov
052aa466e1
Further optimize worklist management
...
Instead of always popping the first elements, do multiple complete
iterations of the worklist until it is empty.
2017-03-16 18:11:27 +01:00
Nikita Popov
e60515f3b8
Slightly optimize worklist management
...
Avoid scanning the worklist twice on every iteration.
2017-03-16 17:32:27 +01:00
Nikita Popov
f1f68b60f5
Optimize DJ spanning tree back-edge check
...
Instead of walking the DJ spanning tree upwards, record entry and
exit times during the DFS and use these to determine whether CJ
edges are sp-back edges.
2017-03-16 17:26:20 +01:00
Nikita Popov
6633e8492e
Sort blocks in loop identification
...
The previous implementation was doing O(blocks*levels) iterations,
which for a linear-ish domtree is O(blocks^2). Avoid this by sorting
the blocks by decreasing level upfront.
2017-03-16 16:49:36 +01:00
Nikita Popov
63e59c75a5
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-16 12:57:36 +01:00
Adam Saponara
98f4ce9363
Return FALSE if error_log fails to write all bytes
2017-03-16 12:56:36 +01:00
Nikita Popov
9331be7d6a
Use call_map to avoid linear call lookup
2017-03-16 12:33:57 +01:00
Bob Weinand
f3ab4c1a08
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-15 00:09:42 +01:00
Matt Bonneau
7fba8bda4c
Fixed bug #74240 (deflate_add can allocate too much memory)
2017-03-15 00:08:32 +01:00
Jakub Zelenka
b4f0174e5c
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-14 18:46:29 +00:00
Jakub Zelenka
ba70478a21
Skip bug74159 test for OpenSSL lower than 1.0.1
2017-03-14 18:13:57 +00:00
Jakub Zelenka
8e5d080d54
Tidy up test for bug72333
2017-03-14 18:13:57 +00:00
Jakub Zelenka
f0e67d1a56
Speed up test for bug72333
...
It reliably fails without the xp_ssl.c so it is good with smaller usleep
2017-03-14 18:13:57 +00:00
Jakub Zelenka
411f4b1b6f
Fix indent and add comment
2017-03-14 18:13:57 +00:00
Jakub Zelenka
760ff21bf3
Tidy up setting of SSL_MODE_RELEASE_BUFFERS
2017-03-14 18:13:57 +00:00
Jakub Zelenka
53cc72ef86
Remove extra SSL mode settings
2017-03-14 18:13:57 +00:00
Jakub Zelenka
17e9fc9bfe
Fix bug #72333 (fwrite() on non-blocking SSL sockets does not work)
2017-03-14 18:13:57 +00:00
Remi Collet
1ffb1b9597
rely on provided openssl.cnf to avoid possible failure with system defaults
2017-03-13 08:17:42 +01:00
andrewnester
fbf0e0587f
Implement FR #74217 : deterministic sqlite functions
2017-03-12 17:03:00 +01:00
Xinchen Hui
9f263c257a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74218 (ArrayIterator error message is confusing)
2017-03-10 15:16:01 +08:00
Xinchen Hui
c398198c0a
Fixed bug #74218 (ArrayIterator error message is confusing)
2017-03-10 15:15:31 +08:00
Nikita Popov
314ef0ff69
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-09 17:32:01 +01:00
Thomas Orozco
247ce052cd
Fixed bug #71003 : Add PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT
2017-03-09 17:31:21 +01:00
Nikita Popov
6635639b75
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-09 16:45:28 +01:00
mcq8
b224e74267
Fixed bug #72096 Swatch time value incorrect for dates before 1970
2017-03-09 16:44:02 +01:00
andrewnester
8f799137d7
Fixed bug #74058
...
Fall back from get_property_ptr_ptr to read_property if offsetGet
is overridden.
2017-03-09 00:10:00 +01:00
Sara Golemon
1a19b97ac3
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Detect invalid port in xp_socket parse ip address
2017-03-07 12:11:22 -08:00
Sara Golemon
bab0b99f37
Detect invalid port in xp_socket parse ip address
...
For historical reasons, fsockopen() accepts the port and hostname
separately: fsockopen('127.0.0.1', 80)
However, with the introdcution of stream transports in PHP 4.3,
it became possible to include the port in the hostname specifier:
fsockopen('127.0.0.1:80')
Or more formally: fsockopen('tcp://127.0.0.1:80')
Confusing results when these two forms are combined, however.
fsockopen('127.0.0.1:80', 443) results in fsockopen() attempting
to connect to '127.0.0.1:80:443' which any reasonable stack would
consider invalid.
Unfortunately, PHP parses the address looking for the first colon
(with special handling for IPv6, don't worry) and calls atoi()
from there. atoi() in turn, simply stops parsing at the first
non-numeric character and returns the value so far.
The end result is that the explicitly supplied port is treated
as ignored garbage, rather than producing an error.
This diff replaces atoi() with strtol() and inspects the
stop character. If additional "garbage" of any kind is found,
it fails and returns an error.
2017-03-07 12:10:53 -08:00
Dmitry Stogov
d9231b1667
Fixed pointer allignment
2017-03-07 10:18:34 +03:00
Dmitry Stogov
b273a8cbe4
Ensure pointer alignment.
2017-03-07 09:48:18 +03:00
Dmitry Stogov
6158b517c4
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed file-cache (Zend/tests/unused_shared_static_variables.phpt)
2017-03-03 16:12:41 +03:00
Dmitry Stogov
648b756f35
Fixed file-cache (Zend/tests/unused_shared_static_variables.phpt)
2017-03-03 16:10:46 +03:00
Nikita Popov
bf8c463f5b
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-02 12:36:13 +01:00
somedaysummer
fab5ce347c
PHP bug #74004
...
Fix for DOMDocument loadHTML and loadHTMLFile ignore LIBXML_NOWARNING
and LIBXML_NOERROR flags.
2017-03-02 12:35:42 +01:00
Derick Rethans
a7ff583e7e
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-02 11:28:09 +00:00
Derick Rethans
cf60f26da6
Fixed tests after tzdb removed abbreviations
2017-03-02 11:28:02 +00:00
Derick Rethans
61e9b7354f
Make sure we anchor this test to February
2017-03-02 11:27:44 +00:00
Nikita Popov
bc1807dbe2
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-02 12:13:38 +01:00
Mitch Hagstrand
29333550d2
Fix bug73858.phpt to work in months without 31 days
...
Used hardcoded months in bug73858.phpt rather than the current and previous
month.
2017-03-02 12:13:06 +01:00
Christopher Jones
06e5ec9e32
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-02 15:33:25 +11:00
Christopher Jones
e80ea04c79
Fixed bug #54379 (PDO_OCI: UTF-8 output gets truncated)
...
This was a modification of an incomplete PR #2276 .
2017-03-02 15:28:01 +11:00
Derick Rethans
1b16fb594f
Updated to version 2017.1 (2017a)
2017-03-01 20:07:51 +00:00
Derick Rethans
dfcb11d7d1
Updated to version 2017.1 (2017a)
2017-03-01 20:07:51 +00:00
Remi Collet
2f955d5d0a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
make type consistent with glob_t.gl_pathc
2017-03-01 17:02:42 +01:00
Remi Collet
53a08fd07d
make type consistent with glob_t.gl_pathc
2017-03-01 17:01:58 +01:00
Nikita Popov
f678b0eae2
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-24 23:22:24 +01:00
Grundik
eac8166bd4
Fix bug #73127
...
gost-crypto hash was incorrect if input data contained long 0xFF
sequence, due to a carry-propagation bug.
2017-02-24 23:20:49 +01:00
Aaron Piotrowski
531fbb88f5
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-23 22:56:04 -06:00
Aaron Piotrowski
ff8a6b1232
Update test for bug #74159
2017-02-23 22:24:59 -06:00
Aaron Piotrowski
c05c65ac80
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-23 21:19:46 -06:00
Aaron Piotrowski
e9873d9853
Fix bug #74159
...
Thanks to @brzuchal for the patch to xp_ssl.c and @DaveRandom for helping debug the problem.
2017-02-23 20:59:43 -06:00
Xinchen Hui
be60d159b6
Add test only (bug doesn't exists in 7.1)
2017-02-23 12:47:15 +08:00
Xinchen Hui
330a7b62c3
Fixed bug #74152 (if statement says true to a null variable)
2017-02-23 12:33:17 +08:00
Xinchen Hui
48fcc5ddc2
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74148 (ReflectionFunction incorrectly reports the number of arguments)
2017-02-23 11:02:37 +08:00
Xinchen Hui
1d4eead995
Fixed bug #74148 (ReflectionFunction incorrectly reports the number of arguments)
2017-02-23 11:02:23 +08:00
Dmitry Stogov
500232ef35
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
too many dashes
2017-02-21 10:48:21 +03:00
Dmitry Stogov
593a4d8fe9
too many dashes
2017-02-21 10:47:48 +03:00
Dmitry Stogov
508d78ce5e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Increase WSDL cache version (7.0 wsdl cache is incomatible with PHP-5) Include WSDL cache version number into file name
2017-02-21 10:42:42 +03:00
Dmitry Stogov
bd7e5c1548
Increase WSDL cache version (7.0 wsdl cache is incomatible with PHP-5)
...
Include WSDL cache version number into file name
2017-02-21 10:41:20 +03:00
Remi Collet
dd9701c414
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix test for libzip 1.2.0
2017-02-19 17:02:16 +01:00
Remi Collet
c836ad1c7e
fix test for libzip 1.2.0
2017-02-19 17:02:00 +01:00
andrewnester
15b8b124ae
Fixed #74099 - Memory leak with openssl_encrypt()
2017-02-17 21:23:16 +01:00
Nikita Popov
c240feb7f4
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-17 18:44:02 +01:00
Benjamin Robin
513582814b
Fixed bug #74105
...
If getrandom syscall is unavailable (ENOSYS), try to fallback on
/dev/urandom.
2017-02-17 18:42:35 +01:00
Nikita Popov
976225ef23
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-16 17:28:05 +01:00
Nikita Popov
cf3ef36323
Fix memory errors in url rewriter
...
Strings aren't terminated here...
2017-02-16 17:24:07 +01:00
Nikita Popov
a381b61f03
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-16 17:00:21 +01:00
Nikita Popov
708973c9bd
Fix autoload_func_info destruction
...
Can't reference the function ptr after the closure has been
destroyed.
2017-02-16 16:59:17 +01:00
Nikita Popov
f741f9b656
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-16 12:47:12 +01:00
Mitch Hagstrand
3b91ed112f
Make the ftp and stream tests more reliable.
...
The tests can sometimes fail because it chooses a passive port for ftp that
is already in use. This makes the test attempt multiple times to find a free
port.
2017-02-16 12:46:55 +01:00
Nikita Popov
5432d6f982
Add json dep to test
2017-02-16 12:45:24 +01:00
Anatol Belski
2a61e5495a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74090 stream_get_contents maxlength>-1 returns empty string
2017-02-15 14:49:58 +01:00
Anatol Belski
89a5bd6750
Fixed bug #74090 stream_get_contents maxlength>-1 returns empty string
2017-02-15 11:22:47 +01:00
Nikita Popov
134d0b33a3
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-12 22:03:31 +01:00
Nikita Popov
eb1373e509
Revert "Fixed bug #74035 "
...
This reverts commit 9ffc6ca62f
.
2017-02-12 22:02:39 +01:00
Derick Rethans
d28df113d5
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-12 20:19:02 +00:00
Derick Rethans
f0519f4837
Upgrade timelib to 2017.01
...
This fixes:
- Fixed bug #72719 (Relative datetime format ignores weekday on sundays only).
- Fixed bug #73294 (DateTime wrong when date string is negative).
- Fixed bug #73489 (wrong timestamp when call setTimeZone multi times with UTC
offset).
- Fixed bug #73858 (first/last day of' flag is not being reset).
- Fixed bug #73942 ($date->modify('Friday this week') doesn't return a Friday
if $date is a Sunday).
- Fixed bug #74057 (wrong day when using "this week" in strtotime).
2017-02-12 20:17:01 +00:00
Nikita Popov
98fceaf61e
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-12 12:50:14 +01:00
andrewnester
01c1afa79f
Fixed bug #74021
2017-02-12 12:48:18 +01:00
Nikita Popov
9fb2812b56
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-12 00:15:46 +01:00
Adam Saponara
7e5cf2aa19
Fixed bug #73118
2017-02-12 00:14:59 +01:00
Derick Rethans
5113909259
Fixed bug #73837 ("new DateTime()" sometimes returns 1 second ago value).
2017-02-11 11:10:01 +00:00
Xinchen Hui
0b7fa040e9
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74019 (Segfault with list)
2017-02-10 14:25:29 +08:00
Xinchen Hui
185304a61e
Fixed bug #74019 (Segfault with list)
2017-02-10 14:24:01 +08:00
Nikita Popov
bb9adc4c52
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-08 00:53:36 +01:00
Christian Schmidt
714d825b62
Fix detection of isnan and isinf
...
The isnan() and isinf() are C99 macros not functions.
Also fix is_infinite(-INF) in case isinf is not defined.
2017-02-08 00:53:18 +01:00
Nikita Popov
546af1966e
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-06 01:46:01 +01:00
Nikita Popov
8a8aa67844
Revert "Fix detection of isnan and isinf"
...
This reverts commit 9ea0949f43
.
2017-02-06 01:45:53 +01:00
Nikita Popov
70b27b5ad8
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-05 18:10:04 +01:00
Christian Schmidt
9ea0949f43
Fix detection of isnan and isinf
...
The isnan() and isinf() are C99 macros not functions.
Also fix is_infinite(-INF) in case isinf is not defined.
2017-02-05 18:09:04 +01:00
Nikita Popov
f3b1ecb6c8
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-03 18:42:28 +01:00
Nikita Popov
dcaf4da8a6
Revert "Merge branch 'pull-request/2344' into PHP-7.0"
...
This reverts commit 6988d070ea
, reversing
changes made to 75ad2b301a
.
2017-02-03 18:42:10 +01:00
Nikita Popov
57817eb72f
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-03 18:30:32 +01:00
andrewnester
9ffc6ca62f
Fixed bug #74035
2017-02-03 18:29:39 +01:00
Nikita Popov
8660e95b4c
Fixed bug #74041
2017-02-03 17:54:39 +01:00
Joe Watkins
611952cd98
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML
2017-02-03 06:12:42 +00:00
somedaysummer
4df993d89d
Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML
2017-02-03 06:08:42 +00:00
Nikita Popov
2d1955796e
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-02 18:14:50 +01:00
Matěj Humpál
acda2563ce
Fix bug #74031
...
Fix incorrect parameter count for imagepng function
2017-02-02 18:13:53 +01:00
Anatol Belski
9b9080e85d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.
2017-02-02 13:06:31 +01:00
Anatol Belski
6fc0ae638a
Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.
2017-02-02 12:48:12 +01:00
Anatol Belski
3bc7ea9a0a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
sync NEWS with the reverted stuff
Revert "fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)"
Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454 )"
2017-02-01 20:01:40 +01:00
Anatol Belski
3446e3b749
Revert "fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)"
...
This reverts commit 2fcf1259c6
.
2017-02-01 19:59:24 +01:00
Anatol Belski
69a2e4ece2
Revert "fix BC break introduced by #2346 ( sebastianbergmann/phpunit#2454 )"
...
This reverts commit 62938bf088
.
2017-02-01 19:59:18 +01:00
Remi Collet
0e21d8066b
fix test for 32bits (int -> float)
...
(cherry picked from commit 0f1ae93bfa
)
2017-02-01 11:49:52 +01:00
Remi Collet
4fe2758657
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix test for 32bits (int -> float)
2017-02-01 10:25:54 +01:00
Remi Collet
aa9742d80d
fix test for 32bits (int -> float)
2017-02-01 10:25:30 +01:00
Sara Golemon
3475c0c035
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Securely zero the hash context key
2017-01-30 09:02:42 -08:00
Sara Golemon
bf0f53270f
Securely zero the hash context key
2017-01-30 08:57:17 -08:00
Anatol Belski
de64adeb1d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73983 crash on finish work with phar in cli + opcache
2017-01-30 12:46:11 +01:00
Anatol Belski
368958b3e4
Fixed bug #73983 crash on finish work with phar in cli + opcache
...
The file_cache_only option causes the storage to be per process,
furthermore the arena is destroyed per request. Thus, zend_string's
can't survive between request and the permanent flag should not
be set. This is already done with the file cache part, but the
persistency part is used in various scenarios and should respect
this case as well. In this particular bug, the pcre pattern cache
needs to survive between requests and uses pattern strings as hash
keys. One more case relevant here would be various situations where
the flow disables the use of shared memory.
2017-01-30 12:44:21 +01:00
Joe Watkins
e6bc4f39a2
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454 )
2017-01-30 11:26:37 +00:00
jhdxr
62938bf088
fix BC break introduced by #2346 ( sebastianbergmann/phpunit#2454 )
2017-01-30 11:25:04 +00:00
Anatol Belski
f2c99e201e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
move id initialization into ctor
2017-01-30 11:41:59 +01:00
Anatol Belski
4b1afc829c
move id initialization into ctor
2017-01-30 11:40:23 +01:00
Anatol Belski
2a5a310446
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix system id initialization for multiple threads
2017-01-30 01:57:27 +01:00
Anatol Belski
2b7e5468c9
fix system id initialization for multiple threads
2017-01-30 01:54:36 +01:00
Joe Watkins
366f838483
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)
2017-01-28 08:27:53 +00:00