[PHP-CVS] cvs: php4(PHP_4_3) /sapi/cli php_cli.c

[Edin Kadribasic]

edink           Thu May 29 19:57:27 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/sapi/cli      php_cli.c 
  Log:
  Nuke the rest of headers-sent code
  
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.51.2.20 php4/sapi/cli/php_cli.c:1.51.2.21
--- php4/sapi/cli/php_cli.c:1.51.2.20   Thu May 29 11:28:01 2003
+++ php4/sapi/cli/php_cli.c     Thu May 29 19:57:27 2003
@@ -625,7 +625,6 @@
                        case '?':
                                php_output_startup();
                                php_output_activate(TSRMLS_C);
-                               SG(headers_sent) = 1;
                                php_cli_usage(argv[0]);
                                php_end_ob_buffers(1 TSRMLS_CC);
                                exit_status=1;
@@ -836,8 +835,6 @@
                }
 
                if (param_error) {
-                       SG(headers_sent) = 1;
-                       SG(request_info).no_headers = 1;
                        PUTS(param_error);
                        exit_status=1;
                        goto out_err;
@@ -885,8 +882,6 @@
                if (php_request_startup(TSRMLS_C)==FAILURE) {
                        *arg_excp = arg_free;
                        fclose(file_handle.handle.fp);
-                       SG(headers_sent) = 1;
-                       SG(request_info).no_headers = 1;
                        php_request_shutdown((void *) 0);
                        PUTS("Could not startup.\n");
                        goto err;



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