php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 14:31:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
105,396 Commits 547 Branches 1,483 Tags
d207fd449cd188085b600783bec7574269392ed2
Commit Graph

46968 Commits

Author SHA1 Message Date
Anatol Belski
d85651d58d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix event log handling in startup phase
  Fix bug #76488 Memory leak when fetching a BLOB field
  Fix year
  Bump version
 2018-07-06 16:08:17 +02:00
sim1984
3847a6fcb6 Fix bug #76488 Memory leak when fetching a BLOB field 
Add a phpt test
 2018-07-06 16:07:28 +02:00
Nikita Popov
f3dc67b255 Merge branch 'PHP-7.1' into PHP-7.2 2018-07-05 19:11:25 +02:00
Nikita Popov
791f07e4f0 Fix string.strip_tags filter 
Was segfaulting if no allowed tags are specified and performing an
out of bounds read if they were.
 2018-07-05 19:08:00 +02:00
Anatol Belski
e5ef7cbe87 Fixed bug #76564 ext/zip link issues 
Add zlib for linking directly, so then ext/zlib is not required.
 2018-07-03 15:45:01 +02:00
Nikita Popov
9bbb9e537c Merge branch 'PHP-7.1' into PHP-7.2 2018-07-02 18:57:25 +02:00
Nikita Popov
c97b8bbf82 Fixed bug #75231 
The behavior is now consistent with ReflectionMethod.
 2018-07-02 18:56:27 +02:00
Nikita Popov
3a236d0587 Merge branch 'PHP-7.1' into PHP-7.2 2018-07-02 17:59:15 +02:00
Nikita Popov
787593b708 Fix test after serialization change 
And move it to a more appropriate location.
 2018-07-02 17:58:26 +02:00
Nikita Popov
09bb2527e9 Merge branch 'PHP-7.1' into PHP-7.2 2018-07-02 17:29:32 +02:00
Nikita Popov
c793885b76 Fixed bug #74670 
Validate that "C" serialization payload is followed by "}" prior to
calling the unserialize() handler. This mitigates issues caused by
unserialize() not correctly handling strings that are not NUL
terminated. Making sure that there is a "}" at the end avoids the
problem.
 2018-07-02 17:27:43 +02:00
Christoph M. Becker
39d668e927 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Make newly introduced bug76556.phpt more resilient
 2018-07-01 00:21:34 +02:00
Christoph M. Becker
a72bab1b9a Make newly introduced bug76556.phpt more resilient 
Obviously, different compilers mangle the C++ class name differently.
We should neither expect a prefix nor a suffix.
 2018-07-01 00:20:32 +02:00
Christoph M. Becker
ae163d9a36 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #76556: get_debug_info handler for BreakIterator shows wrong type
 2018-06-30 23:17:54 +02:00
Christoph M. Becker
1118fca75d Fix #76556: get_debug_info handler for BreakIterator shows wrong type 
We use the retrieved type for the "type" element instead of the text.
This has been confused during the PHP 7 upgrade[1].

[1] http://git.php.net/?p=php-src.git;a=commit;h=1d793348067e5769144c0f7efd86428a4137baec
 2018-06-30 23:15:02 +02:00
Nikita Popov
34deda13a8 Merge branch 'PHP-7.1' into PHP-7.2 2018-06-30 19:50:40 +02:00
Nikita Popov
2eb6a541a9 Fix typo in compound dim assign op inference 
Thankfully a harmless one, just makes inference results worse.
 2018-06-30 19:50:07 +02:00
Christoph M. Becker
e2285eb542 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #71848: getimagesize with $imageinfo returns false
 2018-06-30 16:40:32 +02:00
Christoph M. Becker
ae04110032 Fix #71848: getimagesize with $imageinfo returns false 
Some JFIF images contain empty APP segments, i.e. those which consist
only of the marker bytes and the length, but without actual content.
It appears to be doubtful to have empty APP segments, but we should
apply the robustness principle, and accept these, instead of simply
failing in this case.

We choose to add empty APP segments to $imageinfo with an empty string
as value, instead of NULL, or even to omit these segments altogether.

This patch also fixes the potential issue that php_stream_read() might
not read the supposed number of bytes, which could result in garbage to
be added to the read value.
 2018-06-30 16:29:30 +02:00
Anatol Belski
486f18f09e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76548 pg_fetch_result did not fetch the next row
 2018-06-29 18:35:44 +02:00
