mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-14 04:16:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
105,188 Commits 503 Branches 1,384 Tags 812 MiB
4c06d929c0
Commit Graph

46853 Commits

Author SHA1 Message Date
Stanislav Malyshev
4c06d929c0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix tsrm_ls
  Fix #76129 - remove more potential unfiltered outputs for phar
  Fix test
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
  Fix bug #76249 - fail on invalid sequences
  Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
  Fix bug #75981: prevent reading beyond buffer start
 2018-04-23 22:03:33 -07:00
Stanislav Malyshev
95ee9efa57 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix tsrm_ls
  Fix #76129 - remove more potential unfiltered outputs for phar
  Fix test
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
  Fix bug #76249 - fail on invalid sequences
  Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
  Fix bug #75981: prevent reading beyond buffer start
 2018-04-23 22:00:24 -07:00
Stanislav Malyshev
5a18d7a0df Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix tsrm_ls
  Fix #76129 - remove more potential unfiltered outputs for phar
  Fix test
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
  Fix bug #76249 - fail on invalid sequences
  Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
  Fix bug #75981: prevent reading beyond buffer start
 2018-04-23 21:59:57 -07:00
Stanislav Malyshev
ee76a5ae5a Fix tsrm_ls 2018-04-23 16:48:27 -07:00
Stanislav Malyshev
58b0003975 Merge remote-tracking branch 'security/bug76249' into PHP-5.6 
* security/bug76249:
  Fix test
  Fix bug #76249 - fail on invalid sequences
 2018-04-23 13:44:19 -07:00
Stanislav Malyshev
a4c55eefd0 Merge remote-tracking branch 'security/bug76248' into PHP-5.6 
* security/bug76248:
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
 2018-04-23 13:44:12 -07:00
Stanislav Malyshev
6e64aba47f Fix #76129 - remove more potential unfiltered outputs for phar 2018-04-23 13:43:43 -07:00
Stanislav Malyshev
8dca5ae5ec Fix test 2018-04-22 22:19:51 -07:00
Stanislav Malyshev
49782c5499 Fix bug #76248 - Malicious LDAP-Server Response causes Crash 2018-04-22 22:01:35 -07:00
Stanislav Malyshev
06d309fd7a Fix bug #76249 - fail on invalid sequences 2018-04-22 21:26:39 -07:00
Stanislav Malyshev
83e7618f05 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Add a bit of defensive conding for bug #76155
 2018-04-22 20:28:35 -07:00
Stanislav Malyshev
ff83c00715 Add a bit of defensive conding for bug #76155 
Even though it should not be ever negative, since strlen() is size_t
better to be safe than sorry.
 2018-04-22 20:27:42 -07:00
Christoph M. Becker
b4e4788c44 Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value 
The MakerNote is not necessarily null-terminated, so we must not use
`strlen()` to avoid OOB reads.  Instead `php_strnlen()` is the proper
way to handle this.
 2018-04-22 20:15:02 -07:00
Jakub Zelenka
98e43a33c8 Merge branch 'PHP-7.1' into PHP-7.2 2018-04-15 20:42:28 +01:00
Jakub Zelenka
2ef8809ef3 Make openssl_error_string test work in OpenSSL 1.1.1 
It was the only failing test
 2018-04-15 20:41:23 +01:00
Nikita Popov
ac732d75bd Merge branch 'PHP-7.1' into PHP-7.2 2018-04-14 13:06:00 +02:00
Aron Rotteveel
9090a21de0 reset imap_errorstack after outputting it 
This happens in `imap_errors` as well, but seems to be omitted in the `shutdown` routine.
 2018-04-14 13:04:40 +02:00
Christoph M. Becker
3770c2e463 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix arginfo for array_replace(_recursive) and array_merge(_recursive)
 2018-04-13 15:28:47 +02:00
Gabriel Caruso
bb79e5764b Fix arginfo for array_replace(_recursive) and array_merge(_recursive) 2018-04-13 15:27:16 +02:00
Christoph M. Becker
281a1754b9 Fix #76164: exif_read_data zend_mm_heap corrupted 
We must not release parsed parameters ourselves, since this is already
done by the engine.
 2018-04-12 23:00:37 +02:00
Anatol Belski
9f4905fb0d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix memory leak
 2018-04-12 18:25:58 +02:00
