Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  added sapi check for dl() test

Author: weltling

ext/standard/tests/general_functions/dl-cve-2007-4887.phpt

@@ -1,5 +1,12 @@
 --TEST--
 dl() filename length checks (CVE-2007-4887)
+--SKIPIF--
+<?php
+$enabled_sapi = array('cgi-fcgi', 'cli', 'embed', 'fpm');
+if (!in_array(php_sapi_name(), $enabled_sapi)) {
+	die('skip dl() is not enabled for ' . php_sapi_name());
+}
+?>
 --INI--
 enable_dl=1
 --FILE--