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
Bob Weinand
8af4882193 Merge branch 'PHP-7.1' 2016-10-14 12:25:34 +02:00
Bob Weinand
386aff451b Merge branch 'PHP-7.0' into PHP-7.1 2016-10-14 12:25:16 +02:00
Bob Weinand
466870e2b0 Fix memory leak when compiling files in phpdbg 2016-10-14 12:24:28 +02:00
Remi Collet
35f5672129 Merge branch 'PHP-7.1' 
* PHP-7.1:
  use zend_error instead of zend_error_noreturn
 2016-10-14 10:55:10 +02:00
Remi Collet
aecd165b8f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  use zend_error instead of zend_error_noreturn
 2016-10-14 10:54:47 +02:00
Remi Collet
428ef50838 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  use zend_error instead of zend_error_noreturn
 2016-10-14 10:54:09 +02:00
Remi Collet
e1f5b6d8df use zend_error instead of zend_error_noreturn 2016-10-14 10:53:40 +02:00
Ferenc Kovacs
e8c821f2b5 Merge branch 'PHP-7.1' 2016-10-14 08:10:07 +02:00
Ferenc Kovacs
65e6f7e16f Merge branch 'PHP-7.0' into PHP-7.1 2016-10-14 08:09:29 +02:00
Ferenc Kovacs
d0b9d72da7 Merge branch 'PHP-5.6' into PHP-7.0 2016-10-14 08:08:10 +02:00
Ferenc Kovacs
f7bf9650aa add missing NEWS entries for 5.6.27 2016-10-14 08:06:14 +02:00
Keith Smiley
3b9ba6195d soap #69137 - Invert logic to be correct 2016-10-13 23:56:24 -04:00
Anatol Belski
1ecd141d62 Merge branch 'PHP-7.1' 
* PHP-7.1: (47 commits)
  missed piece for renaming
  rename publicly exposed symbol to avoid name conflicts
  Ignore non-executable opcodes in line mode of phpdbg_end_oplog()
  fix gettimeofday proto availability
  Fix #73280: Stack Buffer Overflow in GD dynamicGetbuf
  fix test
  use already exported symbol
  Revert "export symbol missing by phpdbg"
  Merge branch 'PHP-7.0' into PHP-7.1
  Syncronize with 5.6 - __toString should return ""
  Fix potential overflows in php_pcre_replace_impl
  Fixed bug #73237
  fix another mistake
  Fixed bug in zend_accel_error() and cleaned up kill_all_lockers()
  Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1
  Merge branch 'PHP-7.0' into PHP-7.1
  Merge branch 'PHP-7.0' into PHP-7.1
  export symbol missing by phpdbg
  Fix accidental PHPDBG_ABI break
  Fix bug #73189 - Memcpy negative size parameter php_resolve_path
  ...
 2016-10-14 04:22:29 +02:00
Anatol Belski
84a5821212 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0: (62 commits)
  missed piece for renaming
  rename publicly exposed symbol to avoid name conflicts
  Ignore non-executable opcodes in line mode of phpdbg_end_oplog()
  Fix #73280: Stack Buffer Overflow in GD dynamicGetbuf
  use already exported symbol
  Revert "export symbol missing by phpdbg"
  Fix outlen for openssl function
  Syncronize with 5.6 - __toString should return ""
  Fix potential overflows in php_pcre_replace_impl
  Fixed bug #73237
  Fixed bug in zend_accel_error() and cleaned up kill_all_lockers()
  Update NEWS
  Fix phpdbg tests after lineno change
  Fix line number of implicit return in pseudo-main scope
  export symbol missing by phpdbg
  Fix accidental PHPDBG_ABI break
  Fix bug #73189 - Memcpy negative size parameter php_resolve_path
  update len in fallback cases
  Add stdin command and -s command line parameter to phpdbg
  Fix bug #73190: memcpy negative parameter _bc_new_num_ex
  ...
 2016-10-14 04:19:16 +02:00
Anatol Belski
d35d9d1d0e missed piece for renaming 
(cherry picked from commit 5ba9eab436)
 2016-10-14 02:08:28 +02:00
Anatol Belski
dd604015be rename publicly exposed symbol to avoid name conflicts 
(cherry picked from commit 730288ae41)
 2016-10-14 02:08:14 +02:00
Bob Weinand
990e2ce2a0 Ignore non-executable opcodes in line mode of phpdbg_end_oplog() 
(cherry picked from commit d14498a475)
 2016-10-14 02:03:46 +02:00
Anatol Belski
c79f9a4e49 fix gettimeofday proto availability 
(cherry picked from commit 79f7d174d0)
 2016-10-14 02:03:02 +02:00
Christoph M. Becker
0864915550 Fix #73280: Stack Buffer Overflow in GD dynamicGetbuf 
We make sure to never pass a negative `rlen` as size to memcpy().

Cf. <53110871>.

(cherry picked from commit cc08cbc84d)
 2016-10-14 02:02:42 +02:00
Anatol Belski
20b63996c0 fix test 
(cherry picked from commit 57354e0313)
 2016-10-14 02:01:53 +02:00
Anatol Belski
5ce2230266 use already exported symbol 
(cherry picked from commit ce3e792c2c)
 2016-10-14 02:01:22 +02:00
Anatol Belski
ee42529750 Revert "export symbol missing by phpdbg" 
This reverts commit 611ab7fe5b.

Overseen strpprintf is there

(cherry picked from commit 3104882cf8)
 2016-10-14 02:01:08 +02:00
