clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-30 22:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,180 Commits 494 Branches 1,367 Tags 797 MiB
316f72ce28
Commit Graph

81180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Weinand
aba95c2399 Revert "Fix bug #68446 (bug with constant defaults and type hints)" 
This reverts commit 5ef138b0c7.
 2014-11-25 12:24:29 +01:00
Stanislav Malyshev
faa396c67d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  move tests into proper place
 2014-11-24 12:26:50 -08:00
Stanislav Malyshev
f86aa349eb move tests into proper place 2014-11-24 12:26:20 -08:00
Anatol Belski
3578e5b250 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix dir separator in test
  fork test for windows
  update for LiteSpeed
 2014-11-24 16:25:38 +01:00
Anatol Belski
09f2355eec fix dir separator in test 2014-11-24 16:14:17 +01:00
Anatol Belski
ac8b1a9de1 fork test for windows 2014-11-24 16:09:26 +01:00
Stanislav Malyshev
1db49d8c5b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update for LiteSpeed
 2014-11-23 18:06:47 -08:00
Stanislav Malyshev
f79bf4900a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update for LiteSpeed
 2014-11-23 18:05:49 -08:00
Stanislav Malyshev
7dbc5e5c69 update for LiteSpeed 2014-11-23 18:05:26 -08:00
Stanislav Malyshev
4469049b7b update for LiteSpeed 2014-11-23 18:03:07 -08:00
Stanislav Malyshev
90445ba4a4 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
 2014-11-23 17:52:50 -08:00
Stanislav Malyshev
d7f27984d2 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
 2014-11-23 17:52:43 -08:00
Stanislav Malyshev
711a3ab9d1 Merge branch 'pull-request/782' into PHP-5.5 
* pull-request/782:
  tests image gd
 2014-11-23 17:52:08 -08:00
Stanislav Malyshev
a8dfb33db8 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
 2014-11-23 17:26:28 -08:00
Stanislav Malyshev
1330491994 Merge branch 'pull-request/854' into PHP-5.5 
* pull-request/854:
  teste basico da funcao timezone_version_get
 2014-11-23 17:23:34 -08:00
Stanislav Malyshev
9d7206dcea 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
 2014-11-23 17:22:54 -08:00
Stanislav Malyshev
24cd25824e 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
 2014-11-23 17:22:02 -08:00
Stanislav Malyshev
2c67c0246e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Test PHP Init Fail Without Params
 2014-11-23 17:21:29 -08:00
Stanislav Malyshev
fa76fa8e32 Merge branch 'pull-request/863' into PHP-5.5 
* pull-request/863:
  Test PHP Init Fail Without Params
 2014-11-23 17:21:20 -08:00
marcosptf
49a133dd0b test to function addcslashes 
test to function bin2hex
 2014-11-23 17:19:56 -08:00
marcosptf
2917c70252 test 2014-11-23 17:19:47 -08:00
Archil Imnadze
926bd6cc7a Update CODING_STANDARDS 2014-11-23 17:14:32 -08:00
Stanislav Malyshev
34c1ba5685 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Correct two zlib tests to use a string, not a const
 2014-11-23 17:12:52 -08:00
Tim Siebels
5351ecbfca Correct two zlib tests to use a string, not a const 2014-11-23 17:12:37 -08:00
Stanislav Malyshev
de075d172c update NEWS 2014-11-23 16:39:52 -08:00
Alexander Lisachenko
a5aae1b66c Fix incorrect argument reflection info for array_multisort() 2014-11-23 16:38:30 -08:00
Stanislav Malyshev
5a3e236bd5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix NEWS order
 2014-11-23 16:24:54 -08:00
Stanislav Malyshev
03dcf66f9a fix NEWS order 2014-11-23 16:21:53 -08:00
Stanislav Malyshev
faee48506d 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.
 2014-11-23 16:18:52 -08:00
Stanislav Malyshev
05394d6056 update NEWS 2014-11-23 16:18:04 -08:00
Stanislav Malyshev
9ef264504d 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.
 2014-11-23 16:17:17 -08:00
Stanislav Malyshev
7e4de4f8d6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update comments in php.ini
 2014-11-23 16:13:58 -08:00
Sobak
6d148f7ed9 Update comments in php.ini 2014-11-23 16:13:44 -08:00
Stanislav Malyshev
fa7615af59 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  added missing INSTALL_ROOT
 2014-11-23 16:09:40 -08:00
Sebastian Brandt
c7248e6359 added missing INSTALL_ROOT 2014-11-23 16:09:24 -08:00
Reeze Xia
7386b74b07 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.
 2014-11-23 16:07:47 -08:00
Kévin Dunglas
8439eb6277 Minor: typo fix in filter_var comment 2014-11-23 15:18:47 -08:00
Dominic Luechinger
437ab7f1f4 Minor fix: Missing quotes in openssl test case for bug bug64802 2014-11-23 15:15:49 -08:00
Bob Weinand
dd70a2c7ae Added NEWS entry and test for bug 68446 2014-11-24 00:08:45 +01:00
Veres Lajos
4dc994571d 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
 2014-11-23 14:33:43 -08:00
Bob Weinand
5ef138b0c7 Fix bug #68446 (bug with constant defaults and type hints) 2014-11-23 21:10:41 +01:00
Florian MARGAINE
489bfb0af9 Fixes memory leak introduced in 2b9af967 
Fixes https://bugs.php.net/bug.php?id=68285
 2014-11-23 01:42:26 +01:00
Remi Collet
c8dd415543 typo 2014-11-22 10:37:22 +01:00
Remi Collet
6e17a439a9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed Bug #68478 acess_log don't use prefix
 2014-11-22 10:36:54 +01:00
Remi Collet
9664312e30 NEWS 2014-11-22 10:36:45 +01:00
Remi Collet
c50ee655ea 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
 2014-11-22 10:35:51 +01:00
Remi Collet
6b974874ab NEWS 2014-11-22 10:30:42 +01:00
Remi Collet
3a3f67f79b minor typo in test 2014-11-22 10:29:51 +01:00
Remi Collet
fd5c421a00 add test for global / pool prefix and bug #68478 2014-11-22 10:29:05 +01:00
Remi Collet
b924af8db9 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
 2014-11-22 10:25:53 +01:00