clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
96,168 Commits 491 Branches 1,363 Tags 844 MiB
90c2b237d6
Commit Graph

41685 Commits

Author SHA1 Message Date
Joe Watkins
66fc5a3436 Implement #51879 stream context socket option tcp_nodelay 2016-04-29 12:11:58 +01:00
Dmitry Stogov
0091d81668 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  fix constants availability
  fix size_t signed comparison
 2016-04-29 13:13:59 +03:00
Anatol Belski
9db8cefa3c fix constants availability 
The issue here is that winsock2 defines IP protocols as an enum,
so the preprocessor won't catch it. However all the items related
are available as of winxp (see ws2def.h), so it's safe just to have.
 2016-04-29 11:37:19 +02:00
Dmitry Stogov
e2340a17bd Merge branch 'PHP-7.0' 
* PHP-7.0:
  Simplified condition
 2016-04-29 12:34:09 +03:00
Dmitry Stogov
37f7c71f3e Simplified condition 2016-04-29 12:33:54 +03:00
Dmitry Stogov
926857708b Merge branch 'PHP-7.0' 
* PHP-7.0:
  size_t is unsigned and can't be negative
 2016-04-29 12:24:13 +03:00
Dmitry Stogov
ddac2852dc size_t is unsigned and can't be negative 2016-04-29 12:23:30 +03:00
Joe Watkins
12f826d7df Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix size_t signed comparison
 2016-04-29 10:20:27 +01:00
Joe Watkins
dbae1653da fix size_t signed comparison 2016-04-29 10:19:55 +01:00
Xinchen Hui
2f17ef1d25 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed build
  Add NEWS entry for bug #71331 (fixed in 7.0.3)
  Add NEWS entry for bug #71331 (fixed in PHP 5.6.18)
 2016-04-29 11:13:29 +08:00
Xinchen Hui
a5718539b1 Fixed build 2016-04-29 11:13:15 +08:00
Stanislav Malyshev
9649ca1630 Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream() 2016-04-28 20:57:44 +03:00
Joe Watkins
64721f143a Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0 2016-04-28 15:41:23 +01:00
Joe Watkins
de019858c3 Merge branch 'PHP-7.0' 
* PHP-7.0:
  variable used out of scope
 2016-04-28 15:40:59 +01:00
Joe Watkins
e27a43b7be variable used out of scope 2016-04-28 15:40:28 +01:00
Bob Weinand
6d420dc782 Merge branch 'PHP-7.0' 2016-04-28 11:10:53 +02:00
Bob Weinand
74ef863f5d Fixed bug #72116 (7.0.6 array_fill optimization breaks implementation) 2016-04-28 11:02:47 +02:00
Dmitry Stogov
6499162ff0 - get rid of EG(scope). zend_get_executed_scope() should be used instead. 
- ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter.
 2016-04-28 04:13:34 +03:00
Nikita Popov
d94b9545d6 Support known static/method calls in call graph 
For this purpose extract the function lookup call into a helper
zend_optimizer_get_called_func().
 2016-04-27 17:10:45 +02:00
Nikita Popov
4f54c15cb1 Ct bind private/final $this method call args 
The test covers two edge-cases wrt opcache support.
 2016-04-27 17:10:44 +02:00
Xinchen Hui
91ca55f9f4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Use zend_string_safe_alloc
 2016-04-27 20:34:29 +08:00
Xinchen Hui
a05320c419 Use zend_string_safe_alloc 2016-04-27 20:29:11 +08:00
Anatol Belski
2613011b2e Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix/improve tests
 2016-04-27 13:20:08 +02:00
Anatol Belski
25ef19f927 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix/improve tests
 2016-04-27 13:19:29 +02:00
Anatol Belski
a21a997478 fix/improve tests 2016-04-27 13:16:57 +02:00
Dmitry Stogov
f0a2e8eb13 Removed "zend_fcall_info.function_table". It was assigned in many places, but is never used. 2016-04-27 13:46:38 +03:00
Anatol Belski
1a154c7db5 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix merge
  Fix memory leak
  Fix bug #72099: xml_parse_into_struct segmentation fault
  5.5.36 now
  Fix bug #72094 - Out of bounds heap read access in exif header processing
  Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition
  Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
  Fix for bug #71912 (libgd: signedness vulnerability)
  Typo in NEWS
 2016-04-27 12:30:34 +02:00
Anatol Belski
4bc97db0b8 fix merge 2016-04-27 12:24:28 +02:00
Anatol Belski
33d41da347 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix memory leak
  Fix bug #72099: xml_parse_into_struct segmentation fault
  5.5.36 now
  Fix bug #72094 - Out of bounds heap read access in exif header processing
  Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition
  Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
  Fix for bug #71912 (libgd: signedness vulnerability)
  Typo in NEWS
 2016-04-27 11:45:29 +02:00
Stanislav Malyshev
e315a162da Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix memory leak
  Fix bug #72099: xml_parse_into_struct segmentation fault
  5.5.36 now
  Fix bug #72094 - Out of bounds heap read access in exif header processing
  Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition
  Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
  Fix for bug #71912 (libgd: signedness vulnerability)
  Typo in NEWS

Conflicts:
	configure.in
	main/php_version.h
 2016-04-26 23:48:41 -07:00
Stanislav Malyshev
e35e5b2187 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix build
 2016-04-26 23:04:40 -07:00
Stanislav Malyshev
a32e143d4e fix build 2016-04-26 23:04:29 -07:00
Stanislav Malyshev
3bba9c7fba Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix bug #71923 - integer overflow in ZipArchive::getFrom*
 2016-04-26 22:59:25 -07:00
