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

Diff for /embedaddon/php/main/php_ini.c between versions 1.1.1.2 and 1.1.1.4

version 1.1.1.2, 2012/05/29 12:34:35 version 1.1.1.4, 2013/10/14 08:02:43
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 290  static void php_ini_parser_cb(zval *arg1, zval *arg2,  Line 290  static void php_ini_parser_cb(zval *arg1, zval *arg2, 
                                         is_special_section = 1;                                          is_special_section = 1;
                                         has_per_dir_config = 1;                                          has_per_dir_config = 1;
   
                                        /* make the path lowercase on Windows, for case insensitivty. Does nothign for other platforms */                                        /* make the path lowercase on Windows, for case insensitivity. Does nothing for other platforms */
                                         TRANSLATE_SLASHES_LOWER(key);                                          TRANSLATE_SLASHES_LOWER(key);
   
                                 /* HOST sections */                                  /* HOST sections */
Line 785  PHPAPI void php_ini_activate_per_dir_config(char *path Line 785  PHPAPI void php_ini_activate_per_dir_config(char *path
         char path_bak[MAXPATHLEN];          char path_bak[MAXPATHLEN];
 #endif  #endif
   
   #if PHP_WIN32
           /* MAX_PATH is \0-terminated, path_len == MAXPATHLEN would overrun path_bak */
           if (path_len >= MAXPATHLEN) {
   #else
         if (path_len > MAXPATHLEN) {          if (path_len > MAXPATHLEN) {
   #endif
                 return;                  return;
         }          }
   
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.4

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