[BACK]Return to dl.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / ext / standard

Diff for /embedaddon/php/ext/standard/dl.c between versions 1.1 and 1.1.1.3

version 1.1, 2012/02/21 23:48:02 version 1.1.1.3, 2013/07/22 01:32:05
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | PHP Version 5                                                        |     | PHP Version 5                                                        |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1997-2012 The PHP Group                                |   | Copyright (c) 1997-2013 The PHP Group                                |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |     | 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        |     | that is bundled with this package in the file LICENSE, and is        |
Line 63  PHPAPI PHP_FUNCTION(dl) Line 63  PHPAPI PHP_FUNCTION(dl)
         if (!PG(enable_dl)) {          if (!PG(enable_dl)) {
                 php_error_docref(NULL TSRMLS_CC, E_WARNING, "Dynamically loaded extensions aren't enabled");                  php_error_docref(NULL TSRMLS_CC, E_WARNING, "Dynamically loaded extensions aren't enabled");
                 RETURN_FALSE;                  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) {          if (filename_len >= MAXPATHLEN) {
Line 254  PHPAPI int php_load_extension(char *filename, int type Line 251  PHPAPI int php_load_extension(char *filename, int type
                         return FAILURE;                          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;          return SUCCESS;
 }  }
 /* }}} */  /* }}} */
Removed from v.1.1  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>