Commit Graph

74842 Commits

Author SHA1 Message Date
Remi Collet
c50cef1dc5 Fixed bug #64895 Integer overflow in SndToJewish 2013-05-22 08:30:50 +02:00
Remi Collet
88db679742 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  NEWS
  Fixed bug #64895 Integer overflow in SndToJewish
2013-05-22 08:30:00 +02:00
Remi Collet
93469a1d15 NEWS 2013-05-22 08:29:43 +02:00
Remi Collet
d64e8dd7a4 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  NEWS
  Fixed bug #64895 Integer overflow in SndToJewish
2013-05-22 08:29:30 +02:00
Remi Collet
73eedaf6f7 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #64895 Integer overflow in SndToJewish
2013-05-22 08:29:08 +02:00
Remi Collet
013797588a NEWS 2013-05-22 08:28:53 +02:00
Remi Collet
fc2a9d6e47 Fixed bug #64895 Integer overflow in SndToJewish 2013-05-22 08:28:05 +02:00
Stanislav Malyshev
7b0d91643b Merge branch 'PHP-5.5'
* PHP-5.5:
  merge NEWS from 5.3
  fix order
2013-05-21 23:26:40 -07:00
Stanislav Malyshev
f5fcb591cc Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  merge NEWS from 5.3
  fix order
2013-05-21 23:26:23 -07:00
Stanislav Malyshev
0776337e28 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fix order
2013-05-21 23:26:03 -07:00
Stanislav Malyshev
de4fd8638b merge NEWS from 5.3 2013-05-21 23:25:46 -07:00
Stanislav Malyshev
d4ad889824 fix order 2013-05-21 23:25:35 -07:00
Sara Golemon
ee366ea516 Merge branch 'PHP-5.5'
* PHP-5.5:
  Don't double-quote name of namespaced function.
2013-05-19 13:35:09 -07:00
Remi Collet
57b35f1b0d Merge branch 'PHP-5.5'
* PHP-5.5:
  Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int):    metonicCycle = (inputDay + 310) / 6940;
2013-05-21 18:09:22 +02:00
Remi Collet
4840ff0f05 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int):    metonicCycle = (inputDay + 310) / 6940;
2013-05-21 18:09:02 +02:00
Remi Collet
646ebc2cb9 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int):    metonicCycle = (inputDay + 310) / 6940;
2013-05-21 18:08:45 +02:00
Remi Collet
4828f7343b Integer overflow in SndToJewish leads to php hang
AT least in (inputDay is long, metonicCycle is int):
   metonicCycle = (inputDay + 310) / 6940;

So large value give strange (negative) results or php hangs.
This is patch already applied in some linux distro.
2013-05-21 18:04:17 +02:00
Andrey Hristov
e19b7c2b57 Merge branch 'PHP-5.5' 2013-05-21 13:28:09 +02:00
Andrey Hristov
378a5f9bfe updates 2013-05-21 13:27:45 +02:00
Remi Collet
07c58d4191 Merge branch 'PHP-5.5'
* PHP-5.5:
  UPGRADING
2013-05-21 12:32:23 +02:00
Remi Collet
ed9a9b6144 UPGRADING 2013-05-21 12:32:11 +02:00
Remi Collet
6dc95b4df3 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  Add --with-fpm-systemd option to report health to systemd, and systemd_interval option to configure this. The service can now use Type=notify in the systemd unit file.
2013-05-21 09:54:54 +02:00
Remi Collet
70abac2b4e NEWS 2013-05-21 09:54:39 +02:00
Remi Collet
c79f162c37 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Add --with-fpm-systemd option to report health to systemd, and systemd_interval option to configure this. The service can now use Type=notify in the systemd unit file.
2013-05-21 09:53:51 +02:00
Remi Collet
0e99329e0a Add --with-fpm-systemd option to report health to systemd, and
systemd_interval option to configure this. The service can now use
Type=notify in the systemd unit file.

Systemd status line will looks like:
Status: "Processes active: 0, idle: 5, Requests: 90, slow: 0, Traffic: 10req/sec"

