diff options
| author | Jani Taskinen <jani@php.net> | 2008-08-13 00:53:28 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2008-08-13 00:53:28 +0000 |
| commit | e5e6f553a25f972500b792170e03b5903ee924dd (patch) | |
| tree | 4064bc661598ee9214a8517543b249c8d4d0dca0 /sapi/milter/php_milter.c | |
| parent | f87d4530c299167f04a4d2cc076edb2432be3280 (diff) | |
| download | php-git-e5e6f553a25f972500b792170e03b5903ee924dd.tar.gz | |
MFH
Diffstat (limited to 'sapi/milter/php_milter.c')
| -rw-r--r-- | sapi/milter/php_milter.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c index 64f060bdb1..5d1ddde135 100644 --- a/sapi/milter/php_milter.c +++ b/sapi/milter/php_milter.c @@ -18,6 +18,7 @@ +----------------------------------------------------------------------+ */ +/* $Id$ */ #include "php.h" #include "php_globals.h" @@ -1058,13 +1059,6 @@ int main(int argc, char *argv[]) zend_uv.html_errors = 0; /* tell the engine we're in non-html mode */ - if (milter_sapi_module.php_ini_path_override && milter_sapi_module.php_ini_ignore) { - SG(headers_sent) = 1; - SG(request_info).no_headers = 1; - PUTS("You cannot use both -n and -c switch. Use -h for help.\n"); - exit(1); - } - while ((c = ap_php_getopt(argc, argv, OPTSTRING)) != -1) { switch (c) { |