Stanislav Malyshev
ccc12efa32 Fix bug #71923 - integer overflow in ZipArchive::getFrom* 2016-04-26 22:59:09 -07:00
Stanislav Malyshev
61c7a06e7c Fix memory leak 2016-04-26 22:54:58 -07:00
Stanislav Malyshev
dccda88f27 Fix bug #72099: xml_parse_into_struct segmentation fault 2016-04-26 22:46:28 -07:00
Xinchen Hui
ea95621f71 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Use zend_string_safe_alloc
 2016-04-27 12:51:51 +08:00
Xinchen Hui
c89b7a4860 Use zend_string_safe_alloc 2016-04-27 12:45:02 +08:00
Dmitry Stogov
4da3eb8f13 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed test on 32-bit platforms (split into 32-bit and 64-bit versions)
 2016-04-26 13:45:02 +03:00
Dmitry Stogov
4ce8a15eae Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed test on 32-bit platforms (split into 32-bit and 64-bit versions)
 2016-04-26 13:44:52 +03:00
Dmitry Stogov
9f389cccfd Fixed test on 32-bit platforms (split into 32-bit and 64-bit versions) 2016-04-26 13:43:18 +03:00
Dmitry Stogov
8eeedb6e48 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72100 (implode() inserts garbage into resulting string when joins very big integer). (Mikhail Galanin)
 2016-04-26 13:06:16 +03:00
Dmitry Stogov
8f0ceb97cf Fixed bug #72100 (implode() inserts garbage into resulting string when joins very big integer). (Mikhail Galanin) 2016-04-26 13:04:06 +03:00
Stanislav Malyshev
082aecfc3a Fix bug #72094 - Out of bounds heap read access in exif header processing 2016-04-24 19:33:52 -07:00
Stanislav Malyshev
d650063a04 Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition 
We can not modify result since it can be copy of _zero_ or _one_, etc. and
"copy" in bcmath is just bumping the refcount.
 2016-04-24 18:33:32 -07:00
Stanislav Malyshev
fd9689745c Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset 2016-04-24 13:15:17 -07:00
Nikita Popov
434e0fb3a5 Take pi defs into account when propagating defs 
Previously pi placement happened after initial phi placement.
Afterwards a second phi placement pass was performed, however it
incorrectly only placed phis on the dominance frontier, rather
than the iterated dominance frontier.

This is fixed by moving pi placement before the propagation of
defs on the iterated DFs, and adding a def for each added pi.

While this ensures that we generate correct conservative SSA, there
is still one remaining case in which we may generate non-minimal
SSA form. Consider:

   |1|
    |pi
    v
   |2|<--\
    |    |
    \----/

The pi is semanically located along the edge 1->2, however we place
it (and its def point) in 2, thus leading to the generation of an
additional (trivial) phi in 2.

Conflicts:
	ext/opcache/Optimizer/zend_ssa.c
 2016-04-24 21:46:20 +02:00
Nikita Popov
721be3e0c1 Make pi placement independent of phi placement 
This interdependence is problematic because we can't propagate pi
def points in the initial dominance frontier propagation. The used
rule for multiple-predecessor blocks may also miss cases where
placing the pi would have been useful.

The new heuristic for pi placement checks that a) the variable is
live-in and b) for the "from" block that generated the pi, the
other successor does not dominate all other predecessors of the
"to" block.

The purpose of case b) may be illustrated with an example:

    if (is_int($i)) {
        // place pi here
    }
    // but don't place pi here

The reason we do not want to place the second pi is that we generally
place pis in positive+negative pairs, and in this case the pair
would merge in a phi and cancel out, so we get no useful information
out of it.
 2016-04-24 21:45:22 +02:00
Nikita Popov
65faf0a5a2 Drop some unnecessary checks 2016-04-24 17:15:46 +02:00
Nikita Popov
cafe78d12a Introduce ZEND_BITSET_FOREACH macros 2016-04-24 17:05:13 +02:00
Pierrick Charron
62240f2653 Merge branch 'PHP-7.0' 2016-04-23 22:55:46 -04:00
Pierrick Charron
a2d78d1a5f Fixed bug #68658 (Define CURLE_SSL_CACERT_BADFILE) 2016-04-23 22:55:00 -04:00
Pierrick Charron
083f74659f Merge branch 'PHP-7.0' 2016-04-23 18:38:51 -04:00
Pierrick Charron
043ce195c6 Fix cURL test to use local server instead of google 2016-04-23 18:37:55 -04:00
Anatol Belski
6e06ab1464 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72035 php-cgi.exe fails to run scripts relative to drive root
 2016-04-23 19:22:22 +02:00
Anatol Belski
e0edb25cf2 Fixed bug #72035 php-cgi.exe fails to run scripts relative to drive root 2016-04-23 18:55:52 +02:00
Xinchen Hui
fa5f28a0a1 Merge branch 'PHP-7.0' 2016-04-22 21:41:52 -07:00
Xinchen Hui
589d0e0f18 Fixed bug #72069 (Behavior \JsonSerializable different from json_encode) 2016-04-22 21:41:44 -07:00
Xinchen Hui
67947d0fda Merge branch 'PHP-7.0' 2016-04-22 21:22:01 -07:00
Xinchen Hui
9eb7c8cd3b Fixed bug #72075 (Referencing socket resources breaks stream_select) 2016-04-22 21:21:49 -07:00
Nikita Popov
304e5ae3d6 Adjust DFG allocation size 
Now we need one set less...
 2016-04-21 23:49:37 +02:00
Nikita Popov
55caaac73f Make MAY_BE_ERROR handling more accurate 
This ended up causing weird things like MAY_BE_ERROR CVs.

Also make sure that ASSIGN result isn't MAY_BE_REF.
 2016-04-21 23:49:20 +02:00
Nikita Popov
3dc8f80b61 Merge branch 'PHP-7.0' 2016-04-21 23:42:20 +02:00
Nikita Popov
988bdd0908 Fix escape sequences in pgsql.c 2016-04-21 23:41:59 +02:00
Nikita Popov
a5944f8dd5 Merge def and gen sets 
For live-variable analysis it does not matter if def includes
variables that are previously use in the same block, the data flow
equations still have the same result. As such there is no need to
compute separate gen & def sets.

