archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
99637 commits 526 branches 1434 tags 878 MiB
Commit graph

99637 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nikita Popov
c0fbd86aec Merge branch 'PHP-7.1' 2016-10-12 23:05:19 +02:00
Nikita Popov
1119cdae42 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-12 23:05:10 +02:00
Mitch Hagstrand
bcee2fdbec Fixed bug in zend_accel_error() and cleaned up kill_all_lockers() 
1. zend_accel_error was only executing clean up if log_verbosity_level is high enough to log
2. Cleaned up kill_all_lockers function and fixed comments.
 2016-10-12 23:03:55 +02:00
Bob Weinand
3a5e5d7731 Merge branch 'PHP-7.1' 2016-10-12 22:57:58 +02:00
Bob Weinand
457e686262 Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1 2016-10-12 22:57:41 +02:00
Bob Weinand
fe49fd7dad Update NEWS 
Also add missing include.inc test file
 2016-10-12 22:54:32 +02:00
Nikita Popov
0fc787cfb8 Merge branch 'PHP-7.1' 2016-10-12 22:46:40 +02:00
Nikita Popov
9669ec707a Merge branch 'PHP-7.0' into PHP-7.1 2016-10-12 22:46:28 +02:00
Nikita Popov
fe378c27cc Fix phpdbg tests after lineno change 2016-10-12 22:41:59 +02:00
Nikita Popov
f47b36cc5c Merge branch 'PHP-7.1' 2016-10-12 22:26:34 +02:00
Nikita Popov
26964ccea0 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-12 22:26:28 +02:00
Nikita Popov
5b429fef42 Fix line number of implicit return in pseudo-main scope 2016-10-12 22:25:41 +02:00
Anatol Belski
829ae1dfa0 Merge branch 'PHP-7.1' 
* PHP-7.1:
  export symbol missing by phpdbg
 2016-10-12 22:23:26 +02:00
Anatol Belski
c762c8f3c0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  export symbol missing by phpdbg
 2016-10-12 22:21:19 +02:00
Anatol Belski
611ab7fe5b export symbol missing by phpdbg 2016-10-12 22:18:41 +02:00
Bob Weinand
1f147e3a55 Merge branch 'PHP-7.1' 2016-10-12 22:18:38 +02:00
Bob Weinand
8c01eef70f Merge branch 'PHP-7.0' into PHP-7.1 2016-10-12 22:17:41 +02:00
Bob Weinand
671d8054f8 Fix accidental PHPDBG_ABI break 2016-10-12 22:16:11 +02:00
Anatol Belski
1f964e11ba Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #73189 - Memcpy negative size parameter php_resolve_path
 2016-10-12 21:33:27 +02:00
Anatol Belski
f7aa911d9b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73189 - Memcpy negative size parameter php_resolve_path
 2016-10-12 21:33:13 +02:00
Stanislav Malyshev
c4c2cce37d Fix bug #73189 - Memcpy negative size parameter php_resolve_path 
(cherry picked from commit da7e89cde8)
 2016-10-12 21:31:37 +02:00
Anatol Belski
03da9ba617 Merge branch 'PHP-7.1' 
* PHP-7.1:
  update len in fallback cases
 2016-10-12 20:55:16 +02:00
Anatol Belski
d46673d9ce Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update len in fallback cases
 2016-10-12 20:54:43 +02:00
Anatol Belski
58b18892bf update len in fallback cases 2016-10-12 20:52:46 +02:00
Anatol Belski
dba6969a93 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix wrong merge
 2016-10-12 20:26:38 +02:00
Anatol Belski
821a230f29 fix wrong merge 2016-10-12 20:21:50 +02:00
Bob Weinand
92db1c81b3 Merge branch 'PHP-7.1' 2016-10-12 20:19:33 +02:00
Bob Weinand
37ae5f3931 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-12 20:19:10 +02:00
Bob Weinand
5aae01104f Add stdin command and -s command line parameter to phpdbg 
This allows reading the initial script file from stdin instead of being forced to put the script into a file in order to run it with phpdbg.
Especially important for programmatic execution of phpdbg.

Also adding tests/include_once.phpt and tests/set_exception_handler.phpt as I seem to have forgotten to git add them sometime long ago...
 2016-10-12 20:15:49 +02:00
