]> granicus.if.org Git - php/log
php
9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 15 Mar 2016 06:11:54 +0000 (07:11 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update NEWS
  Fix bug #71624, PHP_MODE_PROCESS_STDIN (CLI SAPI called with '-R') did not properly set $argi and $argn
  fix uninitialized value

9 years agoupdate NEWS
Anatol Belski [Tue, 15 Mar 2016 06:11:21 +0000 (07:11 +0100)]
update NEWS

9 years agoFix bug #71624, PHP_MODE_PROCESS_STDIN (CLI SAPI called with '-R') did not properly...
Sean DuBois [Sun, 13 Mar 2016 03:15:54 +0000 (21:15 -0600)]
Fix bug #71624, PHP_MODE_PROCESS_STDIN (CLI SAPI called with '-R') did not properly set $argi and $argn

9 years agofix uninitialized value
Anatol Belski [Tue, 15 Mar 2016 05:43:29 +0000 (06:43 +0100)]
fix uninitialized value

9 years agoMark uses in UNSET_VAR op1 + FE_FETCH_R op2 as no_val
Nikita Popov [Wed, 2 Mar 2016 12:21:20 +0000 (13:21 +0100)]
Mark uses in UNSET_VAR op1 + FE_FETCH_R op2 as no_val

9 years agoStatically bind static method call arguments
Nikita Popov [Sun, 13 Mar 2016 17:01:51 +0000 (18:01 +0100)]
Statically bind static method call arguments

If we know what method will be called, use ct-bound send opcodes.

The intl test is changed because a runtime error changed to a
compile-time error.

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 14 Mar 2016 15:45:12 +0000 (16:45 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix pointer truncation on 64 bit

9 years agofix pointer truncation on 64 bit
Anatol Belski [Mon, 14 Mar 2016 15:44:27 +0000 (16:44 +0100)]
fix pointer truncation on 64 bit

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 14 Mar 2016 14:58:40 +0000 (15:58 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix test
  Update NEWS

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Mon, 14 Mar 2016 14:58:05 +0000 (15:58 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix test

9 years agofix test
Anatol Belski [Mon, 14 Mar 2016 14:53:02 +0000 (15:53 +0100)]
fix test

Many warnings won't appear with libxml2 >= 2.9.3 because in many
cases libxml2 2.9.3 will just abort processing.

9 years agoUpdate NEWS
Yasuo Ohgaki [Fri, 11 Mar 2016 23:52:16 +0000 (08:52 +0900)]
Update NEWS

    Fixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgi
    Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
    Fixed Bug #71599 trans sid handling rework broke interaction with cookies

    All of these bugs are caused by git global change in PHP-7.0.

9 years agoFixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgi
Yasuo Ohgaki [Fri, 11 Mar 2016 23:39:51 +0000 (08:39 +0900)]
Fixed Bug #71754 Regression in PHP7.0: trivial script segfaults php-cgi
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
Fixed Bug #71599 trans sid handling rework broke interaction with cookies

All of these bug is caused by git global change in PHP-7.0.

9 years agoMerge branch 'PHP-7.0'
Yasuo Ohgaki [Fri, 11 Mar 2016 23:33:04 +0000 (08:33 +0900)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket

9 years agoFixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket
Yasuo Ohgaki [Fri, 11 Mar 2016 23:15:47 +0000 (08:15 +0900)]
Fixed Bug #71683 Null pointer dereference in zend_hash_str_find_bucket

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Fri, 11 Mar 2016 21:45:52 +0000 (22:45 +0100)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #71806
Nikita Popov [Fri, 11 Mar 2016 21:45:38 +0000 (22:45 +0100)]
Fixed bug #71806

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Fri, 11 Mar 2016 21:28:50 +0000 (22:28 +0100)]
Merge branch 'PHP-7.0'

9 years agoFix bug #71767
Grigorii Sokolik [Fri, 11 Mar 2016 16:28:45 +0000 (19:28 +0300)]
Fix bug #71767

9 years agoAdded ability to avoid code generation for useless opcode handlers.
Dmitry Stogov [Fri, 11 Mar 2016 13:51:06 +0000 (16:51 +0300)]
Added ability to avoid code generation for useless opcode handlers.

- SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding.
- SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Fri, 11 Mar 2016 13:24:03 +0000 (14:24 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update NEWS
  update NEWS

9 years agoupdate NEWS
Anatol Belski [Fri, 11 Mar 2016 13:23:34 +0000 (14:23 +0100)]
update NEWS

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Fri, 11 Mar 2016 13:23:07 +0000 (14:23 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS

9 years agoupdate NEWS
Anatol Belski [Fri, 11 Mar 2016 13:22:11 +0000 (14:22 +0100)]
update NEWS

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Fri, 11 Mar 2016 13:13:11 +0000 (14:13 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix DatePeriod::getEndDate() segfault

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Fri, 11 Mar 2016 13:12:54 +0000 (14:12 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix DatePeriod::getEndDate() segfault

9 years agoFix DatePeriod::getEndDate() segfault
Thomas Punt [Mon, 7 Mar 2016 09:40:22 +0000 (09:40 +0000)]
Fix DatePeriod::getEndDate() segfault

9 years agoAllow usage of "TMPVARCV" pattern for cases when there is no difference in handling...
Dmitry Stogov [Fri, 11 Mar 2016 10:38:53 +0000 (13:38 +0300)]
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.

9 years agoAdded possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ super...
Dmitry Stogov [Fri, 11 Mar 2016 09:17:03 +0000 (12:17 +0300)]
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 10 Mar 2016 16:11:42 +0000 (17:11 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix build with clang on Winodws

9 years agoRemove NOPs after DFA pass.
Dmitry Stogov [Thu, 10 Mar 2016 15:31:02 +0000 (18:31 +0300)]
Remove NOPs after DFA pass.

9 years agofix build with clang on Winodws
Anatol Belski [Thu, 10 Mar 2016 14:30:20 +0000 (15:30 +0100)]
fix build with clang on Winodws

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 10 Mar 2016 10:40:08 +0000 (11:40 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix error condition, part of bug #71753

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Thu, 10 Mar 2016 10:39:16 +0000 (11:39 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix error condition, part of bug #71753

9 years agofix error condition, part of bug #71753
Anatol Belski [Thu, 10 Mar 2016 10:35:50 +0000 (11:35 +0100)]
fix error condition, part of bug #71753

9 years agoMerge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
Dmitry Stogov [Thu, 10 Mar 2016 10:34:41 +0000 (13:34 +0300)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:php-src:
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)

9 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Thu, 10 Mar 2016 10:34:25 +0000 (13:34 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Thu, 10 Mar 2016 10:34:00 +0000 (13:34 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  More effecient fix for bug #71756

9 years agoMore effecient fix for bug #71756
Dmitry Stogov [Thu, 10 Mar 2016 10:33:36 +0000 (13:33 +0300)]
More effecient fix for bug #71756

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 10 Mar 2016 08:36:32 +0000 (09:36 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Thu, 10 Mar 2016 08:35:55 +0000 (09:35 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)

9 years agotsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
Xinchen Hui [Thu, 10 Mar 2016 06:24:13 +0000 (14:24 +0800)]
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)

cherry-picked from 7d5f71b0b125c89211e5a2a6d925deba938abd41

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 10 Mar 2016 07:45:57 +0000 (08:45 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix invalid pointer on 64-bit

9 years agofix invalid pointer on 64-bit
Anatol Belski [Thu, 10 Mar 2016 07:24:33 +0000 (08:24 +0100)]
fix invalid pointer on 64-bit

9 years agofix invalid pointer on 64-bit
Anatol Belski [Thu, 10 Mar 2016 07:24:33 +0000 (08:24 +0100)]
fix invalid pointer on 64-bit

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 10 Mar 2016 07:43:53 +0000 (15:43 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Useless check (part of #71753)
  object->ce should not be NULL
  Fixed typo (partially fix for #71753)
  emalloc never returns NULL (partially fix for #71753)

9 years agoUseless check (part of #71753)
Xinchen Hui [Thu, 10 Mar 2016 07:43:22 +0000 (15:43 +0800)]
Useless check (part of #71753)

9 years agoobject->ce should not be NULL
Xinchen Hui [Thu, 10 Mar 2016 07:26:15 +0000 (15:26 +0800)]
object->ce should not be NULL

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Thu, 10 Mar 2016 07:23:40 +0000 (15:23 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed typo (partially fix for #71753)

Conflicts:
ext/standard/uuencode.c

9 years agoFixed typo (partially fix for #71753)
Xinchen Hui [Thu, 10 Mar 2016 07:22:34 +0000 (15:22 +0800)]
Fixed typo (partially fix for #71753)

9 years agoemalloc never returns NULL (partially fix for #71753)
Xinchen Hui [Thu, 10 Mar 2016 07:15:26 +0000 (15:15 +0800)]
emalloc never returns NULL (partially fix for #71753)

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 10 Mar 2016 07:10:26 +0000 (15:10 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Improve the codes (FETCH_DIM_R/IS is read context, we should not expose IS_REFERENCE)

9 years agoImprove the codes (FETCH_DIM_R/IS is read context, we should not expose IS_REFERENCE)
Xinchen Hui [Thu, 10 Mar 2016 07:09:51 +0000 (15:09 +0800)]
Improve the codes (FETCH_DIM_R/IS is read context, we should not expose IS_REFERENCE)

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 10 Mar 2016 07:03:25 +0000 (15:03 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)
  Bug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)

9 years agoFixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)
Xinchen Hui [Thu, 10 Mar 2016 07:02:10 +0000 (15:02 +0800)]
Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)

9 years agoBug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)
Xinchen Hui [Thu, 10 Mar 2016 06:58:10 +0000 (14:58 +0800)]
Bug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)

9 years agotsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)
Xinchen Hui [Thu, 10 Mar 2016 06:24:13 +0000 (14:24 +0800)]
tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Wed, 9 Mar 2016 22:01:51 +0000 (23:01 +0100)]
Merge branch 'PHP-7.0'

9 years agoFix bug #71659
Nikita Popov [Wed, 9 Mar 2016 21:58:57 +0000 (22:58 +0100)]
Fix bug #71659

9 years agoAdd NEWS/UPGRADING for negative string offsets
Nikita Popov [Wed, 9 Mar 2016 13:41:08 +0000 (14:41 +0100)]
Add NEWS/UPGRADING for negative string offsets

9 years agomb_strpos()/mb_stripos(): Add support for negative offset
Francois Laupretre [Tue, 5 Jan 2016 15:41:10 +0000 (16:41 +0100)]
mb_strpos()/mb_stripos(): Add support for negative offset

9 years agomb_ereg_search_setpos(): Add support for negative position
Francois Laupretre [Mon, 4 Jan 2016 15:31:52 +0000 (16:31 +0100)]
mb_ereg_search_setpos(): Add support for negative position

Also add missing test for this function

9 years agomb_strimwidth(): Add support for negative 'start' and 'width'
Francois Laupretre [Sun, 3 Jan 2016 12:47:20 +0000 (13:47 +0100)]
mb_strimwidth(): Add support for negative 'start' and 'width'

9 years agofile_get_contents(): Add support for negative offset
Francois Laupretre [Wed, 30 Dec 2015 13:23:37 +0000 (14:23 +0100)]
file_get_contents(): Add support for negative offset

9 years agoAdd negative offset support to iconv_strpos()
Francois Laupretre [Thu, 24 Dec 2015 18:03:10 +0000 (19:03 +0100)]
Add negative offset support to iconv_strpos()

9 years agoAdd negative offset support to grapheme_strpos/stripos/extract()
Francois Laupretre [Fri, 11 Sep 2015 23:27:05 +0000 (01:27 +0200)]
Add negative offset support to grapheme_strpos/stripos/extract()

9 years agosubstr_count(): Support negative values for '$offset' and '$length' parameters.
Francois Laupretre [Thu, 23 Jul 2015 02:01:23 +0000 (04:01 +0200)]
substr_count(): Support negative values for '$offset' and '$length' parameters.

9 years agostrpos()/stripos(): Add support for negative offsets
Francois Laupretre [Wed, 22 Jul 2015 22:08:57 +0000 (00:08 +0200)]
strpos()/stripos(): Add support for negative offsets

9 years agoAdd support for negative string offsets (syntax)
Francois Laupretre [Tue, 21 Jul 2015 20:16:08 +0000 (22:16 +0200)]
Add support for negative string offsets (syntax)

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Wed, 9 Mar 2016 13:29:03 +0000 (14:29 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix SKIPIF sections

9 years agofix SKIPIF sections
Anatol Belski [Wed, 9 Mar 2016 13:28:38 +0000 (14:28 +0100)]
fix SKIPIF sections

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Wed, 9 Mar 2016 13:17:44 +0000 (14:17 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix directory separator

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Wed, 9 Mar 2016 13:17:30 +0000 (14:17 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix directory separator

9 years agofix directory separator
Anatol Belski [Wed, 9 Mar 2016 13:16:29 +0000 (14:16 +0100)]
fix directory separator

9 years agoarena_alloc never returns NULL
Xinchen Hui [Wed, 9 Mar 2016 10:05:28 +0000 (18:05 +0800)]
arena_alloc never returns NULL

9 years agoSuppress warnings
Xinchen Hui [Wed, 9 Mar 2016 10:01:29 +0000 (18:01 +0800)]
Suppress warnings

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Wed, 9 Mar 2016 04:16:46 +0000 (12:16 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #71729 (Possible crash in zend_bin_strtod, zend_oct_strtod, zend_hex_strtod)

9 years agoFixed bug #71729 (Possible crash in zend_bin_strtod, zend_oct_strtod, zend_hex_strtod)
Xinchen Hui [Wed, 9 Mar 2016 04:16:24 +0000 (12:16 +0800)]
Fixed bug #71729 (Possible crash in zend_bin_strtod, zend_oct_strtod, zend_hex_strtod)

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 8 Mar 2016 12:16:46 +0000 (13:16 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix regression introduced in 5683b6fa39

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Tue, 8 Mar 2016 12:16:08 +0000 (13:16 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix regression introduced in 5683b6fa39

9 years agofix regression introduced in 5683b6fa39
Anatol Belski [Tue, 8 Mar 2016 11:59:59 +0000 (12:59 +0100)]
fix regression introduced in 5683b6fa39

Test extended. Basically, both iterator type and next node have
to be checked.

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 7 Mar 2016 21:05:46 +0000 (22:05 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix incompatible pointers on 64-bit

9 years agofix incompatible pointers on 64-bit
Anatol Belski [Mon, 7 Mar 2016 21:01:44 +0000 (22:01 +0100)]
fix incompatible pointers on 64-bit

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 7 Mar 2016 15:40:23 +0000 (16:40 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix double free and move temps into local scope
  add error check

9 years agofix double free and move temps into local scope
Anatol Belski [Mon, 7 Mar 2016 15:38:47 +0000 (16:38 +0100)]
fix double free and move temps into local scope

9 years agoadd error check
Anatol Belski [Mon, 7 Mar 2016 15:26:01 +0000 (16:26 +0100)]
add error check

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Sun, 6 Mar 2016 20:39:20 +0000 (21:39 +0100)]
Merge branch 'PHP-7.0'

Conflicts:
Zend/zend_language_scanner.c

9 years agoFixed bug #71724
Nikita Popov [Sun, 6 Mar 2016 20:38:21 +0000 (21:38 +0100)]
Fixed bug #71724

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Fri, 4 Mar 2016 11:27:43 +0000 (12:27 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix ibase connection routine

9 years agofix ibase connection routine
Anatol Belski [Fri, 4 Mar 2016 11:26:25 +0000 (12:26 +0100)]
fix ibase connection routine

followup on a7028d96

9 years agofix initializer for empty_fcall_info
Anatol Belski [Fri, 4 Mar 2016 09:57:38 +0000 (10:57 +0100)]
fix initializer for empty_fcall_info

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Thu, 3 Mar 2016 22:50:51 +0000 (23:50 +0100)]
Merge branch 'PHP-7.0'

9 years agoFix one zpp usage in interbase
Tjerk Meesters [Thu, 3 Mar 2016 22:48:45 +0000 (23:48 +0100)]
Fix one zpp usage in interbase

Also small tweak to zpp REAME

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Thu, 3 Mar 2016 22:20:50 +0000 (23:20 +0100)]
Merge branch 'PHP-7.0'

Conflicts:
ext/mysqlnd/mysqlnd_priv.h
main/php_streams.h

9 years agoEliminate usages of _PP macros
Nikita Popov [Thu, 3 Mar 2016 22:13:50 +0000 (23:13 +0100)]
Eliminate usages of _PP macros

These are either in debug code (fix them), commented out (drop
them) or in dead compatibility macros (drop them).

One usage was in php_stream_get_from_zval(), which we have not used
since at least PHP 5.2 and, judging from the fact that nobody
complained about it causing compile errors in PHP 7, nobody else
uses it either, so drop it.

There are still remaining uses in mysqli embedded and odbc birdstep.
These probably need to be dropped outright.

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Thu, 3 Mar 2016 18:27:41 +0000 (19:27 +0100)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Thu, 3 Mar 2016 18:26:22 +0000 (19:26 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

9 years agoFixed bug #69953
Christoph M. Becker [Tue, 14 Jul 2015 09:09:03 +0000 (11:09 +0200)]
Fixed bug #69953

Added support for MKCALENDAR request method in CLI web server.

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Thu, 3 Mar 2016 16:30:05 +0000 (17:30 +0100)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Thu, 3 Mar 2016 16:29:58 +0000 (17:29 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0