]> granicus.if.org Git - php/log
php
11 years agoMerge branch 'PHP-5.5'
Remi Collet [Mon, 3 Jun 2013 13:02:43 +0000 (15:02 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed Bug #64962  imagerotate produce corrupted image

11 years agoFixed Bug #64962 imagerotate produce corrupted image
Remi Collet [Mon, 3 Jun 2013 13:01:48 +0000 (15:01 +0200)]
Fixed Bug #64962  imagerotate produce corrupted image

See https://bitbucket.org/libgd/gd-libgd/issue/67/problem-with-gdrotate

This computation need to be done in signed range.

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Mon, 3 Jun 2013 12:17:22 +0000 (14:17 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS
  Fixed Bug #64961 segfault in imagesetinterpolation

11 years agoNEWS
Remi Collet [Mon, 3 Jun 2013 12:17:00 +0000 (14:17 +0200)]
NEWS

11 years agoFixed Bug #64961 segfault in imagesetinterpolation
Remi Collet [Mon, 3 Jun 2013 12:15:18 +0000 (14:15 +0200)]
Fixed Bug #64961 segfault in imagesetinterpolation

enum type are not long ;) so cannot be used as zend_parse_parameters arg.

11 years agoMerge branch 'PHP-5.5'
Matteo Beccati [Sun, 2 Jun 2013 11:39:45 +0000 (13:39 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Clean up leftover test files
  Improved test portability so that it doesn't fail with pdo_pgsql
  Fix PDO::inTransaction() test for pgsql

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Matteo Beccati [Sun, 2 Jun 2013 11:39:38 +0000 (13:39 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Clean up leftover test files
  Improved test portability so that it doesn't fail with pdo_pgsql
  Fix PDO::inTransaction() test for pgsql

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Matteo Beccati [Sun, 2 Jun 2013 11:39:19 +0000 (13:39 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Clean up leftover test files

11 years agoClean up leftover test files
Matteo Beccati [Sun, 2 Jun 2013 11:38:43 +0000 (13:38 +0200)]
Clean up leftover test files

11 years agoImproved test portability so that it doesn't fail with pdo_pgsql
Matteo Beccati [Sun, 2 Jun 2013 11:32:48 +0000 (13:32 +0200)]
Improved test portability so that it doesn't fail with pdo_pgsql

11 years agoFix PDO::inTransaction() test for pgsql
Nikita Popov [Sun, 24 Mar 2013 16:52:16 +0000 (17:52 +0100)]
Fix PDO::inTransaction() test for pgsql

inTransaction() nowadays casts the in_transaction result to boolean.
I'm not sure whether the INERROR state should result in true or false.
For now I went with the result that we actually get.

11 years agoMerge branch 'PHP-5.5'
Matteo Beccati [Sun, 2 Jun 2013 04:34:14 +0000 (06:34 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64609 (pg_convert enum type support)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Matteo Beccati [Sun, 2 Jun 2013 04:34:05 +0000 (06:34 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64609 (pg_convert enum type support)

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Matteo Beccati [Sun, 2 Jun 2013 04:33:54 +0000 (06:33 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #64609 (pg_convert enum type support)

11 years agoFixed bug #64609 (pg_convert enum type support)
Matteo Beccati [Sun, 2 Jun 2013 04:29:35 +0000 (06:29 +0200)]
Fixed bug #64609 (pg_convert enum type support)

11 years agoMerge branch 'PHP-5.5'
Matteo Beccati [Sat, 1 Jun 2013 21:23:31 +0000 (23:23 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #62857 (bytea test failures)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Matteo Beccati [Sat, 1 Jun 2013 21:23:14 +0000 (23:23 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #62857 (bytea test failures)

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Matteo Beccati [Sat, 1 Jun 2013 21:22:50 +0000 (23:22 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #62857 (bytea test failures)

11 years agoFixed bug #62857 (bytea test failures)
Matteo Beccati [Sat, 1 Jun 2013 21:15:48 +0000 (23:15 +0200)]
Fixed bug #62857 (bytea test failures)

Postgres 9.1+ test fixes. Tests were failing due to the default
standard_conforming_strings GUC being changed to on. Also the
pg_escape_bytea test was encoding the data before estabilishing
a connection, thus falling back to the old escaping type which
isn't properly handled by the backend when using a default
configuration.

I haven't updated the NEWS file as it's just test fixes.

11 years agoFIX BUG #55647
Stanley Sufficool [Sat, 1 Jun 2013 07:38:09 +0000 (00:38 -0700)]
FIX BUG #55647

PDO DBLIB was returning false if there were no results after a
statement was executed. This should be the fetch methods response
not the execute method response.

11 years agoFIX BUG #60512 (the correct way this time)
Stanley Sufficool [Sat, 1 Jun 2013 07:03:44 +0000 (00:03 -0700)]
FIX BUG #60512 (the correct way this time)

Last fix just truncated the password. This fixes the message
handler per the bug report.

11 years agoFIX BUG #60512
Stanley Sufficool [Sat, 1 Jun 2013 06:58:16 +0000 (23:58 -0700)]
FIX BUG #60512

FreeTDS will segfault when passwords over 30 characters are used.
Truncate the password and let the server return an error if the
password is still invalid.

11 years agoFIX BUG #61900
Stanley Sufficool [Sat, 1 Jun 2013 06:24:57 +0000 (23:24 -0700)]
FIX BUG #61900

PDO DBLIB was not setting error and message handlers when FreeTDS was used.
Updated to set error and message handlers the same way as mssql.

11 years agoFIX BUG #64338, #64808, #63638
Stanley Sufficool [Sat, 1 Jun 2013 05:53:08 +0000 (22:53 -0700)]
FIX BUG #64338, #64808, #63638

PDO DBLIB would segfault on getcolumn meta when colno was
out of bounds. DBLIB connection specified null arg to dbsetopt
per Microsoft technical docs, but FreeTDS complains. The SQL USE
statement was invalid for SQL Azure, use DBSETLDBNAME instead.

11 years agoMerge branch 'PHP-5.5'
Matteo Beccati [Fri, 31 May 2013 14:27:16 +0000 (16:27 +0200)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Matteo Beccati [Fri, 31 May 2013 14:27:01 +0000 (16:27 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Matteo Beccati [Fri, 31 May 2013 14:26:54 +0000 (16:26 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years agoMerge branch 'pull-request/309' into PHP-5.3
Matteo Beccati [Fri, 31 May 2013 14:26:38 +0000 (16:26 +0200)]
Merge branch 'pull-request/309' into PHP-5.3

11 years agoNEWS
Matteo Beccati [Fri, 31 May 2013 14:22:53 +0000 (16:22 +0200)]
NEWS

11 years agoSlightly edited tests and fix for bug #62024
Matteo Beccati [Fri, 31 May 2013 14:19:58 +0000 (16:19 +0200)]
Slightly edited tests and fix for bug #62024

11 years agoFixed bug #62024 (unable to run consecutive prepared querys with null values)
Matheus Degiovani [Fri, 22 Mar 2013 13:39:36 +0000 (10:39 -0300)]
Fixed bug #62024 (unable to run consecutive prepared querys with null values)

Credits to james@kenjim.com for the patch.

11 years agoFixed bug #64037 (wrong value returned when using a negative numeric field equal...
Matheus Degiovani [Fri, 22 Mar 2013 13:24:07 +0000 (10:24 -0300)]
Fixed bug #64037 (wrong value returned when using a negative numeric field equal to the scale)

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Fri, 31 May 2013 06:46:18 +0000 (08:46 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
  Use size_t everywhere instead
  This needs to be a long Otherwise we are limited to a 32G opcache segment

11 years agoNEWS
Remi Collet [Fri, 31 May 2013 06:45:54 +0000 (08:45 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Fri, 31 May 2013 06:45:32 +0000 (08:45 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)

11 years agoNEWS
Remi Collet [Fri, 31 May 2013 06:45:09 +0000 (08:45 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Remi Collet [Fri, 31 May 2013 06:44:33 +0000 (08:44 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)

11 years agoFixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
Remi Collet [Fri, 31 May 2013 06:39:32 +0000 (08:39 +0200)]
Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)

There is a lot of call such as:
pdo_pgsql_error(dbh, PGRES_FATAL_ERROR, "Copy command failed");
Where the 3rd paramater is a error message string where a sqlstate (5 chars)
is expected. This cause a segfault in copy_from.phpt and copy_to.phpt.

This is only a sanity check to avoid buffer overflow, but obviously this
calls need to be fixed (using NULL or a correct sqlstate).

11 years agopdo_dblib: fix bug #64522DBLIB statement destructor was being called late and clobber...
Stanley Sufficool [Fri, 31 May 2013 04:59:00 +0000 (21:59 -0700)]
pdo_dblib: fix bug #64522DBLIB statement destructor was being called late and clobbered results from subsequent statement objects sharing the same connection

11 years agoUse size_t everywhere instead
Rasmus Lerdorf [Wed, 29 May 2013 21:34:22 +0000 (14:34 -0700)]
Use size_t everywhere instead

11 years agoUse size_t everywhere instead
Rasmus Lerdorf [Wed, 29 May 2013 21:34:22 +0000 (14:34 -0700)]
Use size_t everywhere instead

11 years agoThis needs to be a long
Rasmus Lerdorf [Wed, 29 May 2013 21:17:32 +0000 (14:17 -0700)]
This needs to be a long
Otherwise we are limited to a 2G opcache segment

11 years agoThis needs to be a long
Rasmus Lerdorf [Wed, 29 May 2013 21:17:32 +0000 (14:17 -0700)]
This needs to be a long
Otherwise we are limited to a 32G opcache segment

11 years agoMerge branch 'PHP-5.5'
Dmitry Stogov [Wed, 29 May 2013 07:15:27 +0000 (11:15 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed incorrect argument number

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Wed, 29 May 2013 07:14:15 +0000 (11:14 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed incorrect argument number

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Dmitry Stogov [Wed, 29 May 2013 07:12:43 +0000 (11:12 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed incorrect argument number

Conflicts:
Zend/zend_compile.c

11 years agoFixed incorrect argument number
Dmitry Stogov [Wed, 29 May 2013 07:09:55 +0000 (11:09 +0400)]
Fixed incorrect argument number

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Dmitry Stogov [Tue, 28 May 2013 20:02:37 +0000 (00:02 +0400)]
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

11 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Tue, 28 May 2013 20:02:13 +0000 (00:02 +0400)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Fix #64745 hash_pbkdf2 truncation issue

11 years agoMerge branch 'PHP-5.5'
Dmitry Stogov [Tue, 28 May 2013 20:01:35 +0000 (00:01 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed crash during search in empty persistent HashTable

11 years agoFixed crash during search in empty persistent HashTable
Dmitry Stogov [Tue, 28 May 2013 19:45:36 +0000 (23:45 +0400)]
Fixed crash during search in empty persistent HashTable

11 years agoMerge branch 'PHP-5.5'
Anthony Ferrara [Tue, 28 May 2013 19:38:11 +0000 (15:38 -0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix #64745 hash_pbkdf2 truncation issue

11 years agoFix #64745 hash_pbkdf2 truncation issue
Anthony Ferrara [Tue, 28 May 2013 19:30:45 +0000 (15:30 -0400)]
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.

11 years agoMerge branch 'PHP-5.5'
Pierre Joye [Mon, 27 May 2013 07:22:00 +0000 (09:22 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix #64898imagerotate is broken with bilinear interpolation

11 years agofix #64898imagerotate is broken with bilinear interpolation
Pierre Joye [Mon, 27 May 2013 07:21:41 +0000 (09:21 +0200)]
fix #64898imagerotate is broken with bilinear interpolation

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Fri, 24 May 2013 22:11:09 +0000 (00:11 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  reduced the file size even more

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Fri, 24 May 2013 22:10:49 +0000 (00:10 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  reduced the file size even more

11 years agoreduced the file size even more
Anatol Belski [Fri, 24 May 2013 22:09:32 +0000 (00:09 +0200)]
reduced the file size even more

the first second is what at least has to be

11 years agoMerge branch 'PHP-5.5'
Anatol Belski [Fri, 24 May 2013 22:02:34 +0000 (00:02 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64916 finfo testcase contains copyrighted music.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Fri, 24 May 2013 22:02:09 +0000 (00:02 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64916 finfo testcase contains copyrighted music.

11 years agoFixed bug #64916 finfo testcase contains copyrighted music.
Anatol Belski [Fri, 24 May 2013 21:58:31 +0000 (23:58 +0200)]
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.

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Fri, 24 May 2013 10:11:16 +0000 (12:11 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS
  Fixed Bug #64915 (error_log ignored when daemonize=0)

11 years agoNEWS
Remi Collet [Fri, 24 May 2013 10:11:04 +0000 (12:11 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Fri, 24 May 2013 10:10:39 +0000 (12:10 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed Bug #64915 (error_log ignored when daemonize=0)

11 years agoFixed Bug #64915 (error_log ignored when daemonize=0)
Remi Collet [Fri, 24 May 2013 10:09:05 +0000 (12:09 +0200)]
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.

11 years agoMerge branch 'PHP-5.5'
David Soria Parra [Wed, 22 May 2013 22:57:30 +0000 (00:57 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  News for upcoming RC3 if necessary
  News for RC2

11 years agoNews for upcoming RC3 if necessary
David Soria Parra [Wed, 22 May 2013 22:44:42 +0000 (00:44 +0200)]
News for upcoming RC3 if necessary

11 years agoNews for RC2
David Soria Parra [Wed, 22 May 2013 22:44:08 +0000 (00:44 +0200)]
News for RC2

11 years agoMerge branch 'PHP-5.5'
Johannes Schlüter [Wed, 22 May 2013 15:20:49 +0000 (17:20 +0200)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Wed, 22 May 2013 15:19:58 +0000 (17:19 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 22 May 2013 15:15:27 +0000 (17:15 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years agoThis will be PHP 5.3.27
Johannes Schlüter [Wed, 22 May 2013 15:13:17 +0000 (17:13 +0200)]
This will be PHP 5.3.27

11 years ago5.4.17 is next
Stanislav Malyshev [Wed, 22 May 2013 06:36:28 +0000 (23:36 -0700)]
5.4.17 is next

11 years agoFixed bug #64895 Integer overflow in SndToJewish
Remi Collet [Wed, 22 May 2013 06:28:05 +0000 (08:28 +0200)]
Fixed bug #64895 Integer overflow in SndToJewish

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Wed, 22 May 2013 06:30:00 +0000 (08:30 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS
  NEWS
  Fixed bug #64895 Integer overflow in SndToJewish

11 years agoNEWS
Remi Collet [Wed, 22 May 2013 06:29:43 +0000 (08:29 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Wed, 22 May 2013 06:29:30 +0000 (08:29 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed bug #64895 Integer overflow in SndToJewish

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Remi Collet [Wed, 22 May 2013 06:29:08 +0000 (08:29 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #64895 Integer overflow in SndToJewish

11 years agoNEWS
Remi Collet [Wed, 22 May 2013 06:28:53 +0000 (08:28 +0200)]
NEWS

11 years agoFixed bug #64895 Integer overflow in SndToJewish
Remi Collet [Wed, 22 May 2013 06:28:05 +0000 (08:28 +0200)]
Fixed bug #64895 Integer overflow in SndToJewish

11 years agoMerge branch 'PHP-5.5'
Stanislav Malyshev [Wed, 22 May 2013 06:26:40 +0000 (23:26 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  merge NEWS from 5.3
  fix order

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 22 May 2013 06:26:23 +0000 (23:26 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  merge NEWS from 5.3
  fix order

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Stanislav Malyshev [Wed, 22 May 2013 06:26:03 +0000 (23:26 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix order

11 years agomerge NEWS from 5.3
Stanislav Malyshev [Wed, 22 May 2013 06:25:46 +0000 (23:25 -0700)]
merge NEWS from 5.3

11 years agofix order
Stanislav Malyshev [Wed, 22 May 2013 06:25:35 +0000 (23:25 -0700)]
fix order

11 years agoMerge branch 'PHP-5.5'
Sara Golemon [Sun, 19 May 2013 20:35:09 +0000 (13:35 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Don't double-quote name of namespaced function.

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Tue, 21 May 2013 16:09:22 +0000 (18:09 +0200)]
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;

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Tue, 21 May 2013 16:09:02 +0000 (18:09 +0200)]
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;

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Remi Collet [Tue, 21 May 2013 16:08:45 +0000 (18:08 +0200)]
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;

11 years agoInteger overflow in SndToJewish leads to php hang
Remi Collet [Tue, 21 May 2013 16:04:17 +0000 (18:04 +0200)]
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.

11 years agoMerge branch 'PHP-5.5'
Andrey Hristov [Tue, 21 May 2013 11:28:09 +0000 (13:28 +0200)]
Merge branch 'PHP-5.5'

11 years agoupdates
Andrey Hristov [Tue, 21 May 2013 11:27:45 +0000 (13:27 +0200)]
updates

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Tue, 21 May 2013 10:32:23 +0000 (12:32 +0200)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  UPGRADING

11 years agoUPGRADING
Remi Collet [Tue, 21 May 2013 10:32:11 +0000 (12:32 +0200)]
UPGRADING

11 years agoMerge branch 'PHP-5.5'
Remi Collet [Tue, 21 May 2013 07:54:54 +0000 (09:54 +0200)]
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.

11 years agoNEWS
Remi Collet [Tue, 21 May 2013 07:54:39 +0000 (09:54 +0200)]
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Tue, 21 May 2013 07:53:51 +0000 (09:53 +0200)]
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.

11 years agoAdd --with-fpm-systemd option to report health to systemd, and
Remi Collet [Tue, 21 May 2013 07:49:00 +0000 (09:49 +0200)]
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.

11 years agoMerge branch 'PHP-5.5'
Dmitry Stogov [Tue, 21 May 2013 06:33:57 +0000 (10:33 +0400)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64720 (SegFault on zend_deactivate)

Conflicts:
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Tue, 21 May 2013 06:15:37 +0000 (10:15 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64720 (SegFault on zend_deactivate)

Conflicts:
NEWS