[PHP-CVS] com php-src: Merge branch 'PHP-5.4': ext/date/lib/parse_date.c ext/date/lib/parse_iso_intervals.c ext/date/lib/tm2unixtime.c ext/standard/url_scanner_ex.c sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c sapi/litespeed/lsapilib.h

[Xinchen Hui]

Commit:    63d9c1f40b52ba68186b89fdd325894a13b22ade
Author:    Xinchen Hui <larue...@php.net>         Wed, 5 Sep 2012 23:20:42 +0800
Parents:   2b7bddd82a7d139f7389abb36ab0189ab5831570 
9d44ff640c1def1dc05b298dab77b2d2c9da2f38
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=63d9c1f40b52ba68186b89fdd325894a13b22ade

Log:
Merge branch 'PHP-5.4'

Conflicts:
        sapi/litespeed/lsapi_main.c

Changed paths:
  MM  ext/date/lib/parse_date.c
  MM  ext/date/lib/parse_iso_intervals.c
  MM  ext/date/lib/tm2unixtime.c
  MM  ext/standard/url_scanner_ex.c
  MM  sapi/litespeed/lsapi_main.c
  MM  sapi/litespeed/lsapilib.c
  MM  sapi/litespeed/lsapilib.h


Diff:
diff --cc sapi/litespeed/lsapi_main.c
index c1684f7,bb532d8..5f4d2e6
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@@ -540,16 -712,16 +540,16 @@@ static int cli_main( int argc, char * a
  #else
                      php_end_ob_buffers(1 TSRMLS_CC);
  #endif
 -                    php_request_shutdown( NULL );
 -                }
 -                ret = 1;
 -                break;
 -            case 'v':
 -                if (php_request_startup(TSRMLS_C) != FAILURE) {
 +                                      php_request_shutdown( NULL );
 +                              }
 +                              ret = 1;
 +                              break;
 +                      case 'v':
 +                              if (php_request_startup(TSRMLS_C) != FAILURE) {
  #if ZEND_DEBUG
-                                       php_printf("PHP %s (%s) (built: %s %s) 
(DEBUG)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, 
sapi_module.name, __DATE__, __TIME__, get_zend_version());
 -                    php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright 
(c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, 
__TIME__, get_zend_version());
++                                      php_printf("PHP %s (%s) (built: %s %s) 
(DEBUG)\nCopyright (c) 1997-2012 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-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, 
__DATE__, __TIME__, get_zend_version());
 -                    php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 
1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, 
__TIME__, get_zend_version());
++                                      php_printf("PHP %s (%s) (built: %s 
%s)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, 
__DATE__, __TIME__, get_zend_version());
  #endif
  #ifdef PHP_OUTPUT_NEWAPI
                      php_output_end_all(TSRMLS_C);


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