[PHP-CVS] cvs: php-src(PHP_5_3) /ext/enchant enchant.c

[Felipe Pena]

felipe          Thu Jan 29 00:15:49 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/enchant        enchant.c 
  Log:
  - Re-added safe mode check
  
http://cvs.php.net/viewvc.cgi/php-src/ext/enchant/enchant.c?r1=1.19&r2=1.19.2.1&diff_format=u
Index: php-src/ext/enchant/enchant.c
diff -u php-src/ext/enchant/enchant.c:1.19 
php-src/ext/enchant/enchant.c:1.19.2.1
--- php-src/ext/enchant/enchant.c:1.19  Wed Jan 28 22:43:25 2009
+++ php-src/ext/enchant/enchant.c       Thu Jan 29 00:15:48 2009
@@ -16,13 +16,13 @@
   |         Ilia Alshanetsky <i...@prohost.org>                          |
   +----------------------------------------------------------------------+
 
-  $Id: enchant.c,v 1.19 2009/01/28 22:43:25 felipe Exp $
+  $Id: enchant.c,v 1.19.2.1 2009/01/29 00:15:48 felipe Exp $
 */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
 #include <glib/glist.h>
 #include <glib/ghash.h>
 #endif
@@ -263,7 +263,7 @@
        php_info_print_table_start();
        php_info_print_table_header(2, "enchant support", "enabled");
        php_info_print_table_row(2, "Version", PHP_ENCHANT_VERSION);
-       php_info_print_table_row(2, "Revision", "$Revision: 1.19 $");
+       php_info_print_table_row(2, "Revision", "$Revision: 1.19.2.1 $");
        php_info_print_table_end();
 
        php_info_print_table_start();
@@ -437,7 +437,7 @@
                RETURN_FALSE;
        }
 
-       if (php_check_open_basedir(pwl TSRMLS_CC)) {
+       if ((PG(safe_mode) && (!php_checkuid(pwl, NULL, 
CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(pwl TSRMLS_CC)) {
                RETURN_FALSE;
        }
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php