[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

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

2011-11-16 Thread Johannes Schlüter 
George,

please also keep trunk in sync.

And a short comment on this:

On Wed, 2011-11-16 at 04:00 +, George Wang wrote:
 Log:
 keep code to be compatible with PHP4

wow. PHP 4 had it's official end-of-life on 13 Jul 2007. That should
really be discouraged, or even better more than just discouraged, from
being used in any form ...

johannes



-- 
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_4/sapi/litespeed/lsapi_main.c trunk/sapi/litespeed/lsapi_main.c

2011-07-11 Thread Stanislav Malyshev 
stas Tue, 12 Jul 2011 04:45:38 +

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

Log:
MF53

Changed paths:
U   php/php-src/branches/PHP_5_4/sapi/litespeed/lsapi_main.c
U   php/php-src/trunk/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-07-12 
04:42:00 UTC (rev 313157)
+++ php/php-src/branches/PHP_5_4/sapi/litespeed/lsapi_main.c2011-07-12 
04:45:38 UTC (rev 313158)
@@ -495,6 +495,7 @@
implicit_flush,   1,
output_buffering, 0,
max_execution_time,   0,
+   max_input_time,   -1,
NULL
};


Modified: php/php-src/trunk/sapi/litespeed/lsapi_main.c
===
--- php/php-src/trunk/sapi/litespeed/lsapi_main.c   2011-07-12 04:42:00 UTC 
(rev 313157)
+++ php/php-src/trunk/sapi/litespeed/lsapi_main.c   2011-07-12 04:45:38 UTC 
(rev 313158)
@@ -495,6 +495,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