mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-12 03:15:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
105,374 Commits 503 Branches 1,384 Tags 798 MiB
ae163d9a36
Commit Graph

105374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Anatol Belski
c5276ad380 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update SDK version for AppVeyor
 2018-06-28 15:58:20 +02:00
Anatol Belski
f6430e3fe2 Update SDK version for AppVeyor 2018-06-28 15:56:27 +02:00
Anatol Belski
e835916f65 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Sync versions for VC++ 15.8
 2018-06-28 13:28:46 +02:00
Anatol Belski
88b5df91f6 Sync versions for VC++ 15.8 2018-06-28 13:23:19 +02:00
Anatol Belski
b35f45ded2 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Don't ignore commits on NEWS, etc. on AppVeyor
 2018-06-28 10:54:59 +02:00
Anatol Belski
19b4fa17d3 Don't ignore commits on NEWS, etc. on AppVeyor 
[ci skip] can be used explicitly, and otherwise it might ignore commits
with a code change.
 2018-06-28 10:53:23 +02:00
Xinchen Hui
809a7b5f8f Update NEWS 2018-06-28 12:38:14 +08: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
Xinchen Hui
7b98d056d3 Update NEWS 2018-06-27 13:07:53 +08:00
Xinchen Hui
3521661bd1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76534 (PHP hangs on 'illegal string offset on string references with an error handler)

Conflicts:
	Zend/zend_execute.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2018-06-27 13:07:36 +08:00
Xinchen Hui
d1b1866a3a Fixed bug #76534 (PHP hangs on 'illegal string offset on string references with an error handler) 2018-06-27 13:05:11 +08:00
Christoph M. Becker
2458dab466 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix arginfo wrt. optional/required parameters
 2018-06-25 11:54:45 +02:00
Christoph M. Becker
6b5597f7d8 Fix arginfo wrt. optional/required parameters 
All parameters of phpdbg_color(), phpdbg_exec() and phpdbg_prompt() are
required.  We mark them as such.
 2018-06-25 11:52:17 +02: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
Nikita Popov
14b22704c7 Merge branch 'PHP-7.1' into PHP-7.2 2018-06-24 22:28:57 +02:00
Nikita Popov
701460ba84 Fixed bug #76502 2018-06-24 22:26:45 +02:00
Nikita Popov
ed9d1b708b Fixed bug #76520 2018-06-22 16:22:04 +02:00
Dmitry Stogov
4a4c72a82a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Added parenthesis
 2018-06-22 12:04:39 +03:00
Dmitry Stogov
1f726c9925 Added parenthesis 2018-06-22 12:04:23 +03: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
e62c6e7dbe Update NEWS 2018-06-21 17:26:45 +08: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
Nikita Popov
44f4d2be01 Merge branch 'PHP-7.1' into PHP-7.2 2018-06-20 12:30:19 +02:00
Nikita Popov
69dee5c732 Fixed bug #73342 
Directly listen on socket, instead of duping it to STDIN and
listening on that.
 2018-06-20 12:28:15 +02: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