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

12220 commits

Author SHA1 Message Date
Xinchen Hui
a6e8634a63 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73350 (Exception::__toString() cause circular references)
 2016-10-22 14:50:53 +08:00
Xinchen Hui
788368ff1c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73350 (Exception::__toString() cause circular references)
 2016-10-22 14:50:42 +08:00
Xinchen Hui
eca84946a4 Fixed bug #73350 (Exception::__toString() cause circular references) 2016-10-22 14:50:21 +08:00
Dmitry Stogov
d6c332eb51 Turn IS_TYPE_COLLECTABLE zval flag into GC_COLLECTABLE zend_refcounted flag. 
This simplifies checks and allows reset this flag for "acyclic" arrays and objects.
 2016-10-21 17:47:30 +03:00
Dmitry Stogov
65ea250022 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu)
 2016-10-19 23:12:17 +03:00
Dmitry Stogov
9ded1b4edb Introduced HT_IS_PACKED() and HT_IS_WITHOUT_HOLES() macros. (Benjamin Coutu) 2016-10-19 23:10:42 +03:00
Anatol Belski
3813d3bbc5 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73329 (Float)"Nano" == NAN
 2016-10-18 19:14:54 +02:00
Anatol Belski
671f647739 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73329 (Float)"Nano" == NAN
 2016-10-18 19:14:14 +02:00
Anatol Belski
9f2ab75b10 Fixed bug #73329 (Float)"Nano" == NAN 
The special cases (float)"inf", etc. were never intended and are
caused by the updated strtod lib. While it might be nice as an
easy way to produce Inf and NaN special values, it was never
documented and cause BC breaches.
 2016-10-18 19:11:18 +02:00
Bob Weinand
2b246e2e38 Merge branch 'PHP-7.1' 2016-10-18 14:32:12 +02:00
Bob Weinand
58f3b9c0ef Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1 2016-10-18 14:31:49 +02:00
Bob Weinand
8b177f6a2a Fixed bug #73338 (Exception thrown from error handler may crash) 2016-10-18 14:14:24 +02:00
Dmitry Stogov
37357d9215 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)
  Revert "Fix bug #47890 #73215 uniqid() should use better random source"
  Revert "Fix bug #47890 #73215 uniqid() should use better random source"
  Update NEWS
 2016-10-18 15:10:03 +03:00
Dmitry Stogov
c31d66b3fd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)
  Revert "Fix bug #47890 #73215 uniqid() should use better random source"
  Update NEWS
 2016-10-18 15:09:44 +03:00
Dmitry Stogov
7bd4e7208e Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)
 2016-10-18 15:04:49 +03:00
Dmitry Stogov
6558559bcc Fixed bug #73337 (try/catch not working with two exceptions inside a same operation) 2016-10-18 14:48:01 +03:00
Joe Watkins
6091873d4a Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)" 
This reverts commit 2d8ab51576.
 2016-10-17 14:22:55 +01:00
Kalle Sommer Nielsen
2dbddf2241 Remove the old and way outdated Zend/RFCs folder, we use the wiki nowadays anyway 2016-10-16 01:42:53 +02:00
Christoph M. Becker
dd35ba08ef Merge branch 'PHP-7.1' 2016-10-14 14:15:31 +02:00
Christoph M. Becker
2cc3aeb4b9 Implement #72918: negative offset inside a quoted string leads to parse error 
We allow negative numeric offsets for the simple syntax inside
double-quoted and heredoc strings.
 2016-10-14 14:14:08 +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
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
0362d61ab7 Fix potential overflows in php_pcre_replace_impl 
(cherry picked from commit 9c50ba42d6)
 2016-10-14 01:57:55 +02:00
Anatol Belski
b4ddf4e575 fix another mistake 
(cherry picked from commit bec0121733)
 2016-10-14 01:56:31 +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
Anatol Belski
2c38f70a94 fix wrong merge 
(cherry picked from commit 821a230f29)
 2016-10-14 01:49:39 +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
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
Xinchen Hui
c9274d20b7 Fixed bug #73288 (Segfault in __clone > Exception.toString > __get) 
Actually this is caused by optimization(opcache)

(cherry picked from commit d19898b298)
 2016-10-14 01:35:39 +02:00
Anatol Belski
77584e9fac Merge branch 'PHP-7.1' 
* PHP-7.1:
  missed piece for renaming
 2016-10-13 15:40:52 +02:00
Anatol Belski
1eac069db1 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  missed piece for renaming
 2016-10-13 15:40:21 +02:00
Anatol Belski
5ba9eab436 missed piece for renaming 2016-10-13 15:39:02 +02:00
Anatol Belski
46eea4e415 Merge branch 'PHP-7.1' 
* PHP-7.1:
  rename publicly exposed symbol to avoid name conflicts
 2016-10-13 15:26:17 +02:00
Anatol Belski
de2b00b403 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  rename publicly exposed symbol to avoid name conflicts
 2016-10-13 15:25:25 +02:00
Anatol Belski
730288ae41 rename publicly exposed symbol to avoid name conflicts 2016-10-13 15:23:50 +02:00
Bob Weinand
505417e8eb Revert "Merge branch 'pull-request/2082' (get_class accidentally in PHP-7.1)" 
This reverts commit b0cacee303, reversing
changes made to fcbfd9835d.
 2016-10-13 10:40:42 +02:00
Anatol Belski
afbb3b858a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  use already exported symbol
  Revert "export symbol missing by phpdbg"
 2016-10-13 10:08:10 +02:00
Anatol Belski
3104882cf8 Revert "export symbol missing by phpdbg" 
This reverts commit 611ab7fe5b.

Overseen strpprintf is there
 2016-10-13 09:50:32 +02:00
Stanislav Malyshev
ff75665663 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
 2016-10-12 23:26:15 -07:00
Stanislav Malyshev
9c50ba42d6 Fix potential overflows in php_pcre_replace_impl 2016-10-12 23:07:47 -07:00
Anatol Belski
bec0121733 fix another mistake 2016-10-12 23:08:19 +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
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
Anatol Belski
821a230f29 fix wrong merge 2016-10-12 20:21:50 +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