clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 11:27:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,118 Commits 491 Branches 1,363 Tags 847 MiB
8f0567581e
Commit Graph

74118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rasmus Lerdorf
29ee4b81f2 This needs to be a long 
Otherwise we are limited to a 32G opcache segment
 2013-05-29 14:22:43 -07:00
Dmitry Stogov
7e00d0994f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed incorrect argument number
 2013-05-29 11:14:15 +04:00
Dmitry Stogov
8b515fa00a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed incorrect argument number

Conflicts:
	Zend/zend_compile.c
 2013-05-29 11:12:43 +04:00
Dmitry Stogov
13e5c97ffd Fixed incorrect argument number 2013-05-29 11:09:55 +04:00
Dmitry Stogov
ad90e90d90 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  Fix #64745 hash_pbkdf2 truncation issue
 2013-05-29 00:02:37 +04:00
Dmitry Stogov
6008ac8e32 Fixed crash during search in empty persistent HashTable 2013-05-28 23:45:36 +04:00
Anthony Ferrara
540a5a52e8 Fix #64745 hash_pbkdf2 truncation issue 
When using hash_pbkdf2 with hex output and 0 length (auto), it incorrectly
truncates the result to 1/2 the expected result.
 2013-05-28 15:30:45 -04:00
Pierre Joye
2f01e06786 fix #64898imagerotate is broken with bilinear interpolation 2013-05-27 09:21:41 +02:00
Anatol Belski
b262787ef9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  reduced the file size even more
 2013-05-25 00:10:49 +02:00
Anatol Belski
bcdac7526d reduced the file size even more 
the first second is what at least has to be
 2013-05-25 00:09:32 +02:00
Anatol Belski
fbdce3b6f6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64916 finfo testcase contains copyrighted music.
 2013-05-25 00:02:09 +02:00
Anatol Belski
2d386db878 Fixed bug #64916 finfo testcase contains copyrighted music. 
I wasn't able to produce a file causing exactly the same crash.
However the first three seconds of the originally reported
file are  pretty enough to repro bug #64830. That reduces its
size to 72k.
 2013-05-24 23:58:31 +02:00
Remi Collet
af13dded5c NEWS 2013-05-24 12:11:04 +02:00
Remi Collet
433731d463 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #64915 (error_log ignored when daemonize=0)
 2013-05-24 12:10:39 +02:00
Remi Collet
9f6ca9bc64 Fixed Bug #64915 (error_log ignored when daemonize=0) 
Use configured error_log file when stderr is not a tty.
So only use tty during interactive debug run.
 2013-05-24 12:09:05 +02:00
David Soria Parra
2df1067036 News for upcoming RC3 if necessary 2013-05-23 00:44:42 +02:00
David Soria Parra
aa5f19cffb News for RC2 2013-05-23 00:44:08 +02:00
Johannes Schlüter
4fe74f14c4 Merge branch 'PHP-5.4' into PHP-5.5 2013-05-22 17:19:58 +02:00
Johannes Schlüter
cd74b7d57e Merge branch 'PHP-5.3' into PHP-5.4 2013-05-22 17:15:27 +02:00
Johannes Schlüter
4cb25d25f1 This will be PHP 5.3.27 2013-05-22 17:13:17 +02:00
Stanislav Malyshev
c53058763a 5.4.17 is next 2013-05-21 23:36:28 -07:00
Remi Collet
c50cef1dc5 Fixed bug #64895 Integer overflow in SndToJewish 2013-05-22 08:30:50 +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
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