derick          Fri May 30 12:10:59 2003 EDT

  Modified files:              
    /php4/sapi/cgi      cgi_main.c 
    /php4/sapi/cli      php_cli.c 
  Log:
  - MFB: Version output beautification
  
  
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.229 php4/sapi/cgi/cgi_main.c:1.230
--- php4/sapi/cgi/cgi_main.c:1.229      Mon May 26 19:22:05 2003
+++ php4/sapi/cgi/cgi_main.c    Fri May 30 12:10:58 2003
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: cgi_main.c,v 1.229 2003/05/26 23:22:05 sniper Exp $ */
+/* $Id: cgi_main.c,v 1.230 2003/05/30 16:10:58 derick Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -1384,7 +1384,11 @@
                                                        SG(headers_sent) = 1;
                                                        SG(request_info).no_headers = 
1;
                                                }
-                                               php_printf("PHP %s (%s), Copyright (c) 
1997-2003 The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
+#if ZEND_DEBUG
+                                               php_printf("PHP %s (%s) (built: %s %s) 
(DEBUG)\nCopyright (c) 1997-2003 The PHP Group\n%s", PHP_VERSION, sapi_module.name, 
__DATE__, __TIME__, get_zend_version());
+#else
+                                               php_printf("PHP %s (%s) (built: %s 
%s)\nCopyright (c) 1997-2003 The PHP Group\n%s", PHP_VERSION, sapi_module.name, 
__DATE__, __TIME__, get_zend_version());
+#endif
                                                php_end_ob_buffers(1 TSRMLS_CC);
                                                exit(1);
                                                break;
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.92 php4/sapi/cli/php_cli.c:1.93
--- php4/sapi/cli/php_cli.c:1.92        Thu May 29 20:11:37 2003
+++ php4/sapi/cli/php_cli.c     Fri May 30 12:10:58 2003
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_cli.c,v 1.92 2003/05/30 00:11:37 helly Exp $ */
+/* $Id: php_cli.c,v 1.93 2003/05/30 16:10:58 derick Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -651,7 +651,11 @@
                                if (php_request_startup(TSRMLS_C)==FAILURE) {
                                        goto err;
                                }
+#if ZEND_DEBUG
+                               php_printf("PHP %s (%s) (built: %s %s) 
(DEBUG)\nCopyright (c) 1997-2003 The PHP Group\n%s", PHP_VERSION, sapi_module.name, 
__DATE__, __TIME__, get_zend_version());
+#else
                                php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 
1997-2003 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, 
get_zend_version());
+#endif
                                php_end_ob_buffers(1 TSRMLS_CC);
                                exit_status=1;
                                goto out;



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

Reply via email to