Anatol Belski
cb97fd3097 Fixed bug #76548 pg_fetch_result did not fetch the next row 2018-06-29 18:34:53 +02:00
Nikita Popov
00c0d7702c Merge branch 'PHP-7.1' into PHP-7.2 2018-06-28 23:05:09 +02:00
Marcus Schwarz
bf5a802f5a Fixed bug #76532 (excessive memory usage in mb_strimwidth) 2018-06-28 23:02:28 +02:00
Xinchen Hui
5d7f9dcca7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76536 (PHP crashes with core dump when throwing exception in error handler). (Laruence)
 2018-06-28 12:37:58 +08:00
Xinchen Hui
1f6b842af4 Fixed bug #76536 (PHP crashes with core dump when throwing exception in error handler). (Laruence) 2018-06-28 12:37:33 +08:00
Anatol Belski
096fd88dcb Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Prepare tests for ICU 62.1
 2018-06-25 11:31:21 +02:00
Anatol Belski
5af0db88fa Prepare tests for ICU 62.1 2018-06-25 11:30:14 +02:00
Jakub Zelenka
d95ee27551 Make new openssl ext tests in 7.2 consitent 2018-06-21 17:02:44 +01:00
Jakub Zelenka
77bd405959 Merge branch 'PHP-7.1' into PHP-7.2 2018-06-21 16:47:08 +01:00
Jakub Zelenka
b20bcbc363 Use unix NL in all openssl ext tests 2018-06-21 16:43:32 +01:00
Jakub Zelenka
3c42f64e6e Make code in openssl ext tests more consistent 
Mainly use spaces for indent and fix some other CS issues. Also
drop checks for unsupported OpenSSL library versions.
 2018-06-21 16:38:19 +01:00
Xinchen Hui
939e1095f2 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys)
 2018-06-21 17:26:27 +08:00
Xinchen Hui
6531719da5 Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys) 2018-06-21 17:26:05 +08:00
Stanislav Malyshev
011be49dda Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Revert "ICU 59+ requires C++11 and errors out without the option"
 2018-06-20 10:41:59 -07:00
Stanislav Malyshev
bcf2e10ae7 Revert "ICU 59+ requires C++11 and errors out without the option" 
This reverts commit 5dd1ef90ca.
 2018-06-20 10:41:41 -07:00
Stanislav Malyshev
61a4fc4e44 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  ICU 59+ requires C++11 and errors out without the option
 2018-06-17 16:42:49 -07:00
Stanislav Malyshev
5dd1ef90ca ICU 59+ requires C++11 and errors out without the option 2018-06-17 16:42:41 -07:00
Pedro Magalhães
13e9a471d7 Fix #76300 - Dont attempt to change visibility of a parent private 2018-06-17 15:53:55 -07:00
Xinchen Hui
f31ba7cb53 Fixed bug #76477 (Opcache causes empty return value) 2018-06-15 16:31:31 +08:00
Dmitry Stogov
dad8bd5851 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed invalid free introduced by d6e81f0bfd (avoid keeping "invalid" pointer)
 2018-06-14 02:40:59 +03:00
Dmitry Stogov
11507c0e1b Fixed invalid free introduced by d6e81f0bfd (avoid keeping "invalid" pointer) 2018-06-14 02:38:39 +03:00
Nikita Popov
d04a1e8d70 Merge branch 'PHP-7.1' into PHP-7.2 2018-06-13 23:48:28 +02:00
Nikita Popov
e77077edeb Make $locale parameter to BreakIterator ctors optional 
It's documented as such and already accepts null.
 2018-06-13 23:47:20 +02:00
Anatol Belski
5f1190684f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76462 Undefined property: DateInterval::$f
 2018-06-12 15:31:01 +02:00
Anatol Belski
7212829435 Fixed bug #76462 Undefined property: DateInterval::$f 2018-06-12 15:30:14 +02:00
Remi Collet
075e685439 Add OPSYS_CPM constant as documented and to match libzip naming 2018-06-12 09:31:41 +02:00
Nikita Popov
3d7284d09e Merge branch 'PHP-7.1' into PHP-7.2 2018-06-10 21:21:11 +02:00
Nikita Popov
6c9db02ff7 Fix mysqlnd build without openssl 
Cherry-pick of 968eb0b38c, as these
changes were also introduced in lower branches.
 2018-06-10 21:20:28 +02:00
Anatol Belski
66badcdc0c Fix test portability 2018-06-09 20:57:17 +02:00
Christoph M. Becker
3fdde65617 Fix #76409: heap use after free in _php_stream_free 
We must not close the stream in exif_read_from_impl(), since it is the
responsibility of the (caller's) caller to do so, if it actually opened
the stream.

We simplify the reproduce script, which is actually about supplying a
path to a directory (opposed to a regular file), and use `.` instead of
`/` to also make it work on Windows.
 2018-06-09 17:52:05 +02:00