[PHP-CVS] cvs: php-src /sapi/litespeed lsapi_main.c lsapilib.c
janiSun Aug 3 11:46:02 2008 UTC
Modified files:
/php-src/sapi/litespeed lsapi_main.c lsapilib.c
Log:
- Added missing $Id$ tags and nuked c++ comments
http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapi_main.c?r1=1.5r2=1.6diff_format=u
Index: php-src/sapi/litespeed/lsapi_main.c
diff -u php-src/sapi/litespeed/lsapi_main.c:1.5
php-src/sapi/litespeed/lsapi_main.c:1.6
--- php-src/sapi/litespeed/lsapi_main.c:1.5 Wed Jul 30 00:07:29 2008
+++ php-src/sapi/litespeed/lsapi_main.c Sun Aug 3 11:46:02 2008
@@ -16,6 +16,7 @@
+--+
*/
+/* $Id */
#include php.h
#include SAPI.h
@@ -804,14 +805,14 @@
static PHP_MINIT_FUNCTION(litespeed)
{
- //REGISTER_INI_ENTRIES();
+ /* REGISTER_INI_ENTRIES(); */
return SUCCESS;
}
static PHP_MSHUTDOWN_FUNCTION(litespeed)
{
- //UNREGISTER_INI_ENTRIES();
+ /* UNREGISTER_INI_ENTRIES(); */
return SUCCESS;
}
@@ -840,7 +841,7 @@
Fetch all HTTP request headers */
PHP_FUNCTION(litespeed_request_headers)
{
- //TODO:
+ /* TODO: */
if (ZEND_NUM_ARGS() 0) {
WRONG_PARAM_COUNT;
}
http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapilib.c?r1=1.4r2=1.5diff_format=u
Index: php-src/sapi/litespeed/lsapilib.c
diff -u php-src/sapi/litespeed/lsapilib.c:1.4
php-src/sapi/litespeed/lsapilib.c:1.5
--- php-src/sapi/litespeed/lsapilib.c:1.4 Tue Apr 15 18:36:47 2008
+++ php-src/sapi/litespeed/lsapilib.c Sun Aug 3 11:46:02 2008
@@ -1,4 +1,3 @@
-
/*
+--+
| PHP Version 5|
@@ -17,6 +16,7 @@
+--+
*/
+/* $Id: lsapilib.c,v 1.5 2008/08/03 11:46:02 jani Exp $ */
/*
Copyright (c) 2007, Lite Speed Technologies Inc.
@@ -50,8 +50,6 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
-
#include lsapilib.h
#include ctype.h
@@ -138,7 +136,7 @@
};
static int HTTP_HEADER_LEN[H_TRANSFER_ENCODING+1] = {
-6, 14, 15, 15, 13, 10, 12, 14, 6, 7, 4, 6, 7, 10, //user-agent
+6, 14, 15, 15, 13, 10, 12, 14, 6, 7, 4, 6, 7, 10, /* user-agent */
13,17, 8, 13, 8, 19, 10, 5, 15, 3, 17
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /sapi/litespeed lsapi_main.c lsapilib.c
On Sun, Aug 3, 2008 at 13:46, Jani Taskinen [EMAIL PROTECTED] wrote: janiSun Aug 3 11:46:02 2008 UTC Modified files: /php-src/sapi/litespeed lsapi_main.c lsapilib.c Log: - Added missing $Id$ tags and nuked c++ comments http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapi_main.c?r1=1.5r2=1.6diff_format=u Index: php-src/sapi/litespeed/lsapi_main.c diff -u php-src/sapi/litespeed/lsapi_main.c:1.5 php-src/sapi/litespeed/lsapi_main.c:1.6 --- php-src/sapi/litespeed/lsapi_main.c:1.5 Wed Jul 30 00:07:29 2008 +++ php-src/sapi/litespeed/lsapi_main.c Sun Aug 3 11:46:02 2008 @@ -16,6 +16,7 @@ +--+ */ +/* $Id */ $Id: $ (similar typo in the intl commit) -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/litespeed lsapi_main.c
janiSun Aug 3 11:55:06 2008 UTC Modified files: /php-src/sapi/litespeed lsapi_main.c Log: oops http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapi_main.c?r1=1.6r2=1.7diff_format=u Index: php-src/sapi/litespeed/lsapi_main.c diff -u php-src/sapi/litespeed/lsapi_main.c:1.6 php-src/sapi/litespeed/lsapi_main.c:1.7 --- php-src/sapi/litespeed/lsapi_main.c:1.6 Sun Aug 3 11:46:02 2008 +++ php-src/sapi/litespeed/lsapi_main.c Sun Aug 3 11:55:06 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id */ +/* $Id: lsapi_main.c,v 1.7 2008/08/03 11:55:06 jani Exp $ */ #include php.h #include SAPI.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/litespeed lsapi_main.c
gwang Wed Jul 30 00:07:29 2008 UTC
Modified files:
/php-src/sapi/litespeed lsapi_main.c
Log:
make it compatible with PHP 6.0 using new php output API
http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapi_main.c?r1=1.4r2=1.5diff_format=u
Index: php-src/sapi/litespeed/lsapi_main.c
diff -u php-src/sapi/litespeed/lsapi_main.c:1.4
php-src/sapi/litespeed/lsapi_main.c:1.5
--- php-src/sapi/litespeed/lsapi_main.c:1.4 Tue Apr 1 05:01:13 2008
+++ php-src/sapi/litespeed/lsapi_main.c Wed Jul 30 00:07:29 2008
@@ -431,7 +431,11 @@
php_output_startup();
php_output_activate(TSRMLS_C);
php_printf( usage );
- php_end_ob_buffers(1 TSRMLS_CC);
+#ifdef PHP_OUTPUT_NEWAPI
+php_output_end_all(TSRMLS_C);
+#else
+php_end_ob_buffers(1 TSRMLS_CC);
+#endif
}
static int parse_opt( int argc, char * argv[], int *climode,
@@ -529,7 +533,11 @@
case 'i':
if (php_request_startup(TSRMLS_C) != FAILURE) {
php_print_info(0x TSRMLS_CC);
- php_end_ob_buffers(1 TSRMLS_CC);
+#ifdef PHP_OUTPUT_NEWAPI
+php_output_end_all(TSRMLS_C);
+#else
+php_end_ob_buffers(1 TSRMLS_CC);
+#endif
php_request_shutdown( NULL );
}
ret = 1;
@@ -541,7 +549,11 @@
#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());
#endif
- php_end_ob_buffers(1 TSRMLS_CC);
+#ifdef PHP_OUTPUT_NEWAPI
+php_output_end_all(TSRMLS_C);
+#else
+php_end_ob_buffers(1 TSRMLS_CC);
+#endif
php_request_shutdown( NULL );
}
ret = 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
