diff options
| author | Michael Wallner <mike@php.net> | 2010-05-31 10:29:43 +0000 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2010-05-31 10:29:43 +0000 |
| commit | 11d24c1593d6617f73d3f290617bd8994182f4dc (patch) | |
| tree | eddeffa97ad3893b731144afb003e26ef0952de9 /sapi/milter | |
| parent | 27299b7e4084adb236acfbfb25168d72306ee802 (diff) | |
| download | php-git-11d24c1593d6617f73d3f290617bd8994182f4dc.tar.gz | |
* implement new output API, fixing some bugs and implementing some feature
requests--let's see what I can dig out of the bugtracker for NEWS--
and while crossing the road:
* implemented new zlib API
* fixed up ext/tidy (what was "s&" in zend_parse_parameters() supposed to do?)
Thanks to Jani and Felipe for pioneering.
Diffstat (limited to 'sapi/milter')
| -rw-r--r-- | sapi/milter/php_milter.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c index 11724c425c..6451864557 100644 --- a/sapi/milter/php_milter.c +++ b/sapi/milter/php_milter.c @@ -1040,11 +1040,10 @@ int main(int argc, char *argv[]) while ((c=ap_php_getopt(argc, argv, OPTSTRING))!=-1) { switch (c) { case '?': - php_output_startup(); - php_output_activate(TSRMLS_C); + php_output_tearup(); SG(headers_sent) = 1; php_milter_usage(argv[0]); - php_end_ob_buffers(1 TSRMLS_CC); + php_output_teardown(); exit(1); break; } @@ -1088,11 +1087,10 @@ int main(int argc, char *argv[]) case 'h': /* help & quit */ case '?': - php_output_startup(); - php_output_activate(TSRMLS_C); + php_output_tearup(); SG(headers_sent) = 1; php_milter_usage(argv[0]); - php_end_ob_buffers(1 TSRMLS_CC); + php_output_teardown(); exit(1); break; @@ -1112,7 +1110,7 @@ int main(int argc, char *argv[]) SG(headers_sent) = 1; SG(request_info).no_headers = 1; php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); - php_end_ob_buffers(1 TSRMLS_CC); + php_output_teardown(); exit(1); break; |