[PHP-CVS] com php-src: sapi/litespeed/lsapi_main.c: Fix bug #63228: sapi/litespeed/lsapi_main.c

2012-10-12 Thread George Wang 
Commit:22611b8d3774cff379cc51666842ab4b8a2eaf7f
Author:George Wang gw...@php.net Fri, 12 Oct 2012 13:04:22 -0400
Parents:   1b9e0de2ccab0d6ae6f77b53b5c3a306ec154496
Branches:  master

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

Log:
sapi/litespeed/lsapi_main.c: Fix bug #63228

Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]

Bugs:
https://bugs.php.net/63228

Changed paths:
  M  sapi/litespeed/lsapi_main.c


Diff:
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c
index bb532d8..7058342 100644
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@ -603,7 +603,7 @@ static void cli_usage( TSRMLS_D )
   args...Arguments passed to script.\n;
 php_output_startup();
 php_output_activate(TSRMLS_C);
-php_printf( usage );
+php_printf( %s, usage );
 #ifdef PHP_OUTPUT_NEWAPI
 php_output_end_all(TSRMLS_C);
 #else


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

[PHP-CVS] com php-src: Merge branch '5.4': sapi/litespeed/lsapi_main.c

2012-10-12 Thread George Wang 
Commit:1407b4a08085cc6b4b534baa2ca9eb40f8d39241
Author:George Wang gw...@php.net Fri, 12 Oct 2012 13:29:37 -0400
Parents:   6fbcf693750d682b223660d3299a0b6864915acc 
68e528a6bca59fcbcefeb49a6fcf992c8648475f
Branches:  master

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

Log:
Merge branch '5.4'

* 5.4:
  sapi/litespeed/lsapi_main.c: Fix bug #63228

Bugs:
https://bugs.php.net/63228

Changed paths:
  MM  sapi/litespeed/lsapi_main.c


Diff:
diff --cc sapi/litespeed/lsapi_main.c
index 5f4d2e6,7058342..338b8e9
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@@ -413,25 -585,25 +413,25 @@@ static int processReq( TSRMLS_D 
  
  static void cli_usage( TSRMLS_D )
  {
 -static const char * usage =
 -Usage: php\n
 -  php -[b|c|h|i|q|s|v|?] [file] [args...]\n
 -  Run in LSAPI mode, only '-b', '-s' and '-c' are effective\n
 -  Run in Command Line Interpreter mode when parameters are 
specified\n
 -\n
 -  -b address:port|port Bind Path for external LSAPI Server 
mode\n
 -  -c path|file Look for php.ini file in this directory\n
 -  -hThis help\n
 -  -iPHP information\n
 -  -qQuiet-mode.  Suppress HTTP Header output.\n
 -  -sDisplay colour syntax highlighted source.\n
 -  -vVersion number\n
 -  -?This help\n
 -\n
 -  args...Arguments passed to script.\n;
 -php_output_startup();
 -php_output_activate(TSRMLS_C);
 -php_printf( %s, usage );
 +  static const char * usage =
 +  Usage: php\n
 +php -[b|c|h|i|q|s|v|?] [file] [args...]\n
 +Run in LSAPI mode, only '-b', '-s' and '-c' are effective\n
 +Run in Command Line Interpreter mode when parameters are 
specified\n
 +  \n
 +-b address:port|port Bind Path for external LSAPI Server 
mode\n
 +-c path|file Look for php.ini file in this directory\n
 +-hThis help\n
 +-iPHP information\n
 +-qQuiet-mode.  Suppress HTTP Header output.\n
 +-sDisplay colour syntax highlighted source.\n
 +-vVersion number\n
 +-?This help\n
 +  \n
 +args...  Arguments passed to script.\n;
 +  php_output_startup();
 +  php_output_activate(TSRMLS_C);
-   php_printf( usage );
++  php_printf( %s, usage );
  #ifdef PHP_OUTPUT_NEWAPI
  php_output_end_all(TSRMLS_C);
  #else


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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/litespeed/ lsapi_main.c

2011-12-31 Thread George Wang 
gwangSat, 31 Dec 2011 18:15:06 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=321616

Log:
fixed a crash in cli mode when apache_request_headers() is called

Changed paths:
U   php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c

Modified: php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c
===
--- php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c2011-12-31 
15:23:05 UTC (rev 321615)
+++ php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c2011-12-31 
18:15:06 UTC (rev 321616)
@@ -1055,7 +1055,8 @@
 }
 array_init(return_value);

-LSAPI_ForeachOrgHeader( add_associate_array, return_value );
+if ( lsapi_mode )
+LSAPI_ForeachOrgHeader( add_associate_array, return_value );

 }
 /* }}} */

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/sapi/litespeed/ lsapi_main.c

