From: George Wang <gwang@php.net>
Date: Mon, 19 Sep 2016 14:49:26 +0000 (-0400)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.12RC1~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca24c58e656e4c54b3d5bbf02c33fb679134e032;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

ca24c58e656e4c54b3d5bbf02c33fb679134e032
diff --cc sapi/litespeed/lsapi_main.c
index 65d2451ab6,86d75ba6dc..bd40f53183
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@@ -1088,16 -1277,16 +1088,16 @@@ static int cli_main( int argc, char * a
                  }
                  break;
              case 'v':
 -                if (php_request_startup(TSRMLS_C) != FAILURE) {
 +                if (php_request_startup() != FAILURE) {
  #if ZEND_DEBUG
-                     php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2015 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-2016 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-2015 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-2016 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_output_end_all();
  #else
 -                    php_end_ob_buffers(1 TSRMLS_CC);
 +                    php_end_ob_buffers(1);
  #endif
                      php_request_shutdown( NULL );
                      ret = 0;