Commit:    f49b27e166739946c255924d6609d0a40a70783b
Author:    Dmitry Stogov <dmi...@zend.com>         Mon, 24 Jun 2013 11:59:50 
+0400
Parents:   ae5a09b47d018bd80ae0a544c892dbf0b61e5be1
Branches:  PHP-5.5 master

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

Log:
OPcache must be compatible with LiteSpeed SAPI

Changed paths:
  M  NEWS
  M  ext/opcache/ZendAccelerator.c


Diff:
diff --git a/NEWS b/NEWS
index 75380b0..2d35499 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@ PHP                                                             
           NEWS
   . Fixed bug #65088 (Generated configure script is malformed on OpenBSD).
     (Adam)
 
+OPcache
+  . OPcache must be compatible with LiteSpeed SAPI (Dmitry)
+
 - CLI server:
   . Fixed bug #65066 (Cli server not responsive when responding with 422 http
     status code). (Adam)
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 875a472..4d98397 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2375,6 +2375,7 @@ static inline int accel_find_sapi(TSRMLS_D)
                "isapi",
                "apache2filter",
                "apache2handler",
+               "litespeed",
                NULL
        };
        const char **sapi_name;
@@ -2499,7 +2500,7 @@ static int accel_startup(zend_extension *extension)
                    strcmp(sapi_module.name, "cli") == 0) {
                        zps_startup_failure("Opcode Caching is disabled for 
CLI", NULL, accelerator_remove_cb TSRMLS_CC);
                } else {
-                       zps_startup_failure("Opcode Caching is only supported 
in Apache, ISAPI, FPM and FastCGI SAPIs", NULL, accelerator_remove_cb 
TSRMLS_CC);
+                       zps_startup_failure("Opcode Caching is only supported 
in Apache, ISAPI, FPM, FastCGI and LiteSpeed SAPIs", NULL, 
accelerator_remove_cb TSRMLS_CC);
                }
                return SUCCESS;
        }


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

Reply via email to