diff options
| author | Ondřej Surý <ondrej@sury.org> | 2014-04-17 11:11:51 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2014-04-17 11:11:51 +0200 |
| commit | 9566c3fcaf4cfaa866ea395ee5d1a480785fef0d (patch) | |
| tree | d053b8b66afe080ea2250d5fbcdfc21c243d54ab /sapi/cli | |
| parent | 30bdcf2392ef8cc7b8b4a07b49367571ae1db286 (diff) | |
| download | php-9566c3fcaf4cfaa866ea395ee5d1a480785fef0d.tar.gz | |
New upstream version 5.6.0~beta1+dfsgupstream/5.6.0_beta1+dfsg
Diffstat (limited to 'sapi/cli')
| -rw-r--r-- | sapi/cli/php.1.in | 11 | ||||
| -rw-r--r-- | sapi/cli/tests/upload_2G.phpt | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in index c113030d1..8672b3ba3 100644 --- a/sapi/cli/php.1.in +++ b/sapi/cli/php.1.in @@ -178,15 +178,6 @@ Parse and execute .IR file .TP .PD 0 -.B \-\-global \fIname\fP -.TP -.PD 1 -.B \-g \fIname\fP -Make variable -.IR name -global in script. -.TP -.PD 0 .B \-\-help .TP .PD 1 @@ -298,7 +289,7 @@ Specify the document root to be used by the built-in web server Version number .TP .PD 0 -.B \-\-stripped +.B \-\-strip .TP .PD 1 .B \-w diff --git a/sapi/cli/tests/upload_2G.phpt b/sapi/cli/tests/upload_2G.phpt index 707eddbad..313dcd5ac 100644 --- a/sapi/cli/tests/upload_2G.phpt +++ b/sapi/cli/tests/upload_2G.phpt @@ -19,7 +19,7 @@ if ($f = fopen("/proc/meminfo","r")) { } if (empty($enough_free_ram)) { - die("need +3G free RAM"); + die("skip need +3G free RAM"); } ?> --FILE-- |