--- embedaddon/php/ext/standard/dl.c	2012/02/21 23:48:02	1.1.1.1
+++ embedaddon/php/ext/standard/dl.c	2014/06/15 20:03:57	1.1.1.4
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2012 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: dl.c,v 1.1.1.1 2012/02/21 23:48:02 misho Exp $ */
+/* $Id: dl.c,v 1.1.1.4 2014/06/15 20:03:57 misho Exp $ */
 
 #include "php.h"
 #include "dl.h"
@@ -63,9 +63,6 @@ PHPAPI PHP_FUNCTION(dl)
 	if (!PG(enable_dl)) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Dynamically loaded extensions aren't enabled");
 		RETURN_FALSE;
-	} else if (PG(safe_mode)) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Dynamically loaded extensions aren't allowed when running in Safe Mode");
-		RETURN_FALSE;
 	}
 
 	if (filename_len >= MAXPATHLEN) {
@@ -254,23 +251,6 @@ PHPAPI int php_load_extension(char *filename, int type
 			return FAILURE;
 		}
 	}
-
-#if SUHOSIN_PATCH
-	if (strncmp("suhosin", module_entry->name, sizeof("suhosin")-1) == 0) {
-		void *log_func;
-		/* sucessfully loaded suhosin extension, now check for logging function replacement */
-		log_func = (void *) DL_FETCH_SYMBOL(handle, "suhosin_log");
-		if (log_func == NULL) {
-			log_func = (void *) DL_FETCH_SYMBOL(handle, "_suhosin_log");
-		}
-		if (log_func != NULL) {
-			zend_suhosin_log = log_func;
-		} else {
-                        zend_suhosin_log(S_MISC, "could not replace logging function");
-		}
-	}
-#endif	
-
 	return SUCCESS;
 }
 /* }}} */