2011-12-31 Thread George Wang 
gwangSat, 31 Dec 2011 18:15:22 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=321617

Log:
fixed a crash in cli mode when apache_request_headers() is called

Changed paths:
U   php/php-src/branches/PHP_5_4/sapi/litespeed/lsapi_main.c

Modified: php/php-src/branches/PHP_5_4/sapi/litespeed/lsapi_main.c
===
--- php/php-src/branches/PHP_5_4/sapi/litespeed/lsapi_main.c2011-12-31 
18:15:06 UTC (rev 321616)
+++ php/php-src/branches/PHP_5_4/sapi/litespeed/lsapi_main.c2011-12-31 
18:15:22 UTC (rev 321617)
@@ -1055,7 +1055,8 @@
 }
 array_init(return_value);

-LSAPI_ForeachOrgHeader( add_associate_array, return_value );
+if ( lsapi_mode )
+LSAPI_ForeachOrgHeader( add_associate_array, return_value );

 }
 /* }}} */

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/litespeed/ lsapi_main.c

2011-11-15 Thread George Wang 
gwangWed, 16 Nov 2011 03:44:42 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=319291

Log:
keep PHP_5_4 in sync with PHP_5_3 branch

Changed paths:
U   php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c

Modified: php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c
===
--- php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c2011-11-16 
00:50:11 UTC (rev 319290)
+++ php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c2011-11-16 
03:44:42 UTC (rev 319291)
@@ -225,6 +225,7 @@
 }


+#if ((PHP_MAJOR_VERSION == 5  PHP_MINOR_VERSION  4) || PHP_MAJOR_VERSION  
5)
 static int add_variable_magic_quote( const char * pKey, int keyLen, const char 
* pValue, int valLen,
  void * arg )
 {
@@ -244,6 +245,8 @@
 return 1;
 }

+#endif
+
 /* {{{ sapi_lsapi_register_variables
  */
 static void sapi_lsapi_register_variables(zval *track_vars_array TSRMLS_DC)
@@ -253,15 +256,19 @@
 if ( (SG(request_info).request_uri ) )
 php_self = (SG(request_info).request_uri );

+#if ((PHP_MAJOR_VERSION == 5  PHP_MINOR_VERSION  4) || PHP_MAJOR_VERSION  
5)
 if (!PG(magic_quotes_gpc)) {
+#endif
 LSAPI_ForeachHeader( add_variable, track_vars_array );
 LSAPI_ForeachEnv( add_variable, track_vars_array );
 add_variable(PHP_SELF, 8, php_self, strlen( php_self ), 
track_vars_array );
+#if ((PHP_MAJOR_VERSION == 5  PHP_MINOR_VERSION  4) || PHP_MAJOR_VERSION  
5)
 } else {
 LSAPI_ForeachHeader( add_variable_magic_quote, track_vars_array );
 LSAPI_ForeachEnv( add_variable_magic_quote, track_vars_array );
 add_variable_magic_quote(PHP_SELF, 8, php_self, strlen( php_self 
), track_vars_array );
 }