Anatol Belski
76ff13d148 Merge branch 'master' of git.php.net:php-src 2016-10-12 20:12:08 +02:00
Anatol Belski
6a98b21e69 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #73190: memcpy negative parameter _bc_new_num_ex
  fix test
  finish 7.1 port
 2016-10-12 20:09:57 +02:00
Anatol Belski
af1bf873fe Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73190: memcpy negative parameter _bc_new_num_ex
 2016-10-12 20:09:24 +02:00
Stanislav Malyshev
74b5662536 Fix bug #73190: memcpy negative parameter _bc_new_num_ex 
(cherry picked from commit 40e7baab3c)
 2016-10-12 19:48:25 +02:00
Anatol Belski
4a39df1261 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix test
 2016-10-12 19:29:42 +02:00
Anatol Belski
fa9370db03 fix test 2016-10-12 19:28:15 +02:00
Anatol Belski
10fe10ee1f Merge branch 'PHP-7.1' 
* PHP-7.1:
  finish 7.1 port
 2016-10-12 18:33:28 +02:00
Anatol Belski
f1fff032fc finish 7.1 port 2016-10-12 18:31:59 +02:00
Adam Baratz
0eeb06bf17 Addendum to #73234: Assume param types are nullable 2016-10-12 11:59:01 -04:00
Anatol Belski
cba18b61c1 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #73147: Use After Free in PHP7 unserialize()
 2016-10-12 17:57:07 +02:00
Anatol Belski
b1ef60f90e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73147: Use After Free in PHP7 unserialize()
 2016-10-12 17:56:13 +02:00
Stanislav Malyshev
f42cbd749c Fix bug #73147: Use After Free in PHP7 unserialize() 
(cherry picked from commit 0e6fe3a4c9)
 2016-10-12 17:51:15 +02:00
Anatol Belski
7ed614a1be Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix typo
 2016-10-12 17:13:38 +02:00
Anatol Belski
929b04520e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix typo
 2016-10-12 17:13:23 +02:00
Anatol Belski
efc1f33b58 fix typo 2016-10-12 17:12:38 +02:00
Anatol Belski
c9d0a0a87c Merge branch 'PHP-7.1' 
* PHP-7.1:
  Revert "Fix for #73240 - Write out of bounds at number_format"
  followup with #73276 merge
  fix test
  Fix bug #73276 - crash in openssl_random_pseudo_bytes function
  Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML()
  Fix for #73240 - Write out of bounds at number_format
  avoid strlen
  Bug #73218: add mitigation for ICU int overflow
  Add more locale length checks, due to ICU bugs.
  Fix bug #73150: missing NULL check in dom_document_save_html
  Clear FG(user_stream_current_filename) when bailing out
  set versions and release date
  sync NEWS
  Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"
  Fix for #73240 - Write out of bounds at number_format
  Fix bug #73257 and bug #73258 - SplObjectStorage unserialize allows use of non-object as key
  set versions
  Fix bug #73091 - Unserializing DateInterval object may lead to __toString invocation
 2016-10-12 16:24:51 +02:00
Anatol Belski
b184eeefe4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "Fix for #73240 - Write out of bounds at number_format"
 2016-10-12 16:14:58 +02:00
Anatol Belski
80eb013a92 Revert "Fix for #73240 - Write out of bounds at number_format" 
This reverts commit 01280f8deb.

The fix is already merged by Stas.
 2016-10-12 16:12:18 +02:00
Anatol Belski
d103a41679 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  followup with #73276 merge
  fix test
  Fix bug #73276 - crash in openssl_random_pseudo_bytes function
  Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML()
  Fix for #73240 - Write out of bounds at number_format
  avoid strlen
  Bug #73218: add mitigation for ICU int overflow
  Add more locale length checks, due to ICU bugs.
  Fix bug #73150: missing NULL check in dom_document_save_html
  Clear FG(user_stream_current_filename) when bailing out
  set versions and release date
  sync NEWS
  Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"
  Fix for #73240 - Write out of bounds at number_format
  Fix bug #73257 and bug #73258 - SplObjectStorage unserialize allows use of non-object as key
  set versions
  Fix bug #73091 - Unserializing DateInterval object may lead to __toString invocation
 2016-10-12 16:06:11 +02:00
Anatol Belski
b135ba3fa9 followup with #73276 merge 2016-10-12 16:03:35 +02:00
Anatol Belski
7c6cb1282d fix test 2016-10-12 16:03:09 +02:00