Anatol Belski
5fe6d2134b Fix memory leak 2018-04-12 18:25:27 +02:00
Andrew Nester
68296c4055 Fixed #74892 - Fixed URL rewriting for urls started with # 
(cherry picked from commit 6c32d271d2)

This should have already been merged via
9cd82df0bb, but that merge went wrong.
 2018-04-12 17:28:35 +02:00
Anatol Belski
e01f88df7c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Group common flags
 2018-04-05 16:45:41 +02:00
Anatol Belski
09d7ffabcd Group common flags 2018-04-05 16:44:12 +02:00
Anatol Belski
7768f5e2de Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Rename var
 2018-04-05 14:54:14 +02:00
Anatol Belski
ed5aabe8b7 Rename var 2018-04-05 14:52:40 +02:00
Anatol Belski
2115878aaa Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Sync fix for bug #72498 for 32-bit
 2018-04-03 17:25:13 +02:00
Anatol Belski
821f13fd79 Sync fix for bug #72498 for 32-bit 2018-04-03 17:24:13 +02:00
Anatol Belski
22e8a3c347 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix shared ext/intl compilation
 2018-04-03 10:43:17 +02:00
Anatol Belski
2bd299f731 Fix shared ext/intl compilation 2018-04-03 10:42:14 +02:00
Rasmus Lerdorf
aaae3637e0 Better explanation for the opcache.max_wasted_percentage ini setting 
since it was pretty confusing before
 2018-03-30 13:24:17 -07:00
Christoph M. Becker
76f421dd3a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #52070: imagedashedline() - dashed line sometimes is not visible
 2018-03-30 19:29:10 +02:00
Christoph M. Becker
9c37d95627 Fix #52070: imagedashedline() - dashed line sometimes is not visible 
We finally remove the inadvertent leftover from the synchronization
with GD 2.0.12.
 2018-03-30 19:22:23 +02:00
Anatol Belski
35e3d597f5 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix clang build, ref buf #76153
 2018-03-30 14:16:44 +02:00
Anatol Belski
8b104d7893 Fix clang build, ref buf #76153 
Clang only allows -std=c++11 for C++ source.
 2018-03-30 14:14:35 +02:00
Anatol Belski
9510611cdd Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Adjust tests for ICU 61.1 compatibility
 2018-03-29 14:13:48 +02:00
Anatol Belski
398f56dbc8 Adjust tests for ICU 61.1 compatibility 2018-03-29 14:12:19 +02:00
Anatol Belski
4e39968e4d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76153 Intl compilation fails with icu4c 61.1
 2018-03-28 18:04:09 +02:00
Anatol Belski
710284cbc4 Fixed bug #76153 Intl compilation fails with icu4c 61.1 
Additionally, ICU >= 59.1 requires C++11, so add the flags. Some
refactoring is needed to comply with the latest recommended build
options, such as automatic icu namespace addition.
 2018-03-28 18:01:44 +02:00
Joe Watkins
fc6cbc3eaa
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed #75996: Add the right urls to the header of mt_rand.
 2018-03-27 22:09:42 +02:00
TATAR Balazs Janos
ac4d9fd055
Fixed #75996: Add the right urls to the header of mt_rand. 2018-03-27 22:09:08 +02:00
Joe Watkins
3e267ca91b
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #76131 some arginfo params are different from the documentation
 2018-03-27 21:58:24 +02:00
Gabriel Caruso
63934ea71e
Fix #76131 some arginfo params are different from the documentation 2018-03-27 21:56:46 +02:00
Nikita Popov
3306577797 Followup fix for bug #75729 
The case of overloaded substr() with 3 arguments was not handled.
 2018-03-24 13:15:59 +01:00
Derick Rethans
c72c4c5271 Updated to version 2018.4 (2018d) 2018-03-24 11:26:16 +00:00
Derick Rethans
869ca9b733 Updated to version 2018.4 (2018d) 2018-03-24 11:26:15 +00:00
Tom Van Looy
7f4327bc24 Fix expat_compat.h path used in #include 
Using ext/xml/expat_compat.h does not work if the extension is
compiled out-of-tree.
 2018-03-23 22:01:25 +01:00
atvoicu
17ed2f21cf Add missing skip prefix for some SKIPIF messages 2018-03-23 18:56:36 +01:00
Christoph M. Becker
8f5c34cd39 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #76113: mbstring does not build with Oniguruma 6.8.1
 2018-03-20 16:53:17 +01:00