Merge branch 'PHP-5.5'

* PHP-5.5: Fixed issue #82 (allow comments in blacklist file, lines started with ";")
php · Apr 9, 2013 · 68d567d · 68d567d
2 parents 396b110 + d9c9e78
commit 68d567d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/ext/opcache/zend_accelerator_blacklist.c b/ext/opcache/zend_accelerator_blacklist.c
@@ -212,6 +212,11 @@ void zend_accel_blacklist_load(zend_blacklist *blacklist, char *filename)
 			continue;
 		}
 
+		/* skip comments */
+		if (pbuf[0]==';') {
+			continue;
+		}
+
 		path_dup = zend_strndup(pbuf, path_length);
 		expand_filepath(path_dup, real_path TSRMLS_CC);
 		path_length = strlen(real_path);