summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2013-06-24 11:59:50 +0400
committerDmitry Stogov <dmitry@zend.com>2013-06-24 11:59:50 +0400
commitf49b27e166739946c255924d6609d0a40a70783b (patch)
tree6688b895a78a870cc5385f6b4c7e7a996f7267e9
parentae5a09b47d018bd80ae0a544c892dbf0b61e5be1 (diff)
downloadphp-git-f49b27e166739946c255924d6609d0a40a70783b.tar.gz
OPcache must be compatible with LiteSpeed SAPI
-rw-r--r--NEWS3
-rw-r--r--ext/opcache/ZendAccelerator.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 75380b02d4..2d354998c3 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 875a4727a8..4d983976bb 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;
}