I'm keeping the name "def", because use of "gen" in this context is
pretty confusing (gen is usually the use set, not the def set).
 2016-04-21 23:32:01 +02:00
Nikita Popov
dc3ab58c14 Fix intl tests for ICU < 52 2016-04-20 19:43:15 +02:00
Stanislav Malyshev
c02301b666 Better fix for #71952 2016-04-19 23:44:00 -07:00
Stanislav Malyshev
23a4342099 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix bug #71952: Corruption inside imageaffinematrixget
 2016-04-18 23:34:44 -07:00
Stanislav Malyshev
086729bb6c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #71952: Corruption inside imageaffinematrixget

Conflicts:
	ext/gd/gd.c
 2016-04-18 23:34:26 -07:00
Stanislav Malyshev
f061867fd3 Fix bug #71952: Corruption inside imageaffinematrixget 2016-04-18 23:33:21 -07:00
Stanislav Malyshev
b15f0ecc0f Fix for bug #71912 (libgd: signedness vulnerability) 2016-04-18 22:24:16 -07:00
Xinchen Hui
e757ec4bd6 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72051 (The reference in CallbackFilterIterator doesn't work as expected)
 2016-04-19 11:03:57 +08:00
Xinchen Hui
7648f20de3 Fixed bug #72051 (The reference in CallbackFilterIterator doesn't work as expected) 2016-04-19 10:59:10 +08:00
Sara Golemon
a9568d5485 Update IntlTimeZone methods for ICU 52 
Adds:
  string IntlTimeZone::getWindowsID(string id)
  string IntlTimeZone::getIDForWindowsID(string winID[, string region])

And matching procedural functions
 2016-04-18 23:01:25 +00:00
Bob Weinand
b08bde185d Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0 2016-04-18 12:13:59 +02:00
Christopher Jones
230f9bf512 Merge branch 'PHP-7.0' 2016-04-18 11:16:35 +10:00
Christopher Jones
3b54d93b2f Bump version in test 2016-04-18 11:15:01 +10:00
Nikita Popov
4f726be682 Fix SSA for SEND_UNPACK 2016-04-16 22:38:52 +02:00
Bob Weinand
643d6277b3 Merge branch 'PHP-7.0' 2016-04-16 20:57:45 +02:00
Bob Weinand
6bb81d2c5f Fix non-/Zend tests too 2016-04-16 20:57:28 +02:00
Nikita Popov
4a568dd7c9 Drop left-over debugging statement in block pass 2016-04-16 20:23:23 +02:00
Anatol Belski
e015faaf8f Merge branch 'PHP-7.0' 
* PHP-7.0:
  Adds new curl option CURLOPT_SSL_VERIFYSTATUS to enable OCSP verification
  Add test for bug #72028
 2016-04-16 19:25:13 +02:00
Dominic Luechinger
02766d0180 Adds new curl option CURLOPT_SSL_VERIFYSTATUS to enable OCSP verification 2016-04-16 18:30:19 +02:00
Anatol Belski
fd6f7b8341 Add test for bug #72028 2016-04-16 16:11:22 +02:00
Nikita Popov
30c82321d7 Merge branch 'PHP-7.0' 2016-04-16 09:59:35 +02:00
Nikita Popov
d8590940a1 Use symtable lookup for arrays in array_column 2016-04-16 09:59:01 +02:00
Nikita Popov
28801bf249 Respect property visibility in array_column 2016-04-16 09:59:01 +02:00
Nikita Popov
c0d8dc5bd7 Fixed bug #72031 2016-04-16 09:58:57 +02:00
Xinchen Hui
513f2e775b Merge branch 'PHP-7.0' 2016-04-15 21:30:24 -07:00
Xinchen Hui
7e01c518b6 Fixed bug #72028 (pg_query_params(): NULL converts to empty string) 
I don't have a pgsql server by hand, so no test script, but the fix must
be right.
 2016-04-15 21:29:27 -07:00
Xinchen Hui
d5914d19eb Merge branch 'PHP-7.0' 2016-04-15 21:09:05 -07:00
Xinchen Hui
05d53dee7d Fixed bug #71972 (Cyclic references causing session_start(): Failed to decode session object) 2016-04-15 21:08:51 -07:00
Nikita Popov
64f91774f2 Remove IS_VAR_RET_REF flag 
Instead decide whether a function returned by reference or by value
by checking whether the return value has REFERENCE type. This means
that functions returning by reference must always return a reference
and functions returning by value must not return a reference.
 2016-04-15 15:32:20 +02:00
Anatol Belski
fd2cd35429 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  Fixed #71062 pg_convert() doesn't accept ISO 8601 for datatype timestamp
 2016-04-15 13:42:04 +02:00
Anatol Belski
d263616525 Fixed #71062 pg_convert() doesn't accept ISO 8601 for datatype timestamp 2016-04-15 13:38:49 +02:00
Dmitry Stogov
d57505e234 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Fixed bug #72014 (Including a file with anonymous classes multiple times leads to fatal error)
 2016-04-14 16:08:54 +03:00
Dmitry Stogov
b73517c1a1 Use DO_FCALL_BY_NAME instead of DO_FCALL, if possible 2016-04-14 16:07:28 +03:00
Xinchen Hui
17c3aa9dd1 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72014 (Including a file with anonymous classes multiple times leads to fatal error)
 2016-04-14 20:21:34 +08:00
Xinchen Hui
8a17b1a241 Fixed bug #72014 (Including a file with anonymous classes multiple times leads to fatal error) 2016-04-14 20:21:19 +08:00
Christopher Jones
9d76e012cf Merge branch 'PHP-7.0' 2016-04-14 15:49:52 +10:00
Christopher Jones
ec358dac03 On second thoughts, keep this in sync with 5.6 for 71422 2016-04-14 15:49:15 +10:00
Christopher Jones
81f0389611 Merge branch 'PHP-7.0' 2016-04-14 15:09:25 +10:00
Christopher Jones
96ece22a05 Merge branch 'PHP-5.6' into PHP-7.0 2016-04-14 15:09:02 +10:00
Christopher Jones
d1e81a59a7 Fix old comment cut-n-paste error 2016-04-14 15:08:42 +10:00
Christopher Jones
640b726b02 Merge branch 'PHP-7.0' 2016-04-14 14:09:34 +10:00
Christopher Jones
12cd25bb1a Fixed bug #71600 (oci_fetch_all segfaults when selecting more than 8 columns) (Tian Yang) 2016-04-14 14:09:16 +10:00
Christopher Jones
9d96bd8214 Merge branch 'PHP-7.0' 2016-04-14 13:55:40 +10:00
Christopher Jones
cef4bc61c1 Merge fix for bug #71422. No code changed needed in PHP 7 2016-04-14 13:55:32 +10:00
Christopher Jones
8f2e6da806 Fixed bug #71422 (Fix ORA-01438: value larger than specified precision allowed for this column) 2016-04-14 13:50:01 +10:00
Anatol Belski
8b8b44145b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #68849 bindValue is not using the right data type
 2016-04-12 19:15:08 +02:00
Anatol Belski
e49580c96e Fixed bug #68849 bindValue is not using the right data type 2016-04-12 19:12:45 +02:00
Xinchen Hui
4fafd7309c Merge branch 'PHP-7.0' 
* PHP-7.0:
  This only make sense on *nix
 2016-04-12 15:31:35 +08:00
Xinchen Hui
9458f54969 This only make sense on *nix 2016-04-12 15:31:21 +08:00
Anatol Belski
f644d6cc3d Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #70484 selectordinal doesn't work with named parameters
  fix version macro to check
 2016-04-11 15:02:27 +02:00
Anatol Belski
28b6f66a77 Fixed bug #70484 selectordinal doesn't work with named parameters 2016-04-11 15:01:22 +02:00
Anatol Belski
f62943edc8 fix version macro to check 2016-04-11 15:01:22 +02:00
Joe Watkins
707941413d Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0 2016-04-11 08:04:14 +01:00
Joe Watkins
00d8d9f227 Merge branch 'master' of https://github.com/php/php-src 2016-04-11 08:03:56 +01:00
Joe Watkins
2a5385af32 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix calendar segfault
 2016-04-11 08:03:39 +01:00
Joe Watkins
028485ae69 fix calendar segfault 2016-04-11 08:03:15 +01:00
Anatol Belski
672d0eeecf Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71998 Function pg_insert does not insert when column type = inet
 2016-04-10 18:49:38 +02:00
Anatol Belski
b4ab0effc7 Fixed bug #71998 Function pg_insert does not insert when column type = inet 2016-04-10 18:48:35 +02:00
Jakub Zelenka
93b67dd511 Remove json parser depth methods and tidy it up 2016-04-10 16:10:26 +01:00
Jakub Zelenka
72ccfda25a Add method hooking support to json parser 
This commit is just a slight modification (renaming and some small
changes) of the patch that has been provided by Andrey Hristov.
It adds support for hooking of the json parser operations and
allows re-using of modified JSON parsing outside of json ext.
 2016-04-10 15:35:41 +01:00
Anatol Belski
4e12897826 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #65480 No declaration for msgformat_fix_quotes() in msgformat.c or msgformat_attr.c
 2016-04-09 19:12:16 +02:00
Anatol Belski
58ea2ad489 Fixed bug #65480 No declaration for msgformat_fix_quotes() in msgformat.c or msgformat_attr.c 2016-04-09 19:11:28 +02:00
Xinchen Hui
50f7ee0fee Merge branch 'PHP-7.0' 2016-04-09 10:01:33 -07:00
Xinchen Hui
5db4d9a71c Fixed bug #71995 (Returning the same var twice from __sleep() produces broken serialized data) 2016-04-09 10:01:04 -07:00
Anatol Belski
5540525969 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #66289 Locale::lookup incorrectly returns en or en_US if locale is empty
 2016-04-09 18:27:57 +02:00
Anatol Belski
ef17343b3c Fixed bug #66289 Locale::lookup incorrectly returns en or en_US if locale is empty 2016-04-09 18:24:42 +02:00
Lior Kaplan
bffd78fa77 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Enable configure without opcache-file and huge-code-pages
 2016-04-09 16:35:50 +03:00
Lior Kaplan
c6c44c3629 Enable configure without opcache-file and huge-code-pages 
This doesn't chagne the default (yes for both features), but respects
--disable-opcache-file and --disable-huge-code-pages configure flags if given.
 2016-04-09 15:57:57 +03:00
Xinchen Hui
3e7b429663 We should always serialize the op->handler 2016-04-09 01:43:28 -07:00
Lior Kaplan
2875ac9c00 Merge branch 'PHP-7.0' 
* PHP-7.0:
  opcache config.m4: Use = for comparison
 2016-04-09 01:38:37 +03:00
Lior Kaplan
403c3f95fe Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  opcache config.m4: Use = for comparison
 2016-04-09 01:35:30 +03:00
Lior Kaplan
c1f597d9a1 opcache config.m4: Use = for comparison 2016-04-08 22:38:07 +03:00
Anatol Belski
bc1d8eca6c Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix indent
 2016-04-08 14:19:30 +02:00
Anatol Belski
73815573e0 fix indent 2016-04-08 14:17:57 +02:00
Anatol Belski
91da256bb1 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix compat for ICU < 50
 2016-04-08 12:49:51 +02:00
Anatol Belski
45d9efaac3 fix compat for ICU < 50 2016-04-08 12:48:26 +02:00
Anatol Belski
de2da3bf02 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #68893 Stackoverflow in datefmt_create
  Added missing newline.
  Changed to check for error with the new function that returns null if error is set
  Added function to check error and return null if error is set.
  Added tests for bug 70451 and 70452
 2016-04-08 12:32:27 +02:00
Anatol Belski
1541a55a4f Fixed bug #68893 Stackoverflow in datefmt_create 2016-04-08 12:31:19 +02:00
Daniel Persson
f7600e17cb Added missing newline. 2016-04-08 12:31:19 +02:00
Daniel Persson
0030fa322f Changed to check for error with the new function that returns null if error is set 2016-04-08 12:31:19 +02:00
Daniel Persson
e3b160bf86 Added function to check error and return null if error is set. 2016-04-08 12:31:19 +02:00
Daniel Persson
ff2af89519 Added tests for bug 70451 and 70452 2016-04-08 12:31:19 +02:00
Xinchen Hui
f63ba809a1 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71986 (Nested foreach assign-by-reference creates broken variables)
 2016-04-08 17:58:31 +08:00
Xinchen Hui
c45f7b97a3 Fixed bug #71986 (Nested foreach assign-by-reference creates broken variables) 2016-04-08 17:57:51 +08:00
Anatol Belski
00b5b3a540 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #70455 Missing constant: IntlChar::NO_NUMERIC_VALUE
 2016-04-08 10:03:29 +02:00
Anatol Belski
93f8eaf3b8 Fixed bug #70455 Missing constant: IntlChar::NO_NUMERIC_VALUE 2016-04-08 09:55:57 +02:00
Anatol Belski
91a4c22598 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71516 IntlDateFormatter losts locale if pattern is set via constructor
 2016-04-08 09:00:58 +02:00
Anatol Belski
49d31fa01d Fixed bug #71516 IntlDateFormatter losts locale if pattern is set via constructor 2016-04-08 08:59:43 +02:00
Nikita Popov
3ad0e1d6ca Fix static method arg binding in traits 2016-04-08 01:48:21 +02:00
Dmitry Stogov
aed4249653 Fixed handling of return statement without a value. 2016-04-07 18:59:04 +03:00
Dmitry Stogov
8921449785 Added missing "break" 2016-04-07 18:27:49 +03:00
Dmitry Stogov
3444c1ae24 Use return type hints for type inference and eliminate useless VERIFY_RETRUN_TYPE opcodes. 2016-04-07 17:34:53 +03:00
Xinchen Hui
708d030b69 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Improved fix for #71940
 2016-04-07 19:30:00 +08:00
Xinchen Hui
c85907682a Improved fix for #71940 2016-04-07 19:28:54 +08:00
Yasuo Ohgaki
dc9ae10bc4 Remove debug code 2016-04-07 17:13:05 +09:00
Xinchen Hui
f48144a7b9 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71940 (Unserialize crushes on restore object reference)
 2016-04-07 13:58:11 +08:00
Xinchen Hui
079239a7ce Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  Remove __halt_compiler from semi-reserved tokens
  Fixed Bug #71974 Trans sid will always be send, even if cookies are available
  Optimized array_fill(). This is a perfect function for fast creation of packed arrays.
  Fixed build
  fix merge mistake
  fix tests
  PostgreSQL's PDOStatement::getColumnMeta() fills in table's name.
  fix indent
  Fixed bug #71978 (Existence of return type hint affects other compatibility rules)
  fix test
  fix bug #71667 (emulate how mssql extension names "computed" columns)
  update NEWS
  add 32-bit specific variont for #62498
  skip test on 32-bit
  make opcache lockfile path configurable
  return zvals instead of strings, cast or not based on stringify attribute
  fix test
  add skip slow test
 2016-04-07 13:58:00 +08:00
Xinchen Hui
7e042224a2 Fixed bug #71940 (Unserialize crushes on restore object reference) 2016-04-07 13:56:55 +08:00
Yasuo Ohgaki
60b144134a Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed Bug #71974 Trans sid will always be send, even if cookies are available
 2016-04-07 10:26:32 +09:00
Yasuo Ohgaki
6467a4eb36 Fixed Bug #71974 Trans sid will always be send, even if cookies are available 2016-04-07 10:26:05 +09:00
Dmitry Stogov
58dd3b3a6f Merge branch 'PHP-7.0' 
* PHP-7.0:
  Optimized array_fill(). This is a perfect function for fast creation of packed arrays.
 2016-04-07 01:02:01 +03:00
Dmitry Stogov
b31240f995 Optimized array_fill(). This is a perfect function for fast creation of packed arrays. 2016-04-07 01:01:11 +03:00
Anatol Belski
31abb8ab50 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix merge mistake
 2016-04-06 18:06:40 +02:00
Anatol Belski
6489edb958 fix merge mistake 2016-04-06 18:05:39 +02:00
Anatol Belski
fc90ddf1f3 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix tests
  PostgreSQL's PDOStatement::getColumnMeta() fills in table's name.
  fix indent
 2016-04-06 17:45:31 +02:00
Anatol Belski
26f9aa7211 fix tests 2016-04-06 17:43:49 +02:00
Petr Sýkora
aeb9c81c09 PostgreSQL's PDOStatement::getColumnMeta() fills in table's name. 2016-04-06 17:43:49 +02:00
Anatol Belski
052c1d337c fix indent 2016-04-06 17:43:49 +02:00
Anatol Belski
6170b2fbae Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test
  fix bug #71667 (emulate how mssql extension names "computed" columns)
 2016-04-06 14:45:35 +02:00
Anatol Belski
ea64d290fe fix test 2016-04-06 14:44:23 +02:00
Adam Baratz
ed3edc2f05 fix bug #71667 (emulate how mssql extension names "computed" columns) 2016-04-06 14:41:55 +02:00
Anatol Belski
9056a36c9b Merge branch 'PHP-7.0' 
* PHP-7.0:
  add 32-bit specific variont for #62498
  skip test on 32-bit
 2016-04-06 14:07:03 +02:00
Anatol Belski
4f7d89a335 add 32-bit specific variont for #62498 2016-04-06 14:05:25 +02:00
Anatol Belski
02fc9cb31f skip test on 32-bit 
The Postgres INT8 datatype is handled as string on 32-bit
 2016-04-06 13:55:32 +02:00
Anatol Belski
2ead9be91b Merge branch 'PHP-7.0' 
* PHP-7.0:
  make opcache lockfile path configurable
 2016-04-06 13:50:24 +02:00
Fatih ACAR
d54eafb349 make opcache lockfile path configurable 
Signed-off-by: William Dauchy <william@gandi.net>
Signed-off-by: Baptiste Daroussin <baptiste.daroussin@gandi.net>
Signed-off-by: Fatih Acar <fatih.acar@gandi.net>
 2016-04-06 13:29:52 +02:00
Anatol Belski
2267812cd2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  return zvals instead of strings, cast or not based on stringify attribute
 2016-04-06 12:23:14 +02:00
Adam Baratz
1e1500a2bc return zvals instead of strings, cast or not based on stringify attribute 2016-04-06 12:18:53 +02:00
Anatol Belski
fe757f09a4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test
  add skip slow test
 2016-04-06 08:24:09 +02:00
Anatol Belski
354a682c38 fix test 2016-04-06 08:21:10 +02:00
Anatol Belski
fd9137c00c add skip slow test 2016-04-06 08:18:32 +02:00
Xinchen Hui
306a842ef1 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed order
  Fixed bug #71969 (str_replace returns an incorrect resulting array after a foreach by reference)
  update NEWS
  Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime()
 2016-04-06 10:21:21 +08:00
Xinchen Hui
e95782ed5e Fixed bug #71969 (str_replace returns an incorrect resulting array after a foreach by reference) 2016-04-06 10:19:24 +08:00
Adam Baratz
a5e21665ee Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime() 2016-04-05 18:24:15 +02:00
Adam Baratz
8a92fed532 Add driver-specific attributes for controlling calls to dbsetlogintime() and dbsettime() 2016-04-05 18:18:37 +02:00
Anatol Belski
ea4d27f47c Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  fix and extend test
  Don't roundtrip to the database to get the column type if you already know it
 2016-04-05 15:13:17 +02:00
Anatol Belski
c2cb4664bc fix and extend test 2016-04-05 15:06:17 +02:00
Joe Bylund
e10257ba80 Don't roundtrip to the database to get the column type if you already know it 
add_assoc_string now takes just three args

nikic's fix to move pqclear outside the if, would be a possible memory leak inside the if

(joe) check behavior of getColumnMeta
 2016-04-05 15:03:04 +02:00
Anatol Belski
9f5970e60a Merge branch 'PHP-7.0' 
* PHP-7.0:
  Use STR_EMPTY_ALLOC macro instead
  Fix DateInterval::format segfault
 2016-04-05 11:24:45 +02:00
Anatol Belski
d10a8e4804 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Use STR_EMPTY_ALLOC macro instead
  Fix DateInterval::format segfault
 2016-04-05 11:24:23 +02:00
Thomas Punt
1aea777349 Use STR_EMPTY_ALLOC macro instead 2016-04-05 11:18:14 +02:00
Thomas Punt
40f14bad33 Fix DateInterval::format segfault 2016-04-05 11:18:14 +02:00
Matteo Beccati
b68e89ee7e Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71447 (Quotes inside comments not properly handled)
  Fixed a few PDO tests to conform to PDO Common standards
  news entry #69537
  Fix #69537: __debugInfo with empty string for key gives error
 2016-04-05 00:07:28 +02:00
Matteo Beccati
4090e709aa Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #71447 (Quotes inside comments not properly handled)
  Fixed a few PDO tests to conform to PDO Common standards
  news entry #69537
  Fix #69537: __debugInfo with empty string for key gives error

Conflicts:
	Zend/zend_compile.c
 2016-04-05 00:07:02 +02:00
Matteo Beccati
30925cd498 Fixed bug #71447 (Quotes inside comments not properly handled) 2016-04-04 23:50:28 +02:00
Matteo Beccati
9a87108eca Fixed a few PDO tests to conform to PDO Common standards 2016-04-04 23:43:17 +02:00
Anatol Belski
b6e42834ed Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix #71943: dblib_handle_quoter needs to allocate an extra byte
 2016-04-04 17:38:04 +02:00
Adam Baratz
9fcfc18ca9 Fix #71943: dblib_handle_quoter needs to allocate an extra byte 2016-04-04 17:33:49 +02:00
Kalle Sommer Nielsen
fcc6bdebc2 Added missing zend_parse_parameters_none() to mb_list_encodings() 2016-04-03 02:28:39 +02:00
Kalle Sommer Nielsen
bb198ec9a6 Fix compiler warnings in mysqlnd 2016-04-03 02:27:25 +02:00
Dmitry Stogov
82050dfd3c fixed type inference mistake (typo) 2016-04-01 20:29:54 +03:00
Anatol Belski
34d3827ecc Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix ODBC bug for varchars returning with length zero
 2016-04-01 17:41:06 +02:00
Elizabeth Marie Smith
4df5f79ab5 Fix ODBC bug for varchars returning with length zero 2016-04-01 17:11:58 +02:00
Dmitry Stogov
7abfaac901 Merge zend_execute_data->called_scope into zend_execute_data->This. 
"called_scope" made sense only for static method calls, for dynamic calls it was always equal to the class of $this.
Now EG(This) may store IS_OBJECT + $this or IS_UNUSED + "called_scope" (of course, "called_scope" may be NULL).
Some code might need to be adopted to support this change.
Checks (Z_OBJ(EX(This))) might need to be converted into (Z_TYPE(EX(This)) == IS_OBJECT).
 2016-04-01 16:17:49 +03:00
Joe Watkins
c72282a13b Merge branch 'master' of https://github.com/php/php-src 2016-03-31 17:10:51 +01:00
Joe Watkins
acfd79b8da Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix #71287 (substr_replace bug when length type is string)
 2016-03-31 17:10:37 +01:00
Joe Watkins
034e8ec02e fix #71287 (substr_replace bug when length type is string) 2016-03-31 17:10:12 +01:00
Dmitry Stogov
f3c70f118c Manual CSE 2016-03-31 17:26:27 +03:00
Joe Watkins
3b13206aa9 Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0 2016-03-31 12:40:15 +01:00
Joe Watkins
8bf6429267 Merge branch 'master' of https://github.com/php/php-src 2016-03-31 12:39:58 +01:00
Joe Watkins
05b44c20e1 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix #71609: Segmentation fault on ZTS with gethostbyname
 2016-03-31 12:39:45 +01:00
Joe Watkins
233115ea23 fix #71609: Segmentation fault on ZTS with gethostbyname 2016-03-31 12:39:01 +01:00
Anatol Belski
44c219b0b4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix borked mainstream patch
  5.5.35 now
 2016-03-31 01:38:38 +02:00
Anatol Belski
e6bb7eb3aa Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix borked mainstream patch
  5.5.35 now
 2016-03-31 01:38:22 +02:00
Anatol Belski
a00c2b1bf5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix borked mainstream patch
  5.5.35 now
 2016-03-31 01:36:47 +02:00
Anatol Belski
4b0b1cec00 fix borked mainstream patch 2016-03-31 01:33:38 +02:00
Anatol Belski
26ed2f3610 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test to not to cause false positives
  Align NEWS entry format
  Align NEWS entry format
 2016-03-31 01:30:50 +02:00
Anatol Belski
9dc6c33740 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix test to not to cause false positives
 2016-03-31 01:30:23 +02:00
Anatol Belski
ed707a5217 fix test to not to cause false positives 2016-03-31 01:29:05 +02:00
Nikita Popov
bc1f884ef7 Merge branch 'PHP-7.0' 2016-03-30 22:49:36 +02:00
Nikita Popov
b1e854f776 Fix bug #71334 
Always duplicate the array before doing a sort with user-defined
comparison function, to avoid access to the intermediate
inconsistent state.

I've also dropped the "array modification" warning, as protection
against modifications is no longer relevant if we're always working
on a copy anyway.

This also required some changes to how SplArray forwards calls to
sorting functions.
 2016-03-30 22:49:27 +02:00
Andrea Faulds
d6fc6d4ae6 Fix memory leak 
Leak was introduced in c88ffa9a56.
 2016-03-30 14:16:07 +01:00
Matteo Beccati
5274353719 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Removed shmop test leaking an shm segment
 2016-03-30 10:01:07 +02:00
Matteo Beccati
3bfe1c55ae Removed shmop test leaking an shm segment 2016-03-30 10:00:28 +02:00
Andrea Faulds
1e82ad8038 Warn about invalid strings in arithmetic 
Squashed commit of the following:

commit e05d3b6732
Author: Andrea Faulds <ajf@ajf.me>
Date:   Wed Mar 30 01:43:35 2016 +0100

    UPGRADING and NEWS

commit 6caf1d4585
Author: Andrea Faulds <ajf@ajf.me>
Date:   Sun Mar 20 21:18:33 2016 +0000

    Fixes

commit 6dadb1b0ef
Author: Andrea Faulds <ajf@ajf.me>
Date:   Sun Feb 14 02:15:01 2016 +0000

    Add test for numeric string errors in assignment

commit bd5f04e8dd
Author: Andrea Faulds <ajf@ajf.me>
Date:   Sat Feb 13 23:53:05 2016 +0000

    Add test for numeric string errors

commit c72e92f16d
Author: Andrea Faulds <ajf@ajf.me>
Date:   Tue Jan 26 23:28:33 2016 +0000

    Add test for scientific notation in integer operations

commit d94c08852d
Author: Andrea Faulds <ajf@ajf.me>
Date:   Sun Feb 14 01:25:57 2016 +0000

    Disable optimiser evaluation for numeric string errors

commit 30ee954ed1
Author: Andrea Faulds <ajf@ajf.me>
Date:   Sun Feb 14 01:46:25 2016 +0000

    fixup

commit a6403b79e0
Author: Andrea Faulds <ajf@ajf.me>
Date:   Sat Feb 13 22:00:27 2016 +0000

    Do not convert error-causing numeric strings ahead-of-time

commit f9dc354014
Author: Andrea Faulds <ajf@ajf.me>
Date:   Sat Feb 13 19:15:38 2016 +0000

    Disable compile-time evaluation for numeric string errors

commit e05b0cc849
Author: Andrea Faulds <ajf@ajf.me>
Date:   Fri Feb 5 11:42:26 2016 +0000

    Make _zval_get_long_func_noisy function for inlining

commit 84d66321a5
Author: Andrea Faulds <ajf@ajf.me>
Date:   Tue Jan 26 23:10:00 2016 +0000

    Update tests

commit 5ac4a0cc4b
Author: Andrea Faulds <ajf@ajf.me>
Date:   Tue Jan 26 22:08:19 2016 +0000

    Use is_numeric_string_ex for zval_get_long etc.

commit c21f088485
Author: Andrea Faulds <ajf@ajf.me>
Date:   Thu Jan 7 21:13:04 2016 +0000

    Update tests

commit 63e214cf81
Author: Andrea Faulds <ajf@ajf.me>
Date:   Wed Jan 6 00:28:01 2016 +0000

    Warn on non-/bad numeric strings in arithmetic
 2016-03-30 01:44:27 +01:00
Anatol Belski
20a87bd007 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix dir separator in test
 2016-03-29 14:20:49 +02:00
Anatol Belski
c7f7139985 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix dir separator in test
 2016-03-29 14:20:30 +02:00
Anatol Belski
23d0065744 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix dir separator in test
 2016-03-29 14:19:35 +02:00
Anatol Belski
551423c642 fix dir separator in test 2016-03-29 14:18:25 +02:00
Anatol Belski
5272184a1e Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file 
The actual fix is applying the upstream patch from
6713ca45e7
 2016-03-29 13:11:25 +02:00
Anatol Belski
84990ab346 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
 2016-03-29 13:11:17 +02:00
Anatol Belski
fe13566c93 Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file 
The actual fix is applying the upstream patch from
6713ca45e7
 2016-03-29 13:10:39 +02:00
Anatol Belski
d1ac9edc50 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71704 php_snmp_error() Format String Vulnerability
  Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut
  Updated to version 2016.3 (2016c)
  Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut
  Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
  Fix bug #71798 - Integer Overflow in php_raw_url_encode
  update NEWS
  Disable huge pages in the Zend allocator by default As per the discussion on internals, this is an expert feature that needs special system-level configuration and care.
  Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.
  Fix bug #71860: Require valid paths for phar filenames
  Fix bug #71860: Require valid paths for phar filenames
  update NEWS
  Fixed bug #71704 php_snmp_error() Format String Vulnerability
  Merge branch 'PHP-5.6' into PHP-7.0
  Updated to version 2016.2 (2016b)
  update libs versions
  set RC1 versions
  Going for 5.5.34
 2016-03-29 11:27:39 +02:00
Anatol Belski
6afa41cf80 Merge remote-tracking branch 'origin/PHP-7.0.5' into PHP-7.0 
* origin/PHP-7.0.5:
  Fixed bug #71704 php_snmp_error() Format String Vulnerability
  Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut
  Updated to version 2016.3 (2016c)
  Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut
  Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
  Fix bug #71798 - Integer Overflow in php_raw_url_encode
  update NEWS
  Disable huge pages in the Zend allocator by default As per the discussion on internals, this is an expert feature that needs special system-level configuration and care.
  Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.
  Fix bug #71860: Require valid paths for phar filenames
  Fix bug #71860: Require valid paths for phar filenames
  update NEWS
  Fixed bug #71704 php_snmp_error() Format String Vulnerability
  Merge branch 'PHP-5.6' into PHP-7.0
  Updated to version 2016.2 (2016b)
  update libs versions
  set RC1 versions
  Going for 5.5.34
 2016-03-29 11:24:33 +02:00
Stanislav Malyshev
67fbb06311 Merge branch 'PHP-5.5' into PHP-7.0.5 
* PHP-5.5:
  Fixed bug #71704 php_snmp_error() Format String Vulnerability
  Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut
  Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut
  Fix bug #71798 - Integer Overflow in php_raw_url_encode
  Fix bug #71860: Require valid paths for phar filenames
  Going for 5.5.34

Conflicts:
	configure.in
	ext/phar/phar_object.c
	ext/phar/tests/badparameters.phpt
	ext/phar/tests/create_path_error.phpt
	ext/phar/tests/pharfileinfo_construct.phpt
	ext/snmp/snmp.c
	ext/standard/url.c
	main/php_version.h
 2016-03-28 23:55:05 -07:00
Stanislav Malyshev
57d170aae0 Merge remote-tracking branch 'security/PHP-7.0.5' into PHP-7.0.5 
* security/PHP-7.0.5:
  Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
  Fix bug #71860: Require valid paths for phar filenames
  update NEWS
  Fixed bug #71704 php_snmp_error() Format String Vulnerability
 2016-03-28 23:49:03 -07:00
Stanislav Malyshev
cc7631dd08 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #71704 php_snmp_error() Format String Vulnerability
 2016-03-28 23:45:15 -07:00
Anatol Belski
9c19a08b9d Fixed bug #71704 php_snmp_error() Format String Vulnerability 
Conflicts:
	ext/snmp/snmp.c
 2016-03-28 23:42:19 -07:00
Stanislav Malyshev
62da5cdf3d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut
  Fix bug #71798 - Integer Overflow in php_raw_url_encode
  Fix bug #71860: Require valid paths for phar filenames
  Going for 5.5.34

Conflicts:
	configure.in
	ext/phar/tests/create_path_error.phpt
	main/php_version.h
 2016-03-28 23:21:15 -07:00
Stanislav Malyshev
f8dd10508b Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut 2016-03-28 23:15:16 -07:00
Derick Rethans
2d112e1378 Updated to version 2016.3 (2016c) 2016-03-28 15:31:51 +02:00
Anatol Belski
e93c6910fc Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file 
The actual fix is applying the upstream patch from
6713ca45e7
 2016-03-28 00:45:19 +02:00
Stanislav Malyshev
95433e8e33 Fix bug #71798 - Integer Overflow in php_raw_url_encode 2016-03-27 14:22:19 -07:00
Nikita Popov
b867bd1c8d Fix FETCH_CLASS_SELF comparisons 
Turns out those don't form a bitfield.
 2016-03-26 22:45:23 +01:00
Nikita Popov
d3ed75b9eb Remove HAVE_CRYPT checks 
We always provide a crypt implementation. HAVE_CRYPT is only
relevant as to whether the crypt() C function exists.
 2016-03-25 21:09:47 +01:00
Nikita Popov
be7a50b9ab Move HAVE_ATTRIBUTE_ALIGNED check outside crypt block 
This is checked outside the crypt() implementation as well.
 2016-03-25 20:50:52 +01:00