Watchdog mode is also supported. In this case watchdog interval,
configured in the unit file, override the systemd_interval option.

When not used (default), no change from previous version.
2013-05-21 09:49:00 +02:00
Dmitry Stogov
bf146ad5b5 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64720 (SegFault on zend_deactivate)

Conflicts:
	NEWS
2013-05-21 10:33:57 +04:00
Dmitry Stogov
a2d6d27458 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #64720 (SegFault on zend_deactivate)

Conflicts:
	NEWS
2013-05-21 10:15:37 +04:00
Dmitry Stogov
77fffff157 Fixed bug #64720 (SegFault on zend_deactivate) 2013-05-21 09:58:11 +04:00
Stanislav Malyshev
1c41a495d4 Merge branch 'PHP-5.5'
* PHP-5.5:
  add reporter
2013-05-20 02:02:46 -07:00
Stanislav Malyshev
49c1a223d5 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add reporter
2013-05-20 02:02:34 -07:00
Stanislav Malyshev
1124b0678f add reporter 2013-05-20 02:01:38 -07:00
Stanislav Malyshev
3ce366b7cd Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #64660 - yyparse can return 2, not only 1
2013-05-20 00:58:12 -07:00
Stanislav Malyshev
ac0aa5737e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix bug #64660 - yyparse can return 2, not only 1

Conflicts:
	Zend/zend_language_scanner.c
2013-05-20 00:57:34 -07:00
Stanislav Malyshev
fb58e69a84 fix bug #64660 - yyparse can return 2, not only 1 2013-05-20 00:52:38 -07:00
Stanislav Malyshev
fe1c83925c Merge branch 'PHP-5.5'
* PHP-5.5:
  fix 5.4.16 relase date
2013-05-19 23:55:45 -07:00
Stanislav Malyshev
0f02c3aa29 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix 5.4.16 relase date
2013-05-19 23:55:38 -07:00
Stanislav Malyshev
7c66c502d0 fix 5.4.16 relase date 2013-05-19 23:55:12 -07:00
Sara Golemon
4f46a40b9d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Don't double-quote name of namespaced function.
2013-05-19 13:35:03 -07:00
Sara Golemon
2d7415a4af Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Don't double-quote name of namespaced function.
2013-05-19 13:34:57 -07:00
Sara Golemon
2d5695cbc5 Don't double-quote name of namespaced function.
ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info)

was resulting in a function declaration of:

ns\"zend_name"()

including the errant quotes.

This diff corrects that.  There are currently no uses of ZEND_NS_NAMED_FE
in core and reason to believe that there are no uses in the wild either.
2013-05-19 13:32:17 -07:00
Pierre Joye
9ef6b30dc3 Merge branch 'PHP-5.5'
* PHP-5.5:
  entry for #64214
  other fix for #64214, unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:51:18 +02:00
Pierre Joye
40d5458eff Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  entry for #64214
  other fix for #64214, unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:50:52 +02:00
Pierre Joye
b142e8825f Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-05-17 11:49:45 +02:00
Pierre Joye
aff65a0346 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  entry for #64214
  other fix for #64214, unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:49:33 +02:00
Pierre Joye
46b05bc57a entry for #64214 2013-05-17 11:49:13 +02:00
Pierre Joye
3eb1745643 other fix for #64214, unmodified file may not have old fp set, causing other possible crashes 2013-05-17 11:45:13 +02:00
Dmitry Stogov
76516701ae Added missing ZE/OPcache related entries 2013-05-17 13:35:32 +04:00
Johannes Schlüter
22da0b7364 Recover NEWS
Apperently wrongly merged in revision 488933792a
2013-05-17 11:22:04 +02:00
Dmitry Stogov
273ad58295 Improved IS_VAR operands fetching 2013-05-17 13:15:09 +04:00
Sara Golemon
cfd1045822 Add optional second arg to unserialize()
Returns the number of bytes consumed by reference for
streaming unserialization.

Actual unserialization behavior is not modified at all.

The need for this came up while trying to parse SplDoublyLinkedList's
serialization format which uses a non-standard stream of serialized values.
2013-05-16 15:18:35 -07:00