php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Code Issues Packages Projects Releases Wiki Activity
107,850 Commits 549 Branches 1,485 Tags
2cc6922cbfd8ff4f72e70c1d7e006d06454bb36d
Commit Graph

107850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov 2cc6922cbf Merge branch 'PHP-7.2' 2018-07-02 17:59:33 +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 a57b5e82a9 Merge branch 'PHP-7.2' 2018-07-02 17:30:07 +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
Rudi Theunissen 30156d588c Fixed bug #63217 
Don't automatically convert literal string keys to integers on
array access, as we may be dealing with an ArrayAccess object,
rather than a plain array.
 2018-07-02 16:41:59 +02:00
Anatol Belski 6d61814d0e Remove the forked test and adjust the original one 2018-07-02 16:08:09 +02:00
Dmitry Stogov 091d77f28a Avoid magic method hash lookups 2018-07-02 17:03:50 +03:00
Dmitry Stogov 43aca3118a Avoid string comparisons for magic methods (all magic methods start with "__") 2018-07-02 17:03:02 +03:00
Anatol Belski a63e834b66 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Update libs_version.txt
 2018-07-02 12:12:39 +02:00
Anatol Belski 26a33a96fa Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update libs_version.txt
 2018-07-02 12:12:02 +02:00
Anatol Belski f8258325b4 Update libs_version.txt 2018-07-02 12:09:54 +02:00
Jakub Zelenka d404b5e255 Add ssl/tls streams options for min and max proto version 2018-07-01 18:46:52 +01:00
Jakub Zelenka ce0721bee5 Update NEWS, UPGRADING and default php.ini files with syslog changes 2018-07-01 18:27:36 +01:00
Philip Prindeville 2475337bd8 Add syslog's ident and facility parameters to config 
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
 2018-07-01 18:08:07 +01:00
Christoph M. Becker 0c4f4481f5 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Make newly introduced bug76556.phpt more resilient
 2018-07-01 00:23:06 +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 1b61c3b210 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix #76556: get_debug_info handler for BreakIterator shows wrong type
 2018-06-30 23:22:20 +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 8faa6ef30e Add test for void return type on internal function 2018-06-30 20:14:15 +02:00
Nikita Popov 7909d4532c Merge branch 'PHP-7.2' 2018-06-30 20:11:59 +02:00
Nikita Popov 0f1726e45d Merge branch 'PHP-7.1' into PHP-7.2 2018-06-30 20:11:39 +02:00
Nikita Popov 9b0df97a42 Fix handling of void return type on internal functions 2018-06-30 20:10:57 +02:00
Nikita Popov 5d7be2c2bc Merge branch 'PHP-7.2' 2018-06-30 19:50:56 +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 abbc1e683c Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix #71848: getimagesize with $imageinfo returns false
 2018-06-30 16:50:49 +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
Peter Kokot 7c04219098 Fix pecl vs ext typo in phar 
Phar phpinfo output lists also info about bz2 extension if it's
disabled and a quick info about installation. Instead of not maintained
pecl package bz2 the ext/bz2 should be mentioned. Also some outdated
pecl/phar are updated to ext/phar instead in test comments.
 2018-06-30 15:35:43 +02:00
Christoph M. Becker 8bc2163c8a Add ext/sodium to php.ini-* 2018-06-30 14:52:30 +02:00
Nikita Popov 43c533d799 Merge branch 'PHP-7.2' 2018-06-29 23:23:08 +02:00
Nikita Popov deb1bad80f Merge branch 'PHP-7.1' into PHP-7.2 2018-06-29 23:23:02 +02:00
Nikita Popov 962706d16c Fix nullable type pretty-printing 2018-06-29 23:22:41 +02:00
Nikita Popov 7ac06d66d4 Add zend_update_static_property_ex API 
And cleanup the implementation to perform a normal by-value
assignment.
 2018-06-29 22:56:59 +02:00
Nikita Popov 813b6fc950 Add zend_read_static_property_ex API 
For symmetry with zend_read_property_ex.
 2018-06-29 22:49:15 +02:00
Nikita Popov 10b484e624 Fix build 
These were changed in 6e77a60a75.
 2018-06-29 22:44:58 +02:00
Anatol Belski 7a6dc29605 [ci skip] Update NEWS 2018-06-29 20:12:45 +02:00
Anatol Belski efdf4a83b1 Merge branch 'PHP-7.2' 
* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
 2018-06-29 20:12:24 +02:00
Anatol Belski 15ad5d31d1 [ci skip] Update NEWS 2018-06-29 20:11:55 +02:00
Anatol Belski ef274e0b60 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] Update NEWS
 2018-06-29 20:11:23 +02:00
Anatol Belski fb09f1341f [ci skip] Update NEWS 2018-06-29 20:10:54 +02:00
Anatol Belski ff8f2710f6 Check return value of pcre2_maketables() 2018-06-29 19:15:38 +02:00
Anatol Belski 4ff6c0cb44 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #76548 pg_fetch_result did not fetch the next row
 2018-06-29 18:36:22 +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
Dmitry Stogov 6e77a60a75 Removed INIT_OVERLOADED_CLASS... macros 2018-06-29 14:41:35 +03:00