com php-src: Fixed php-5.2 support: ext/opcache/zend_accelera tor_blacklist.c

From: Date: Tue, 30 Jul 2013 23:22:34 +0000
Subject: com php-src: Fixed php-5.2 support: ext/opcache/zend_accelera tor_blacklist.c
Groups: php.cvs 
Request: Send a blank email to [email protected] to get a copy of this message 
Commit:    f3aca8bc4dd2556bb1db476d94e01a2ced000f39
Author:    Dmitry Stogov <[email protected]>         Wed, 31 Jul 2013 03:22:34 +0400
Parents:   2bd23530d83c09add1d4fd36cdea77f7d3746504
Branches:  master

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

Log:
Fixed php-5.2 support

Changed paths:
  M  ext/opcache/zend_accelerator_blacklist.c


Diff:
diff --git a/ext/opcache/zend_accelerator_blacklist.c b/ext/opcache/zend_accelerator_blacklist.c
index b11d41e..da83cfd 100644
--- a/ext/opcache/zend_accelerator_blacklist.c
+++ b/ext/opcache/zend_accelerator_blacklist.c
@@ -30,6 +30,10 @@
 # include "main/php_regex.h"
 #endif
 
+#if ZEND_EXTENSION_API_NO < PHP_5_3_X_API_NO
+# include "ext/standard/php_string.h"
+#endif
+
 #ifdef ZEND_WIN32
 # define REGEX_MODE (REG_EXTENDED|REG_NOSUB|REG_ICASE)
 #else
@@ -252,7 +256,11 @@ void zend_accel_blacklist_load(zend_blacklist *blacklist, char *filename)
 	zend_accel_error(ACCEL_LOG_DEBUG,"Loading blacklist file:  '%s'", filename);
 
 	if (VCWD_REALPATH(filename, buf)) {
+#if ZEND_EXTENSION_API_NO < PHP_5_3_X_API_NO
+		blacklist_path_length = php_dirname(buf, strlen(buf));
+#else
 		blacklist_path_length = zend_dirname(buf, strlen(buf));
+#endif
 		blacklist_path = zend_strndup(buf, blacklist_path_length);
 	}

Thread (1 message)

  • Dmitry Stogov
« previous php.cvs (#72778) next »