]> granicus.if.org Git - php/log
php
10 years agoAdded new optimized zend_array_destroy() function
Dmitry Stogov [Tue, 25 Nov 2014 09:58:29 +0000 (12:58 +0300)]
Added new optimized zend_array_destroy() function

10 years agoMoved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h
Dmitry Stogov [Tue, 25 Nov 2014 09:37:46 +0000 (12:37 +0300)]
Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h

10 years agoMerge branch 'master' of https://github.com/php/php-src
krakjoe [Tue, 25 Nov 2014 08:37:02 +0000 (08:37 +0000)]
Merge branch 'master' of https://github.com/php/php-src

10 years agofix REGISTER_NS_*_CONSTANT macros
krakjoe [Tue, 25 Nov 2014 08:36:30 +0000 (08:36 +0000)]
fix REGISTER_NS_*_CONSTANT macros

10 years agoRemoved useless assert. EG(uninitialized_zval) can't be refcounted.
Dmitry Stogov [Tue, 25 Nov 2014 08:33:57 +0000 (11:33 +0300)]
Removed useless assert. EG(uninitialized_zval) can't be refcounted.

10 years agoUse specialized destructors when types of zvals are known.
Dmitry Stogov [Mon, 24 Nov 2014 22:22:59 +0000 (01:22 +0300)]
Use specialized destructors when types of zvals are known.

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Mon, 24 Nov 2014 20:27:04 +0000 (12:27 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  move tests into proper place

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 24 Nov 2014 20:26:50 +0000 (12:26 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  move tests into proper place

10 years agomove tests into proper place
Stanislav Malyshev [Mon, 24 Nov 2014 20:26:20 +0000 (12:26 -0800)]
move tests into proper place

10 years agoImproved assignment to object property
Dmitry Stogov [Mon, 24 Nov 2014 20:19:24 +0000 (23:19 +0300)]
Improved assignment to object property

10 years agoReuse zend_assign_to_variable() in zend_std_write_property()
Dmitry Stogov [Mon, 24 Nov 2014 17:33:27 +0000 (20:33 +0300)]
Reuse zend_assign_to_variable() in zend_std_write_property()

10 years agocleanup comments from svn/cvs era
Popa Adrian Marius [Mon, 24 Nov 2014 16:40:20 +0000 (18:40 +0200)]
cleanup comments from svn/cvs era

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Mon, 24 Nov 2014 15:27:43 +0000 (16:27 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix dir separator in test
  fork test for windows
  update for LiteSpeed
  update for LiteSpeed

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Mon, 24 Nov 2014 15:25:38 +0000 (16:25 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix dir separator in test
  fork test for windows
  update for LiteSpeed

10 years agofix dir separator in test
Anatol Belski [Mon, 24 Nov 2014 15:14:17 +0000 (16:14 +0100)]
fix dir separator in test

10 years agofork test for windows
Anatol Belski [Mon, 24 Nov 2014 15:09:26 +0000 (16:09 +0100)]
fork test for windows

10 years agoUse inline version of the function in the loop
Dmitry Stogov [Mon, 24 Nov 2014 14:20:49 +0000 (17:20 +0300)]
Use inline version of the function in the loop

10 years agoMicro optimization
Dmitry Stogov [Mon, 24 Nov 2014 12:46:34 +0000 (15:46 +0300)]
Micro optimization

10 years agoFPM: change "listen = port" behavior from IPv4 catch-all to IPv6 catch-all (+ IPv4...
Remi Collet [Mon, 24 Nov 2014 08:38:36 +0000 (09:38 +0100)]
FPM: change "listen = port" behavior from IPv4 catch-all to IPv6 catch-all (+ IPv4-mapped)

10 years agoRemove no longer used scripts
Sobak [Mon, 28 Jul 2014 13:18:48 +0000 (15:18 +0200)]
Remove no longer used scripts

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 24 Nov 2014 02:03:24 +0000 (18:03 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update for LiteSpeed

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 24 Nov 2014 02:05:49 +0000 (18:05 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update for LiteSpeed

10 years agoupdate for LiteSpeed
Stanislav Malyshev [Mon, 24 Nov 2014 02:05:26 +0000 (18:05 -0800)]
update for LiteSpeed

10 years agoupdate for LiteSpeed
Stanislav Malyshev [Mon, 24 Nov 2014 02:03:07 +0000 (18:03 -0800)]
update for LiteSpeed

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Mon, 24 Nov 2014 01:53:00 +0000 (17:53 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  tests image gd
  xmlwriter_full_end_element tests
  Tests for writeAttributeNS and xmlwriter_write_attribute_ns

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 24 Nov 2014 01:52:50 +0000 (17:52 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  tests image gd
  xmlwriter_full_end_element tests
  Tests for writeAttributeNS and xmlwriter_write_attribute_ns

10 years agoMerge branch 'pull-request/757' into PHP-5.5
Stanislav Malyshev [Mon, 24 Nov 2014 01:52:43 +0000 (17:52 -0800)]
Merge branch 'pull-request/757' into PHP-5.5

* pull-request/757:
  xmlwriter_full_end_element tests
  Tests for writeAttributeNS and xmlwriter_write_attribute_ns

10 years agoMerge branch 'pull-request/782' into PHP-5.5
Stanislav Malyshev [Mon, 24 Nov 2014 01:52:08 +0000 (17:52 -0800)]
Merge branch 'pull-request/782' into PHP-5.5

* pull-request/782:
  tests image gd

10 years agoMerge branch 'pull-request/752'
Stanislav Malyshev [Mon, 24 Nov 2014 01:48:49 +0000 (17:48 -0800)]
Merge branch 'pull-request/752'

* pull-request/752:
  Updated NEWS regarding LiteSpeed SAPI

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Mon, 24 Nov 2014 01:26:35 +0000 (17:26 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  test to function addcslashes
  test
  Test PHP Init Fail Without Params
  Add my information to this test
  Add a test for the exception cases of readline_read_history
  added some tests to datetime and dateinterval functions
  added various tests for XSLTProcessor and one test for iconv extension
  teste basico da funcao timezone_version_get

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 24 Nov 2014 01:26:28 +0000 (17:26 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add my information to this test
  Add a test for the exception cases of readline_read_history
  added some tests to datetime and dateinterval functions
  added various tests for XSLTProcessor and one test for iconv extension
  teste basico da funcao timezone_version_get

10 years agoMerge branch 'pull-request/854' into PHP-5.5
Stanislav Malyshev [Mon, 24 Nov 2014 01:23:34 +0000 (17:23 -0800)]
Merge branch 'pull-request/854' into PHP-5.5

* pull-request/854:
  teste basico da funcao timezone_version_get

10 years agoMerge branch 'pull-request/855' into PHP-5.5
Stanislav Malyshev [Mon, 24 Nov 2014 01:22:54 +0000 (17:22 -0800)]
Merge branch 'pull-request/855' into PHP-5.5

* pull-request/855:
  added some tests to datetime and dateinterval functions
  added various tests for XSLTProcessor and one test for iconv extension

10 years agoMerge branch 'pull-request/856' into PHP-5.5
Stanislav Malyshev [Mon, 24 Nov 2014 01:22:02 +0000 (17:22 -0800)]
Merge branch 'pull-request/856' into PHP-5.5

* pull-request/856:
  Add my information to this test
  Add a test for the exception cases of readline_read_history

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 24 Nov 2014 01:21:29 +0000 (17:21 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Test PHP Init Fail Without Params

10 years agoMerge branch 'pull-request/863' into PHP-5.5
Stanislav Malyshev [Mon, 24 Nov 2014 01:21:20 +0000 (17:21 -0800)]
Merge branch 'pull-request/863' into PHP-5.5

* pull-request/863:
  Test PHP Init Fail Without Params

10 years agotest to function addcslashes
marcosptf [Fri, 24 Oct 2014 17:11:17 +0000 (15:11 -0200)]
test to function addcslashes

test to function bin2hex

10 years agotest
marcosptf [Fri, 24 Oct 2014 17:08:27 +0000 (15:08 -0200)]
test

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Mon, 24 Nov 2014 01:14:46 +0000 (17:14 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update CODING_STANDARDS

10 years agoMerge branch 'pull-request/811'
Stanislav Malyshev [Mon, 24 Nov 2014 01:14:39 +0000 (17:14 -0800)]
Merge branch 'pull-request/811'

* pull-request/811:
  Update CODING_STANDARDS

10 years agoUpdate CODING_STANDARDS
Archil Imnadze [Mon, 8 Sep 2014 09:13:34 +0000 (13:13 +0400)]
Update CODING_STANDARDS

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Mon, 24 Nov 2014 01:13:12 +0000 (17:13 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Correct two zlib tests to use a string, not a const

10 years agoMerge branch 'pull-request/817'
Stanislav Malyshev [Mon, 24 Nov 2014 01:13:03 +0000 (17:13 -0800)]
Merge branch 'pull-request/817'

* pull-request/817:
  Correct two zlib tests to use a string, not a const

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 24 Nov 2014 01:12:52 +0000 (17:12 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Correct two zlib tests to use a string, not a const

10 years agoCorrect two zlib tests to use a string, not a const
Tim Siebels [Fri, 12 Sep 2014 13:04:32 +0000 (15:04 +0200)]
Correct two zlib tests to use a string, not a const

10 years agoMerge branch 'pull-request/819'
Stanislav Malyshev [Mon, 24 Nov 2014 01:11:54 +0000 (17:11 -0800)]
Merge branch 'pull-request/819'

* pull-request/819:
  Indention fix

10 years agoMerge branch 'pull-request/900'
Stanislav Malyshev [Mon, 24 Nov 2014 00:40:49 +0000 (16:40 -0800)]
Merge branch 'pull-request/900'

* pull-request/900:
  Fix incorrect argument reflection info for array_multisort()

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Mon, 24 Nov 2014 00:40:16 +0000 (16:40 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS
  Fix incorrect argument reflection info for array_multisort()

10 years agoupdate NEWS
Stanislav Malyshev [Mon, 24 Nov 2014 00:39:52 +0000 (16:39 -0800)]
update NEWS

10 years agoFix incorrect argument reflection info for array_multisort()
Alexander Lisachenko [Fri, 14 Nov 2014 12:36:56 +0000 (15:36 +0300)]
Fix incorrect argument reflection info for array_multisort()

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Mon, 24 Nov 2014 00:32:57 +0000 (16:32 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix incorrect argument reflection info for array_multisort()

10 years agoFix incorrect argument reflection info for array_multisort()
Alexander Lisachenko [Fri, 14 Nov 2014 12:36:56 +0000 (15:36 +0300)]
Fix incorrect argument reflection info for array_multisort()

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Mon, 24 Nov 2014 00:25:10 +0000 (16:25 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix NEWS order
  update NEWS
  Update the VM generation script, per Bob.
  Update NEWS after rebase.
  Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 24 Nov 2014 00:22:52 +0000 (16:22 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix NEWS order

10 years agofix NEWS order
Stanislav Malyshev [Mon, 24 Nov 2014 00:21:53 +0000 (16:21 -0800)]
fix NEWS order

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 24 Nov 2014 00:18:52 +0000 (16:18 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  Update the VM generation script, per Bob.
  Update NEWS after rebase.
  Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.

10 years agoupdate NEWS
Stanislav Malyshev [Mon, 24 Nov 2014 00:18:04 +0000 (16:18 -0800)]
update NEWS

10 years agoMerge branch 'pull-request/840' into PHP-5.5
Stanislav Malyshev [Mon, 24 Nov 2014 00:17:17 +0000 (16:17 -0800)]
Merge branch 'pull-request/840' into PHP-5.5

* pull-request/840:
  Update the VM generation script, per Bob.
  Update NEWS after rebase.
  Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.

10 years agoMerge branch 'pull-request/850'
Stanislav Malyshev [Mon, 24 Nov 2014 00:14:21 +0000 (16:14 -0800)]
Merge branch 'pull-request/850'

* pull-request/850:
  Update comments in php.ini

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Mon, 24 Nov 2014 00:14:15 +0000 (16:14 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update comments in php.ini

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 24 Nov 2014 00:13:58 +0000 (16:13 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update comments in php.ini

10 years agoUpdate comments in php.ini
Sobak [Sun, 28 Sep 2014 10:44:40 +0000 (12:44 +0200)]
Update comments in php.ini

10 years agoMerge branch 'pull-request/859'
Stanislav Malyshev [Mon, 24 Nov 2014 00:10:03 +0000 (16:10 -0800)]
Merge branch 'pull-request/859'

* pull-request/859:
  added missing INSTALL_ROOT

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Mon, 24 Nov 2014 00:09:52 +0000 (16:09 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  added missing INSTALL_ROOT

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 24 Nov 2014 00:09:40 +0000 (16:09 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  added missing INSTALL_ROOT

10 years agoadded missing INSTALL_ROOT
Sebastian Brandt [Mon, 29 Sep 2014 07:53:26 +0000 (09:53 +0200)]
added missing INSTALL_ROOT

10 years agoMerge branch 'pull-request/872'
Stanislav Malyshev [Mon, 24 Nov 2014 00:08:19 +0000 (16:08 -0800)]
Merge branch 'pull-request/872'

* pull-request/872:
  Fix php.ini-*'s comment about directive: request_order

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Mon, 24 Nov 2014 00:08:14 +0000 (16:08 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix php.ini-*'s comment about directive: request_order

10 years agoFix php.ini-*'s comment about directive: request_order
Reeze Xia [Wed, 8 Oct 2014 15:27:52 +0000 (23:27 +0800)]
Fix php.ini-*'s comment about directive: request_order

request_order directive only support register G,P,C but not all of
the EGPCS global variables.

The doc <http://php.net/manual/en/ini.core.php#ini.request-order>
is ok.

10 years agoMerge branch 'pull-request/898'
Stanislav Malyshev [Sun, 23 Nov 2014 23:23:01 +0000 (15:23 -0800)]
Merge branch 'pull-request/898'

* pull-request/898:
  add php_create_socket/php_destroy_socket PHP_SOCKETS_API to abel to create socket ressource in other ext

10 years agoMerge branch 'pull-request/891'
Stanislav Malyshev [Sun, 23 Nov 2014 23:19:09 +0000 (15:19 -0800)]
Merge branch 'pull-request/891'

* pull-request/891:
  Minor: typo fix in filter_var comment

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Sun, 23 Nov 2014 23:18:53 +0000 (15:18 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Minor: typo fix in filter_var comment

10 years agoMinor: typo fix in filter_var comment
Kévin Dunglas [Wed, 5 Nov 2014 18:38:23 +0000 (19:38 +0100)]
Minor: typo fix in filter_var comment

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Sun, 23 Nov 2014 23:16:00 +0000 (15:16 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Minor fix: Missing quotes in openssl test case for bug bug64802

10 years agoMinor fix: Missing quotes in openssl test case for bug bug64802
Dominic Luechinger [Tue, 18 Nov 2014 21:12:37 +0000 (22:12 +0100)]
Minor fix: Missing quotes in openssl test case for bug bug64802

10 years agoMinor fix: Missing quotes in openssl test case for bug bug64802
Dominic Luechinger [Tue, 18 Nov 2014 21:12:37 +0000 (22:12 +0100)]
Minor fix: Missing quotes in openssl test case for bug bug64802

10 years agoMerge remote-tracking branch 'origin/PHP-5.6'
Bob Weinand [Sun, 23 Nov 2014 23:10:49 +0000 (00:10 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'

10 years agoAdded NEWS entry and test for bug 68446
Bob Weinand [Sun, 23 Nov 2014 23:07:45 +0000 (00:07 +0100)]
Added NEWS entry and test for bug 68446

10 years agoMerge branch 'pull-request/893'
Stanislav Malyshev [Sun, 23 Nov 2014 23:01:24 +0000 (15:01 -0800)]
Merge branch 'pull-request/893'

* pull-request/893:
  fix typo in UPGRADING.INTERNALS

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Sun, 23 Nov 2014 22:54:58 +0000 (14:54 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  typo fixes - https://github.com/vlajos/misspell_fixer

Conflicts:
ext/ftp/ftp.h
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/standard/image.c

10 years agotypo fixes - https://github.com/vlajos/misspell_fixer
Veres Lajos [Thu, 20 Nov 2014 20:00:07 +0000 (20:00 +0000)]
typo fixes - https://github.com/vlajos/misspell_fixer

10 years agoMerge remote-tracking branch 'origin/PHP-5.6'
Bob Weinand [Sun, 23 Nov 2014 22:50:47 +0000 (23:50 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6'

Conflicts:
Zend/zend_compile.c
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

10 years agotypo fixes - https://github.com/vlajos/misspell_fixer
Veres Lajos [Thu, 20 Nov 2014 20:00:07 +0000 (20:00 +0000)]
typo fixes - https://github.com/vlajos/misspell_fixer

Conflicts:
ext/ftp/ftp.h
ext/pcre/pcrelib/pcre_printint.c
ext/pcre/pcrelib/sljit/sljitLir.c
ext/pcre/pcrelib/sljit/sljitLir.h
ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
ext/pgsql/pgsql.c
ext/phar/func_interceptors.c
ext/soap/soap.c
ext/standard/image.c

10 years agoFix bug #68446 (bug with constant defaults and type hints)
Bob Weinand [Sun, 23 Nov 2014 20:09:31 +0000 (21:09 +0100)]
Fix bug #68446 (bug with constant defaults and type hints)

10 years agoAdd NEWS & UPGRADING
Stanislav Malyshev [Sun, 23 Nov 2014 06:23:55 +0000 (22:23 -0800)]
Add NEWS & UPGRADING

10 years agosecured unserialize
Stanislav Malyshev [Sat, 30 Mar 2013 04:52:48 +0000 (21:52 -0700)]
secured unserialize

- update for BC-compatible unserialize
- add tests

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Sat, 22 Nov 2014 09:37:31 +0000 (10:37 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  typo
  NEWS
  Fixed Bug #68478 acess_log don't use prefix

10 years agotypo
Remi Collet [Sat, 22 Nov 2014 09:37:22 +0000 (10:37 +0100)]
typo

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Sat, 22 Nov 2014 09:36:54 +0000 (10:36 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fixed Bug #68478 acess_log don't use prefix

10 years agoNEWS
Remi Collet [Sat, 22 Nov 2014 09:36:45 +0000 (10:36 +0100)]
NEWS

10 years agoFixed Bug #68478 acess_log don't use prefix
Remi Collet [Sat, 22 Nov 2014 09:25:53 +0000 (10:25 +0100)]
Fixed Bug #68478 acess_log don't use prefix

Calling fpm_conf_process_all_pools before fpm_log_open
allow to use fpm_evaluate_full_path and so to honor
global prefix or pool prefix for access.log

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Sat, 22 Nov 2014 09:31:26 +0000 (10:31 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  minor typo in test
  add test for global / pool prefix and bug #68478
  Fixed Bug #68478 acess_log don't use prefix

10 years agoNEWS
Remi Collet [Sat, 22 Nov 2014 09:30:42 +0000 (10:30 +0100)]
NEWS

10 years agominor typo in test
Remi Collet [Sat, 22 Nov 2014 09:29:51 +0000 (10:29 +0100)]
minor typo in test

10 years agoadd test for global / pool prefix and bug #68478
Remi Collet [Sat, 22 Nov 2014 09:29:05 +0000 (10:29 +0100)]
add test for global / pool prefix and bug #68478

10 years agoFixed Bug #68478 acess_log don't use prefix
Remi Collet [Sat, 22 Nov 2014 09:25:53 +0000 (10:25 +0100)]
Fixed Bug #68478 acess_log don't use prefix

Calling fpm_conf_process_all_pools before fpm_log_open
allow to use fpm_evaluate_full_path and so to honor
global prefix or pool prefix for access.log

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Sat, 22 Nov 2014 08:41:40 +0000 (00:41 -0800)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert "made lsapi_main.c compatible with PHP7/phpng ."
  Updated NEWS
  Updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Sat, 22 Nov 2014 08:41:06 +0000 (00:41 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Revert "made lsapi_main.c compatible with PHP7/phpng ."
  Updated NEWS

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Sat, 22 Nov 2014 08:40:11 +0000 (00:40 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert "made lsapi_main.c compatible with PHP7/phpng ."

10 years agoRevert "made lsapi_main.c compatible with PHP7/phpng ."
Stanislav Malyshev [Sat, 22 Nov 2014 08:38:04 +0000 (00:38 -0800)]
Revert "made lsapi_main.c compatible with PHP7/phpng ."

This reverts commit 9fb816f45ad9baa46b91514e70f755eb88539e85.
Not a security-related fix.