archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
73991 commits 526 branches 1434 tags 877 MiB
Commit graph

73991 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
378a5f9bfe updates 2013-05-21 13:27:45 +02:00
Remi Collet
ed9a9b6144 UPGRADING 2013-05-21 12:32:11 +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
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
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
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
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
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
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
Anatol Belski
d565e8f0eb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed error handling for ext/sockets under win
 2013-05-16 19:29:25 +02:00
Anatol Belski
8dec06ea2a Fixed error handling for ext/sockets under win 
WSAGetLastError() must be the very next call after a socket
function had an invalid return. Any function call inbetween
will clear the error information.
 2013-05-16 19:23:31 +02:00
Anatol Belski
07bd1fac57 updated NEWS 2013-05-16 08:44:36 +02:00
Anatol Belski
fda25c7ea6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64853Use of no longer available ini directives causes crash on TS build
 2013-05-16 08:43:07 +02:00
Anatol Belski
d82704b677 Fixed bug #64853Use of no longer available ini directives causes crash on TS build 
The fatal error for removed ini options is thrown before the executor
init, so ensure the relevant variables are initialized.
 2013-05-16 08:40:56 +02:00
Pierre Joye
9accfee55f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
 2013-05-15 15:54:52 +02:00
Pierre Joye
bfb50d17cb Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-05-15 15:54:46 +02:00
Pierre Joye
09470ebf35 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-05-15 15:53:57 +02:00
David Soria Parra
139e9824ad Fix array_colum segfault 
Separate zval to avoid gc from freeing
 2013-05-15 14:42:39 +02:00
Anatol Belski
082ee90b9b fixe preprocessor definition 2013-05-15 14:24:21 +02:00
Anatol Belski
077b575d51 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure
 2013-05-15 11:17:18 +02:00
Anatol Belski
de82e7edf7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure
 2013-05-15 11:14:58 +02:00
Anatol Belski
86db5fb4c2 Fix unitialized vars when sql.safe_mode=1 
which can break the subsequent mysqlnd_connect() call
 2013-05-15 11:12:17 +02:00
Pierre Joye
42a186e22d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  more check for php_stream_fopen_tmpfile failure
 2013-05-14 16:46:32 +02:00
Pierre Joye
7ec2e5314e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  more check for php_stream_fopen_tmpfile failure
 2013-05-14 16:45:56 +02:00
Pierre Joye
ba1af29805 more check for php_stream_fopen_tmpfile failure 2013-05-14 16:45:11 +02:00
Andrey Hristov
1f97fde89e Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5 2013-05-14 13:01:18 +02:00
Andrey Hristov
9d2dda9058 Fix for Bug #64394 MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS undeclared when using Connector/C 2013-05-14 11:26:35 +02:00
Anatol Belski
75ee1a6113 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch after fix for #64830
 2013-05-14 11:16:01 +02:00
Anatol Belski
1a46a102d9 updated libmagic.patch after fix for #64830 2013-05-14 11:14:37 +02:00