mike                                     Tue, 01 Jun 2010 13:51:05 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=300050

Log:
fix fpm build

Changed paths:
    U   php/php-src/trunk/sapi/fpm/fpm/fpm_main.c

Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2010-06-01 13:48:50 UTC (rev 
300049)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2010-06-01 13:51:05 UTC (rev 
300050)
@@ -1493,7 +1493,7 @@

        if (fcgi_is_fastcgi() && request->fd >= 0) {

-               php_end_ob_buffers(1 TSRMLS_CC);
+               php_output_end_all(TSRMLS_C);
                php_header(TSRMLS_C);

                fcgi_flush(request, 1);
@@ -1629,7 +1629,6 @@

                        case 'm': /* list compiled in modules */
                                cgi_sapi_module.startup(&cgi_sapi_module);
-                               php_output_startup();
                                php_output_activate(TSRMLS_C);
                                SG(headers_sent) = 1;
                                php_printf("[PHP Modules]\n");
@@ -1637,7 +1636,8 @@
                                php_printf("\n[Zend Modules]\n");
                                print_extensions(TSRMLS_C);
                                php_printf("\n");
-                               php_end_ob_buffers(1 TSRMLS_CC);
+                               php_output_end_all(TSRMLS_C);
+                               php_output_deactivate(TSRMLS_C);
                                exit_status = 0;
                                goto out;

@@ -1660,11 +1660,11 @@
                        case 'h':
                        case '?':
                                cgi_sapi_module.startup(&cgi_sapi_module);
-                               php_output_startup();
                                php_output_activate(TSRMLS_C);
                                SG(headers_sent) = 1;
                                php_cgi_usage(argv[0]);
-                               php_end_ob_buffers(1 TSRMLS_CC);
+                               php_output_end_all(TSRMLS_C);
+                               php_output_deactivate(TSRMLS_C);
                                exit_status = 0;
                                goto out;

@@ -1692,11 +1692,11 @@
        /* No other args are permitted here as there is not interactive mode */
        if (argc != php_optind) {
                cgi_sapi_module.startup(&cgi_sapi_module);
-               php_output_startup();
                php_output_activate(TSRMLS_C);
                SG(headers_sent) = 1;
                php_cgi_usage(argv[0]);
-               php_end_ob_buffers(1 TSRMLS_CC);
+               php_output_end_all(TSRMLS_C);
+               php_output_deactivate(TSRMLS_C);
                exit_status = 0;
                goto out;
        }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to