+#endif
 php_import_environment_variables(track_vars_array TSRMLS_CC);
 } else {
 php_import_environment_variables(track_vars_array TSRMLS_CC);
@@ -344,7 +351,7 @@

 /* {{{ sapi_lsapi_send_headers
  */
-static void sapi_lsapi_log_message(char *message)
+static void sapi_lsapi_log_message(char *message TSRMLS_DC)
 {
 int len = strlen( message );
 LSAPI_Write_Stderr( message, len);

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/litespeed/ lsapi_main.c

2011-11-15 Thread George Wang 
gwangWed, 16 Nov 2011 03:58:57 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=319293

Log:
keep code to be compatible with PHP4

Changed paths:
U   php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c

Modified: php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c
===
--- php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c2011-11-16 
03:46:54 UTC (rev 319292)
+++ php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c2011-11-16 
03:58:57 UTC (rev 319293)
@@ -986,11 +986,17 @@

 /*   LiteSpeed PHP module starts here */

+#if PHP_MAJOR_VERSION  4
+
 /* {{{ arginfo */
 ZEND_BEGIN_ARG_INFO(arginfo_litespeed__void, 0)
 ZEND_END_ARG_INFO()
 /* }}} */

+#else
+#define arginfo_litespeed__void NULL
+#endif
+
 PHP_FUNCTION(litespeed_request_headers);
 PHP_FUNCTION(litespeed_response_headers);


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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/sapi/litespeed/ lsapi_main.c

2011-11-15 Thread George Wang 
gwangWed, 16 Nov 2011 04:00:28 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=319294

Log:
keep code to be compatible with PHP4

Changed paths:
U   php/php-src/branches/PHP_5_4/sapi/litespeed/lsapi_main.c

Modified: php/php-src/branches/PHP_5_4/sapi/litespeed/lsapi_main.c
===
--- php/php-src/branches/PHP_5_4/sapi/litespeed/lsapi_main.c2011-11-16 
03:58:57 UTC (rev 319293)
+++ php/php-src/branches/PHP_5_4/sapi/litespeed/lsapi_main.c2011-11-16 
04:00:28 UTC (rev 319294)
@@ -986,11 +986,17 @@

 /*   LiteSpeed PHP module starts here */

+#if PHP_MAJOR_VERSION  4
+
 /* {{{ arginfo */
 ZEND_BEGIN_ARG_INFO(arginfo_litespeed__void, 0)
 ZEND_END_ARG_INFO()
 /* }}} */

+#else
+#define arginfo_litespeed__void NULL
+#endif
+
 PHP_FUNCTION(litespeed_request_headers);
 PHP_FUNCTION(litespeed_response_headers);


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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/litespeed/ lsapilib.c

2011-06-08 Thread George Wang 
gwangWed, 08 Jun 2011 16:51:59 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311935

Log:
fix socket address parsing code

Changed paths:
U   php/php-src/branches/PHP_5_3/sapi/litespeed/lsapilib.c

Modified: php/php-src/branches/PHP_5_3/sapi/litespeed/lsapilib.c
===
--- php/php-src/branches/PHP_5_3/sapi/litespeed/lsapilib.c  2011-06-08 
16:46:31 UTC (rev 311934)
+++ php/php-src/branches/PHP_5_3/sapi/litespeed/lsapilib.c  2011-06-08 
16:51:59 UTC (rev 311935)
@@ -1453,7 +1453,7 @@
 return -1;
 }

-while( isspace( *p ) ) {
+while( isspace( *pBind ) ) {
 ++pBind;
 }

@@ -1509,7 +1509,7 @@
 }

 port = atoi( pEnd );
-if (( port = 0 )||( port  655535 )) {
+if (( port = 0 )||( port  65535 )) {
 return -1;
 }
 if ( doAddrInfo ) {

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/litespeed/ lsapi_main.c

2011-05-31 Thread George Wang 
gwangTue, 31 May 2011 22:40:42 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=311680

Log:
fix CLI mode timeout

Changed paths:
U   php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c

Modified: php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c
===
--- php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c2011-05-31 
21:38:23 UTC (rev 311679)
+++ php/php-src/branches/PHP_5_3/sapi/litespeed/lsapi_main.c2011-05-31 
22:40:42 UTC (rev 311680)
@@ -660,6 +660,7 @@
 implicit_flush,   1,
 output_buffering, 0,
 max_execution_time,   0,
+max_input_time,   -1,
 NULL
 };


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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/litespeed/ config.m4

2010-07-07 Thread George Wang 
gwangWed, 07 Jul 2010 20:03:04 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=301063

Log:
applied patch from bug report 51452

Changed paths:
U   php/php-src/branches/PHP_5_3/sapi/litespeed/config.m4

Modified: php/php-src/branches/PHP_5_3/sapi/litespeed/config.m4
===
--- php/php-src/branches/PHP_5_3/sapi/litespeed/config.m4   2010-07-07 
18:45:11 UTC (rev 301062)
+++ php/php-src/branches/PHP_5_3/sapi/litespeed/config.m4   2010-07-07 
20:03:04 UTC (rev 301063)
@@ -12,6 +12,7 @@
   SAPI_LITESPEED_PATH=sapi/litespeed/php
   PHP_SUBST(SAPI_LITESPEED_PATH)
   PHP_SELECT_SAPI(litespeed, program, lsapi_main.c lsapilib.c, , 
'$(SAPI_LITESPEED_PATH)')
+  INSTALL_IT=@echo \Installing PHP LiteSpeed into: 
\$(INSTALL_ROOT)\$(bindir)/\; \$(INSTALL) -m 0755 \$(SAPI_LITESPEED_PATH) 
\$(INSTALL_ROOT)\$(bindir)/lsphp
   case $host_alias in
   *darwin*)
 BUILD_LITESPEED=\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) 
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) 
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) 
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_LITESPEED_PATH)

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