Stanislav Malyshev
177e6adca7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix outlen for openssl function
  Syncronize with 5.6 - __toString should return ""
  Fix potential overflows in php_pcre_replace_impl

(cherry picked from commit ff75665663)
 2016-10-14 01:58:48 +02:00
Stanislav Malyshev
94b7ab185c Syncronize with 5.6 - __toString should return "" 
(cherry picked from commit 2301608736)
 2016-10-14 01:58:08 +02:00
Stanislav Malyshev
0362d61ab7 Fix potential overflows in php_pcre_replace_impl 
(cherry picked from commit 9c50ba42d6)
 2016-10-14 01:57:55 +02:00
Keith Smiley
ddaf04053b Fixed bug #73237 
If the response includes both fields with simple types (which get
concatenated into an XML string) and a complex type (which is parsed
into an object), then the object will parsed into the same zval as the
simple types and will overwrite the string.

(cherry picked from commit 26287132c0)
 2016-10-14 01:57:04 +02:00
Anatol Belski
b4ddf4e575 fix another mistake 
(cherry picked from commit bec0121733)
 2016-10-14 01:56:31 +02:00
Mitch Hagstrand
01a280a9c7 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.

(cherry picked from commit bcee2fdbec)
 2016-10-14 01:56:01 +02:00
Bob Weinand
f40c03168e Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1 
(cherry picked from commit 457e686262)
 2016-10-14 01:54:18 +02:00
Nikita Popov
6baaccc9b6 Merge branch 'PHP-7.0' into PHP-7.1 
(cherry picked from commit 9669ec707a)
 2016-10-14 01:53:25 +02:00
Nikita Popov
0e4c173349 Merge branch 'PHP-7.0' into PHP-7.1 
(cherry picked from commit 26964ccea0)
 2016-10-14 01:52:17 +02:00
Anatol Belski
4e338817d1 export symbol missing by phpdbg 
(cherry picked from commit 611ab7fe5b)
 2016-10-14 01:51:21 +02:00
Bob Weinand
06df34072e Fix accidental PHPDBG_ABI break 
(cherry picked from commit 671d8054f8)
 2016-10-14 01:50:48 +02:00
Stanislav Malyshev
f8be3ede4f Fix bug #73189 - Memcpy negative size parameter php_resolve_path 
(cherry picked from commit da7e89cde8)
(cherry picked from commit c4c2cce37d)
 2016-10-14 01:50:22 +02:00
Anatol Belski
6f9c3b4558 update len in fallback cases 
(cherry picked from commit 58b18892bf)
 2016-10-14 01:49:55 +02:00
Anatol Belski
2c38f70a94 fix wrong merge 
(cherry picked from commit 821a230f29)
 2016-10-14 01:49:39 +02:00
Bob Weinand
11e7447e04 Merge branch 'PHP-7.0' into PHP-7.1 
(cherry picked from commit 37ae5f3931)
 2016-10-14 01:48:03 +02:00
Anatol Belski
a8a11b669d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73190: memcpy negative parameter _bc_new_num_ex

(cherry picked from commit af1bf873fe)
 2016-10-14 01:46:18 +02:00
Anatol Belski
06e7c9983a fix test 
(cherry picked from commit fa9370db03)
 2016-10-14 01:44:45 +02:00
Anatol Belski
a6715786a7 finish 7.1 port 
(cherry picked from commit f1fff032fc)
 2016-10-14 01:44:31 +02:00
Stanislav Malyshev
54003ab663 Fix bug #73147: Use After Free in PHP7 unserialize() 
(cherry picked from commit 0e6fe3a4c9)
(cherry picked from commit f42cbd749c)
 2016-10-14 01:44:16 +02:00
Anatol Belski
a5e9a73db2 fix typo 
(cherry picked from commit efc1f33b58)
 2016-10-14 01:43:54 +02:00
Anatol Belski
41ed9d1f9f Revert "Fix for #73240 - Write out of bounds at number_format" 
This reverts commit 01280f8deb.

The fix is already merged by Stas.

(cherry picked from commit 80eb013a92)
 2016-10-14 01:43:23 +02:00
Anatol Belski
7897e8cd6c followup with #73276 merge 
(cherry picked from commit b135ba3fa9)
 2016-10-14 01:43:02 +02:00
Anatol Belski
48f06ada89 fix test 
(cherry picked from commit 7c6cb1282d)
 2016-10-14 01:42:50 +02:00
Stanislav Malyshev
fe789b3f7c Fix bug #73276 - crash in openssl_random_pseudo_bytes function 
(cherry picked from commit 85a22a0af0)
(cherry picked from commit 7dc8b5e7ae)
 2016-10-14 01:42:19 +02:00
Stanislav Malyshev
e7e60851ae Fix bug #73293 - NULL pointer dereference in SimpleXMLElement::asXML() 
(cherry picked from commit 96a8cf8e1b)
(cherry picked from commit 4ef79370a8)
 2016-10-14 01:42:05 +02:00
Stanislav Malyshev
8e2c9024a6 Fix for #73240 - Write out of bounds at number_format 
(cherry picked from commit 8259130b6b)
(cherry picked from commit 01280f8deb)
 2016-10-14 01:41:48 +02:00
Anatol Belski
0cf880e70c avoid strlen 
(cherry picked from commit aaa5d07365)
 2016-10-14 01:41:32 +02:00
Stanislav Malyshev
d25e427ab1 Bug #73218: add mitigation for ICU int overflow 
(cherry picked from commit d946d10293)
(cherry picked from commit b26b02b2df)
 2016-10-14 01:41:06 +02:00