[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/litespeed lsapilib.c

2009-02-27 Thread George Wang 
gwang   Fri Feb 27 23:33:01 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/sapi/litespeed lsapilib.c 
  Log:
  make STDOUT function as STDERR, in case any module call print()
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapilib.c?r1=1.5.2.5r2=1.5.2.6diff_format=u
Index: php-src/sapi/litespeed/lsapilib.c
diff -u php-src/sapi/litespeed/lsapilib.c:1.5.2.5 
php-src/sapi/litespeed/lsapilib.c:1.5.2.6
--- php-src/sapi/litespeed/lsapilib.c:1.5.2.5   Sun Sep 21 02:38:32 2008
+++ php-src/sapi/litespeed/lsapilib.c   Fri Feb 27 23:33:01 2009
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: lsapilib.c,v 1.5.2.5 2008/09/21 02:38:32 gwang Exp $ */
+/* $Id: lsapilib.c,v 1.5.2.6 2009/02/27 23:33:01 gwang Exp $ */
 
 /*
 Copyright (c) 2007, Lite Speed Technologies Inc.
@@ -581,6 +581,9 @@
 #if defined(SIGXFSZ)  defined(SIG_IGN)
 signal(SIGXFSZ, SIG_IGN);
 #endif
+/* let STDOUT function as STDERR, 
+   just in case writing to STDOUT directly */
+dup2( 2, 1 );
 
 if ( LSAPI_InitRequest( g_req, LSAPI_SOCK_FILENO ) == -1 ) {
 return -1;



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

[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/litespeed lsapilib.c

2008-09-20 Thread George Wang 
gwang   Sun Sep 21 02:34:08 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/sapi/litespeed lsapilib.c 
  Log:
  disable core dump by default
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapilib.c?r1=1.5.2.3r2=1.5.2.4diff_format=u
Index: php-src/sapi/litespeed/lsapilib.c
diff -u php-src/sapi/litespeed/lsapilib.c:1.5.2.3 
php-src/sapi/litespeed/lsapilib.c:1.5.2.4
--- php-src/sapi/litespeed/lsapilib.c:1.5.2.3   Tue Aug 26 22:05:17 2008
+++ php-src/sapi/litespeed/lsapilib.c   Sun Sep 21 02:34:08 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: lsapilib.c,v 1.5.2.3 2008/08/26 22:05:17 gwang Exp $ */
+/* $Id: lsapilib.c,v 1.5.2.4 2008/09/21 02:34:08 gwang Exp $ */
 
 /*
 Copyright (c) 2007, Lite Speed Technologies Inc.
@@ -66,7 +66,9 @@
 #include stdio.h
 #include string.h
 #include sys/mman.h
+#include sys/resource.h
 #include sys/socket.h
+#include sys/time.h
 #include sys/uio.h
 #include sys/wait.h
 #include time.h
@@ -2120,7 +2122,16 @@
 if ( p ) {
 avoidFork = atoi( p );
 }
-
+
+#if defined( RLIMIT_CORE )
+p = getenv( LSAPI_ALLOW_CORE_DUMP );
+if ( !p )
+{
+struct rlimit limit = { 0, 0 };
+setrlimit( RLIMIT_CORE, limit );
+}
+#endif
+
 p = getenv( LSAPI_MAX_IDLE );
 if ( p ) {
 n = atoi( p );



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

[PHP-CVS] cvs: php-src /sapi/litespeed lsapilib.c

2008-09-20 Thread George Wang 
gwang   Sun Sep 21 02:34:48 2008 UTC

  Modified files:  
/php-src/sapi/litespeed lsapilib.c 
  Log:
  disable core dump by default
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapilib.c?r1=1.6r2=1.7diff_format=u
Index: php-src/sapi/litespeed/lsapilib.c
diff -u php-src/sapi/litespeed/lsapilib.c:1.6 
php-src/sapi/litespeed/lsapilib.c:1.7
--- php-src/sapi/litespeed/lsapilib.c:1.6   Tue Aug 26 21:59:56 2008
+++ php-src/sapi/litespeed/lsapilib.c   Sun Sep 21 02:34:48 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: lsapilib.c,v 1.6 2008/08/26 21:59:56 gwang Exp $ */
+/* $Id: lsapilib.c,v 1.7 2008/09/21 02:34:48 gwang Exp $ */
 
 /*
 Copyright (c) 2007, Lite Speed Technologies Inc.
@@ -66,7 +66,9 @@
 #include stdio.h
 #include string.h
 #include sys/mman.h
+#include sys/resource.h
 #include sys/socket.h
+#include sys/time.h
 #include sys/uio.h
 #include sys/wait.h
 #include time.h
@@ -2120,7 +2122,16 @@
 if ( p ) {
 avoidFork = atoi( p );
 }
-
+
+#if defined( RLIMIT_CORE )
+p = getenv( LSAPI_ALLOW_CORE_DUMP );
+if ( !p )
+{
+struct rlimit limit = { 0, 0 };
+setrlimit( RLIMIT_CORE, limit );
+}
+#endif
+
 p = getenv( LSAPI_MAX_IDLE );
 if ( p ) {
 n = atoi( p );



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

[PHP-CVS] cvs: php-src /sapi/litespeed lsapilib.c

2008-09-20 Thread George Wang 
gwang   Sun Sep 21 02:37:57 2008 UTC

  Modified files:  
/php-src/sapi/litespeed lsapilib.c 
  Log:
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapilib.c?r1=1.7r2=1.8diff_format=u
Index: php-src/sapi/litespeed/lsapilib.c
diff -u php-src/sapi/litespeed/lsapilib.c:1.7 
php-src/sapi/litespeed/lsapilib.c:1.8
--- php-src/sapi/litespeed/lsapilib.c:1.7   Sun Sep 21 02:34:48 2008
+++ php-src/sapi/litespeed/lsapilib.c   Sun Sep 21 02:37:57 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: lsapilib.c,v 1.7 2008/09/21 02:34:48 gwang Exp $ */
+/* $Id: lsapilib.c,v 1.8 2008/09/21 02:37:57 gwang Exp $ */
 
 /*
 Copyright (c) 2007, Lite Speed Technologies Inc.
@@ -2125,8 +2125,7 @@
 
 #if defined( RLIMIT_CORE )
 p = getenv( LSAPI_ALLOW_CORE_DUMP );
-if ( !p )
-{
+if ( !p ) {
 struct rlimit limit = { 0, 0 };
 setrlimit( RLIMIT_CORE, limit );
 }



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

[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/litespeed lsapilib.c

2008-09-20 Thread George Wang 
gwang   Sun Sep 21 02:38:32 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/sapi/litespeed lsapilib.c 
  Log:
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapilib.c?r1=1.5.2.4r2=1.5.2.5diff_format=u
Index: php-src/sapi/litespeed/lsapilib.c
diff -u php-src/sapi/litespeed/lsapilib.c:1.5.2.4 
php-src/sapi/litespeed/lsapilib.c:1.5.2.5
--- php-src/sapi/litespeed/lsapilib.c:1.5.2.4   Sun Sep 21 02:34:08 2008
+++ php-src/sapi/litespeed/lsapilib.c   Sun Sep 21 02:38:32 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: lsapilib.c,v 1.5.2.4 2008/09/21 02:34:08 gwang Exp $ */
+/* $Id: lsapilib.c,v 1.5.2.5 2008/09/21 02:38:32 gwang Exp $ */
 
 /*
 Copyright (c) 2007, Lite Speed Technologies Inc.
@@ -2125,8 +2125,7 @@
 
 #if defined( RLIMIT_CORE )
 p = getenv( LSAPI_ALLOW_CORE_DUMP );
-if ( !p )
-{
+if ( !p ) {
 struct rlimit limit = { 0, 0 };
 setrlimit( RLIMIT_CORE, limit );
 }



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

[PHP-CVS] cvs: php-src /sapi/litespeed lsapilib.c

2008-08-26 Thread George Wang 
gwang   Tue Aug 26 21:59:56 2008 UTC

  Modified files:  
/php-src/sapi/litespeed lsapilib.c 
  Log:
  ignore signal SIGXFSZ
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapilib.c?r1=1.5r2=1.6diff_format=u
Index: php-src/sapi/litespeed/lsapilib.c
diff -u php-src/sapi/litespeed/lsapilib.c:1.5 
php-src/sapi/litespeed/lsapilib.c:1.6
--- php-src/sapi/litespeed/lsapilib.c:1.5   Sun Aug  3 11:46:02 2008
+++ php-src/sapi/litespeed/lsapilib.c   Tue Aug 26 21:59:56 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: lsapilib.c,v 1.5 2008/08/03 11:46:02 jani Exp $ */
+/* $Id: lsapilib.c,v 1.6 2008/08/26 21:59:56 gwang Exp $ */
 
 /*
 Copyright (c) 2007, Lite Speed Technologies Inc.
@@ -576,6 +576,10 @@
 lsapi_signal(SIGPIPE, lsapi_sigpipe);
 lsapi_signal(SIGUSR1, lsapi_siguser1);
 
+#if defined(SIGXFSZ)  defined(SIG_IGN)
+signal(SIGXFSZ, SIG_IGN);
+#endif
+
 if ( LSAPI_InitRequest( g_req, LSAPI_SOCK_FILENO ) == -1 ) {
 return -1;
 }



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

[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/litespeed lsapi_main.c lsapilib.c

2008-08-26 Thread George Wang 
gwang   Tue Aug 26 22:05:17 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/sapi/litespeed lsapi_main.c lsapilib.c 
  Log:
  ignore signal SIGXFSZ
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/lsapi_main.c?r1=1.7.2.2r2=1.7.2.3diff_format=u
Index: php-src/sapi/litespeed/lsapi_main.c
diff -u php-src/sapi/litespeed/lsapi_main.c:1.7.2.2 
php-src/sapi/litespeed/lsapi_main.c:1.7.2.3
--- php-src/sapi/litespeed/lsapi_main.c:1.7.2.2 Tue Aug  5 22:37:32 2008
+++ php-src/sapi/litespeed/lsapi_main.c Tue Aug 26 22:05:17 2008
@@ -16,6 +16,7 @@
+--+
 */
 
+/* $Id: lsapi_main.c,v 1.7.2.3 2008/08/26 22:05:17 gwang Exp $ */
 
 #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.5.2.2r2=1.5.2.3diff_format=u
Index: php-src/sapi/litespeed/lsapilib.c
diff -u php-src/sapi/litespeed/lsapilib.c:1.5.2.2 
php-src/sapi/litespeed/lsapilib.c:1.5.2.3
--- php-src/sapi/litespeed/lsapilib.c:1.5.2.2   Tue Aug  5 22:37:32 2008
+++ php-src/sapi/litespeed/lsapilib.c   Tue Aug 26 22:05:17 2008
@@ -1,4 +1,3 @@
-
 /*
+--+
| PHP Version 5|
@@ -17,6 +16,7 @@
+--+
 */
 
+/* $Id: lsapilib.c,v 1.5.2.3 2008/08/26 22:05:17 gwang 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
 };
  
@@ -578,6 +576,10 @@
 lsapi_signal(SIGPIPE, lsapi_sigpipe);
 lsapi_signal(SIGUSR1, lsapi_siguser1);
 
+#if defined(SIGXFSZ)  defined(SIG_IGN)
+signal(SIGXFSZ, SIG_IGN);
+#endif
+
 if ( LSAPI_InitRequest( g_req, LSAPI_SOCK_FILENO ) == -1 ) {
 return -1;
 }



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

[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/litespeed config.m4

2008-08-07 Thread George Wang 
gwang   Thu Aug  7 16:41:30 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/sapi/litespeed config.m4 
  Log:
  use PHP_ARG_WITH instead of AC_ARG_WITH
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/litespeed/config.m4?r1=1.2.2.2r2=1.2.2.3diff_format=u



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

[PHP-CVS] cvs: php-src /sapi/litespeed CREDITS

2008-08-05 Thread George Wang 
gwang   Tue Aug  5 22:30:56 2008 UTC

  Added files: 
/php-src/sapi/litespeed CREDITS 
  Log:
  add CREDITS
  



-- 
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

2008-07-29 Thread George Wang 
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