Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100644 586 lines (517 sloc) 15.908 kb
651e232 @zsuraski Testing 123
zsuraski authored
1 /*
2 +----------------------------------------------------------------------+
3893351 Update headers.
Sebastian Bergmann authored
3 | PHP Version 4 |
651e232 @zsuraski Testing 123
zsuraski authored
4 +----------------------------------------------------------------------+
2c5d4b8 Bump year.
Sebastian Bergmann authored
5 | Copyright (c) 1997-2003 The PHP Group |
651e232 @zsuraski Testing 123
zsuraski authored
6 +----------------------------------------------------------------------+
f68c7ff updating license information in the headers.
James Cox authored
7 | This source file is subject to version 3.0 of the PHP license, |
9d1817e Fix bug: #10323. Every value outputted is now escaped.
foobar authored
8 | that is bundled with this package in the file LICENSE, and is |
f68c7ff updating license information in the headers.
James Cox authored
9 | available through the world-wide-web at the following url: |
10 | http://www.php.net/license/3_0.txt. |
c5724cb @zsuraski License update
zsuraski authored
11 | If you did not receive a copy of the PHP license and are unable to |
9d1817e Fix bug: #10323. Every value outputted is now escaped.
foobar authored
12 | obtain it through the world-wide-web, please send a note to |
13 | license@php.net so we can mail you a copy immediately. |
651e232 @zsuraski Testing 123
zsuraski authored
14 +----------------------------------------------------------------------+
9d1817e Fix bug: #10323. Every value outputted is now escaped.
foobar authored
15 | Author: Zeev Suraski <zeev@zend.com> |
651e232 @zsuraski Testing 123
zsuraski authored
16 +----------------------------------------------------------------------+
17 */
18
46a7b0c @fmk Killing compiler warning on Win32
fmk authored
19 /* $Id$ */
651e232 @zsuraski Testing 123
zsuraski authored
20
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
21 /* Check CWD for php.ini */
22 #define INI_CHECK_CWD
23
aceaabc @zsuraski PHP 4.0
zsuraski authored
24 #include "php.h"
bc415d5 @zsuraski * Finalizing the PHP version of SAPI. Support POST and cookies among…
zsuraski authored
25 #include "ext/standard/info.h"
1fd0913 @zsuraski Initial steps to move the INI mechanism to the Zend engine
zsuraski authored
26 #include "zend_ini.h"
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
27 #include "php_ini.h"
28 #include "ext/standard/dl.h"
29 #include "zend_extensions.h"
9d1817e Fix bug: #10323. Every value outputted is now escaped.
foobar authored
30 #include "zend_highlight.h"
ab25640 Removed CWD from php_ini_search_path when using CLI SAPI.
Edin Kadribasic authored
31 #include "SAPI.h"
46a7b0c @fmk Killing compiler warning on Win32
fmk authored
32 #include "php_main.h"
ec11fe0 Fix the possible conflicts with other libs (like libc-client)
foobar authored
33 #include "php_scandir.h"
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
34
ec11fe0 Fix the possible conflicts with other libs (like libc-client)
foobar authored
35 #if HAVE_SCANDIR && HAVE_ALPHASORT && HAVE_DIRENT_H
36 #include <dirent.h>
82f6cef Fix broken build by adding scandir and alphasort for win32
Shane Caraveo authored
37 #endif
8d352d2 Fixed bug #21625 (When scanning a directory for ini files, do so in
Ilia Alshanetsky authored
38
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
39 #ifndef S_ISREG
40 #define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)
41 #endif
42
d294f46 @zsuraski - Remove the ini_extension_list global
zsuraski authored
43 typedef struct _php_extension_lists {
42c82bb Revert the last patches.
foobar authored
44 zend_llist engine;
45 zend_llist functions;
d294f46 @zsuraski - Remove the ini_extension_list global
zsuraski authored
46 } php_extension_lists;
58e24ac @zsuraski - Add PHP Modules workspace
zsuraski authored
47
9db5589 @zsuraski Recode delayed loading in a much simpler way (switched back to php_in…
zsuraski authored
48
49 /* True globals */
50 static HashTable configuration_hash;
51 PHPAPI char *php_ini_opened_path=NULL;
52 static php_extension_lists extension_lists;
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
53 PHPAPI char *php_ini_scanned_files=NULL;
9db5589 @zsuraski Recode delayed loading in a much simpler way (switched back to php_in…
zsuraski authored
54
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
55 /* {{{ php_ini_displayer_cb
56 */
1fd0913 @zsuraski Initial steps to move the INI mechanism to the Zend engine
zsuraski authored
57 static void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type)
bc415d5 @zsuraski * Finalizing the PHP version of SAPI. Support POST and cookies among…
zsuraski authored
58 {
42c82bb Revert the last patches.
foobar authored
59 if (ini_entry->displayer) {
60 ini_entry->displayer(ini_entry, type);
61 } else {
62 char *display_string;
63 uint display_string_length, esc_html=0;
64 TSRMLS_FETCH();
65
7e3b508 ws/style fixes
foobar authored
66 if (type == ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
42c82bb Revert the last patches.
foobar authored
67 if (ini_entry->orig_value && ini_entry->orig_value[0]) {
68 display_string = ini_entry->orig_value;
69 display_string_length = ini_entry->orig_value_length;
b5c97d8 fix phpinfo() & php -i
Marcus Boerger authored
70 esc_html = !sapi_module.phpinfo_as_text;
42c82bb Revert the last patches.
foobar authored
71 } else {
b5c97d8 fix phpinfo() & php -i
Marcus Boerger authored
72 if (!sapi_module.phpinfo_as_text) {
d6497fc - reenable "no value" output. thanks to sebastian for pointing that …
Jan Lehnardt authored
73 display_string = "<i>no value</i>";
7e3b508 ws/style fixes
foobar authored
74 display_string_length = sizeof("<i>no value</i>") - 1;
d6497fc - reenable "no value" output. thanks to sebastian for pointing that …
Jan Lehnardt authored
75 } else {
76 display_string = "no value";
7e3b508 ws/style fixes
foobar authored
77 display_string_length = sizeof("no value") - 1;
d6497fc - reenable "no value" output. thanks to sebastian for pointing that …
Jan Lehnardt authored
78 }
42c82bb Revert the last patches.
foobar authored
79 }
80 } else if (ini_entry->value && ini_entry->value[0]) {
81 display_string = ini_entry->value;
82 display_string_length = ini_entry->value_length;
b5c97d8 fix phpinfo() & php -i
Marcus Boerger authored
83 esc_html = !sapi_module.phpinfo_as_text;
42c82bb Revert the last patches.
foobar authored
84 } else {
b5c97d8 fix phpinfo() & php -i
Marcus Boerger authored
85 if (!sapi_module.phpinfo_as_text) {
d6497fc - reenable "no value" output. thanks to sebastian for pointing that …
Jan Lehnardt authored
86 display_string = "<i>no value</i>";
7e3b508 ws/style fixes
foobar authored
87 display_string_length = sizeof("<i>no value</i>") - 1;
d6497fc - reenable "no value" output. thanks to sebastian for pointing that …
Jan Lehnardt authored
88 } else {
89 display_string = "no value";
7e3b508 ws/style fixes
foobar authored
90 display_string_length = sizeof("no value") - 1;
d6497fc - reenable "no value" output. thanks to sebastian for pointing that …
Jan Lehnardt authored
91 }
42c82bb Revert the last patches.
foobar authored
92 }
7e3b508 ws/style fixes
foobar authored
93
94 if (esc_html) {
a769454 reenable php_html_puts
Sascha Schumann authored
95 php_html_puts(display_string, display_string_length TSRMLS_CC);
42c82bb Revert the last patches.
foobar authored
96 } else {
97 PHPWRITE(display_string, display_string_length);
98 }
99 }
bc415d5 @zsuraski * Finalizing the PHP version of SAPI. Support POST and cookies among…
zsuraski authored
100 }
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
101 /* }}} */
bc415d5 @zsuraski * Finalizing the PHP version of SAPI. Support POST and cookies among…
zsuraski authored
102
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
103 /* {{{ php_ini_displayer
104 */
d76cf1d @zsuraski More TSRMLS_FETCH work
zsuraski authored
105 static int php_ini_displayer(zend_ini_entry *ini_entry, int module_number TSRMLS_DC)
bc415d5 @zsuraski * Finalizing the PHP version of SAPI. Support POST and cookies among…
zsuraski authored
106 {
42c82bb Revert the last patches.
foobar authored
107 if (ini_entry->module_number != module_number) {
108 return 0;
109 }
b5c97d8 fix phpinfo() & php -i
Marcus Boerger authored
110 if (!sapi_module.phpinfo_as_text) {
14a6cc8 Change phpinfo() to use CSS styling instead of HTML code.
Colin Viebrock authored
111 PUTS("<tr>");
c7c275b fix phpinfo() output for better browser BC
Colin Viebrock authored
112 PUTS("<td class=\"e\">");
7e3b508 ws/style fixes
foobar authored
113 PHPWRITE(ini_entry->name, ini_entry->name_length - 1);
c7c275b fix phpinfo() output for better browser BC
Colin Viebrock authored
114 PUTS("</td><td class=\"v\">");
6676617 - add phpinfo() support for CLI.
Jan Lehnardt authored
115 php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ACTIVE);
c7c275b fix phpinfo() output for better browser BC
Colin Viebrock authored
116 PUTS("</td><td class=\"v\">");
6676617 - add phpinfo() support for CLI.
Jan Lehnardt authored
117 php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ORIG);
118 PUTS("</td></tr>\n");
119 } else {
7e3b508 ws/style fixes
foobar authored
120 PHPWRITE(ini_entry->name, ini_entry->name_length - 1);
6676617 - add phpinfo() support for CLI.
Jan Lehnardt authored
121 PUTS(" => ");
122 php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ACTIVE);
123 PUTS(" => ");
124 php_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ORIG);
125 PUTS("\n");
126 }
42c82bb Revert the last patches.
foobar authored
127 return 0;
bc415d5 @zsuraski * Finalizing the PHP version of SAPI. Support POST and cookies among…
zsuraski authored
128 }
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
129 /* }}} */
bc415d5 @zsuraski * Finalizing the PHP version of SAPI. Support POST and cookies among…
zsuraski authored
130
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
131 /* {{{ display_ini_entries
132 */
bc415d5 @zsuraski * Finalizing the PHP version of SAPI. Support POST and cookies among…
zsuraski authored
133 PHPAPI void display_ini_entries(zend_module_entry *module)
134 {
42c82bb Revert the last patches.
foobar authored
135 int module_number;
136 TSRMLS_FETCH();
137
138 if (module) {
139 module_number = module->module_number;
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
140 } else {
42c82bb Revert the last patches.
foobar authored
141 module_number = 0;
142 }
143 php_info_print_table_start();
144 php_info_print_table_header(3, "Directive", "Local Value", "Master Value");
2f4ed25 @zsuraski Compat fix
zsuraski authored
145 zend_hash_apply_with_argument(EG(ini_directives), (apply_func_arg_t) php_ini_displayer, (void *) (long) module_number TSRMLS_CC);
42c82bb Revert the last patches.
foobar authored
146 php_info_print_table_end();
bc415d5 @zsuraski * Finalizing the PHP version of SAPI. Support POST and cookies among…
zsuraski authored
147 }
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
148 /* }}} */
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
149
150 /* php.ini support */
151
152 #ifdef ZTS
153 # if (ZEND_DEBUG)
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
154 # define ZEND_EXTENSION_TOKEN "zend_extension_debug_ts"
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
155 # else
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
156 # define ZEND_EXTENSION_TOKEN "zend_extension_ts"
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
157 # endif
158 #else
159 # if (ZEND_DEBUG)
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
160 # define ZEND_EXTENSION_TOKEN "zend_extension_debug"
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
161 # else
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
162 # define ZEND_EXTENSION_TOKEN "zend_extension"
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
163 # endif
164 #endif
165
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
166 /* {{{ pvalue_config_destructor
167 */
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
168 static void pvalue_config_destructor(zval *pvalue)
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
169 {
7e3b508 ws/style fixes
foobar authored
170 if (Z_TYPE_P(pvalue) == IS_STRING && Z_STRVAL_P(pvalue) != empty_string) {
171 free(Z_STRVAL_P(pvalue));
172 }
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
173 }
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
174 /* }}} */
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
175
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
176 /* {{{ php_config_ini_parser_cb
177 */
9db5589 @zsuraski Recode delayed loading in a much simpler way (switched back to php_in…
zsuraski authored
178 static void php_config_ini_parser_cb(zval *arg1, zval *arg2, int callback_type, void *arg)
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
179 {
42c82bb Revert the last patches.
foobar authored
180 switch (callback_type) {
181 case ZEND_INI_PARSER_ENTRY: {
182 zval *entry;
183
184 if (!arg2) {
185 break;
186 }
187 if (!strcasecmp(Z_STRVAL_P(arg1), "extension")) { /* load function module */
188 zval copy;
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
189
42c82bb Revert the last patches.
foobar authored
190 copy = *arg2;
191 zval_copy_ctor(&copy);
192 copy.refcount = 0;
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
193 zend_llist_add_element(&extension_lists.functions, &copy);
42c82bb Revert the last patches.
foobar authored
194 } else if (!strcasecmp(Z_STRVAL_P(arg1), ZEND_EXTENSION_TOKEN)) { /* load Zend extension */
195 char *extension_name = estrndup(Z_STRVAL_P(arg2), Z_STRLEN_P(arg2));
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
196
42c82bb Revert the last patches.
foobar authored
197 zend_llist_add_element(&extension_lists.engine, &extension_name);
198 } else {
7e3b508 ws/style fixes
foobar authored
199 zend_hash_update(&configuration_hash, Z_STRVAL_P(arg1), Z_STRLEN_P(arg1) + 1, arg2, sizeof(zval), (void **) &entry);
42c82bb Revert the last patches.
foobar authored
200 Z_STRVAL_P(entry) = zend_strndup(Z_STRVAL_P(entry), Z_STRLEN_P(entry));
201 }
202 }
203 break;
b51b6f0 ini patch to allow 'entry[] = value' entries
Harald Radi authored
204
205 case ZEND_INI_PARSER_POP_ENTRY: {
206 zval *hash;
207 zval **find_hash;
208 zval *element;
209
210 if (!arg2) {
211 /* bare string - nothing to do */
212 break;
213 }
214
7e3b508 ws/style fixes
foobar authored
215 if (zend_hash_find(&configuration_hash, Z_STRVAL_P(arg1), Z_STRLEN_P(arg1) + 1, (void **) &find_hash) == FAILURE) {
b51b6f0 ini patch to allow 'entry[] = value' entries
Harald Radi authored
216 ALLOC_ZVAL(hash);
217 array_init(hash);
218
7e3b508 ws/style fixes
foobar authored
219 zend_hash_update(&configuration_hash, Z_STRVAL_P(arg1), Z_STRLEN_P(arg1) + 1, &hash, sizeof(zval *), NULL);
b51b6f0 ini patch to allow 'entry[] = value' entries
Harald Radi authored
220 } else {
221 hash = *find_hash;
222 }
223
224 ALLOC_ZVAL(element);
225 *element = *arg2;
226 zval_copy_ctor(element);
227 INIT_PZVAL(element);
228 add_next_index_zval(hash, element);
229 }
230 break;
231
42c82bb Revert the last patches.
foobar authored
232 case ZEND_INI_PARSER_SECTION:
233 break;
234 }
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
235 }
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
236 /* }}} */
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
237
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
238 /* {{{ php_load_function_extension_cb
239 */
d76cf1d @zsuraski More TSRMLS_FETCH work
zsuraski authored
240 static void php_load_function_extension_cb(void *arg TSRMLS_DC)
db0b8bc Defer loading of extensions until all configuration entries have been
Sascha Schumann authored
241 {
42c82bb Revert the last patches.
foobar authored
242 zval *extension = (zval *) arg;
243 zval zval;
db0b8bc Defer loading of extensions until all configuration entries have been
Sascha Schumann authored
244
42c82bb Revert the last patches.
foobar authored
245 php_dl(extension, MODULE_PERSISTENT, &zval TSRMLS_CC);
d294f46 @zsuraski - Remove the ini_extension_list global
zsuraski authored
246 }
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
247 /* }}} */
d294f46 @zsuraski - Remove the ini_extension_list global
zsuraski authored
248
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
249 /* {{{ php_load_zend_extension_cb
250 */
d76cf1d @zsuraski More TSRMLS_FETCH work
zsuraski authored
251 static void php_load_zend_extension_cb(void *arg TSRMLS_DC)
d294f46 @zsuraski - Remove the ini_extension_list global
zsuraski authored
252 {
42c82bb Revert the last patches.
foobar authored
253 zend_load_extension(*((char **) arg));
db0b8bc Defer loading of extensions until all configuration entries have been
Sascha Schumann authored
254 }
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
255 /* }}} */
db0b8bc Defer loading of extensions until all configuration entries have been
Sascha Schumann authored
256
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
257 /* {{{ php_init_config
258 */
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
259 int php_init_config()
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
260 {
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
261 char *env_location, *php_ini_search_path;
262 char *binary_location;
42c82bb Revert the last patches.
foobar authored
263 int safe_mode_state;
264 char *open_basedir;
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
265 int free_ini_search_path=0;
42c82bb Revert the last patches.
foobar authored
266 zend_file_handle fh;
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
267 struct stat sb;
268 char ini_file[MAXPATHLEN];
269 char *p;
270 zend_llist scanned_ini_list;
271 int l, total_l=0;
272 zend_llist_element *element;
42c82bb Revert the last patches.
foobar authored
273 TSRMLS_FETCH();
274
7e3b508 ws/style fixes
foobar authored
275 if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t) pvalue_config_destructor, 1) == FAILURE) {
42c82bb Revert the last patches.
foobar authored
276 return FAILURE;
277 }
278
63739c7 give sapi modules the possibility to overwrite default ini settings
Marcus Boerger authored
279 if (sapi_module.ini_defaults) {
280 sapi_module.ini_defaults(&configuration_hash);
281 }
282
42c82bb Revert the last patches.
foobar authored
283 zend_llist_init(&extension_lists.engine, sizeof(char *), (llist_dtor_func_t) free_estring, 1);
284 zend_llist_init(&extension_lists.functions, sizeof(zval), (llist_dtor_func_t) ZVAL_DESTRUCTOR, 1);
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
285 zend_llist_init(&scanned_ini_list, sizeof(char *), (llist_dtor_func_t) free_estring, 1);
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
286
42c82bb Revert the last patches.
foobar authored
287 safe_mode_state = PG(safe_mode);
288 open_basedir = PG(open_basedir);
289
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
290 env_location = getenv("PHPRC");
291 if (!env_location) {
7e3b508 ws/style fixes
foobar authored
292 env_location = "";
6de4f3a Add check for php.ini in same directory as php.exe (or equivalent exe…
Preston L. Bannister authored
293 }
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
294 if (sapi_module.php_ini_path_override) {
295 php_ini_search_path = sapi_module.php_ini_path_override;
296 free_ini_search_path = 0;
297 } else {
298 char *default_location;
e1658ed Minor cleanups to path building and php*.ini search logic.
Preston L. Bannister authored
299 static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 };
6de4f3a Add check for php.ini in same directory as php.exe (or equivalent exe…
Preston L. Bannister authored
300
7e3b508 ws/style fixes
foobar authored
301 php_ini_search_path = (char *) emalloc(MAXPATHLEN * 3 + strlen(env_location) + 3 + 1);
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
302 free_ini_search_path = 1;
303 php_ini_search_path[0] = 0;
6de4f3a Add check for php.ini in same directory as php.exe (or equivalent exe…
Preston L. Bannister authored
304
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
305 /*
306 * Prepare search path
307 */
42c82bb Revert the last patches.
foobar authored
308
2629613 Fix PHPRC overriding other ini files. This is how PHPRC worked prior to
Shane Caraveo authored
309 /* Add environment location */
310 if (env_location[0]) {
311 if (*php_ini_search_path) {
312 strcat(php_ini_search_path, paths_separator);
313 }
314 strcat(php_ini_search_path, env_location);
315 }
316
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
317 /* Add cwd */
6de4f3a Add check for php.ini in same directory as php.exe (or equivalent exe…
Preston L. Bannister authored
318 #ifdef INI_CHECK_CWD
7e3b508 ws/style fixes
foobar authored
319 if (strcmp(sapi_module.name, "cli") != 0) {
e1658ed Minor cleanups to path building and php*.ini search logic.
Preston L. Bannister authored
320 if (*php_ini_search_path) {
321 strcat(php_ini_search_path, paths_separator);
322 }
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
323 strcat(php_ini_search_path, ".");
324 }
6de4f3a Add check for php.ini in same directory as php.exe (or equivalent exe…
Preston L. Bannister authored
325 #endif
42c82bb Revert the last patches.
foobar authored
326
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
327 /* Add binary directory */
6de4f3a Add check for php.ini in same directory as php.exe (or equivalent exe…
Preston L. Bannister authored
328 #ifdef PHP_WIN32
b9fd107 @zsuraski Use portable #define
zsuraski authored
329 binary_location = (char *) emalloc(MAXPATHLEN);
7e3b508 ws/style fixes
foobar authored
330 if (GetModuleFileName(0, binary_location, MAXPATHLEN) == 0) {
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
331 efree(binary_location);
332 binary_location = NULL;
42c82bb Revert the last patches.
foobar authored
333 }
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
334 #else
335 if (sapi_module.executable_location) {
336 binary_location = estrdup(sapi_module.executable_location);
337 } else {
338 binary_location = NULL;
6de4f3a Add check for php.ini in same directory as php.exe (or equivalent exe…
Preston L. Bannister authored
339 }
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
340 #endif
341 if (binary_location) {
342 char *separator_location = strrchr(binary_location, DEFAULT_SLASH);
343
344 if (separator_location) {
345 *(separator_location+1) = 0;
346 }
e1658ed Minor cleanups to path building and php*.ini search logic.
Preston L. Bannister authored
347 if (*php_ini_search_path) {
348 strcat(php_ini_search_path, paths_separator);
349 }
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
350 strcat(php_ini_search_path, binary_location);
351 efree(binary_location);
352 }
353
354 /* Add default location */
355 #ifdef PHP_WIN32
7e3b508 ws/style fixes
foobar authored
356 default_location = (char *) emalloc(MAXPATHLEN + 1);
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
357
e1658ed Minor cleanups to path building and php*.ini search logic.
Preston L. Bannister authored
358 if (0 < GetWindowsDirectory(default_location, MAXPATHLEN)) {
359 if (*php_ini_search_path) {
360 strcat(php_ini_search_path, paths_separator);
361 }
362 strcat(php_ini_search_path, default_location);
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
363 }
364 efree(default_location);
6de4f3a Add check for php.ini in same directory as php.exe (or equivalent exe…
Preston L. Bannister authored
365 #else
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
366 default_location = PHP_CONFIG_FILE_PATH;
e1658ed Minor cleanups to path building and php*.ini search logic.
Preston L. Bannister authored
367 if (*php_ini_search_path) {
368 strcat(php_ini_search_path, paths_separator);
369 }
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
370 strcat(php_ini_search_path, default_location);
6de4f3a Add check for php.ini in same directory as php.exe (or equivalent exe…
Preston L. Bannister authored
371 #endif
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
372 }
6de4f3a Add check for php.ini in same directory as php.exe (or equivalent exe…
Preston L. Bannister authored
373
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
374 PG(safe_mode) = 0;
375 PG(open_basedir) = NULL;
376
e52aac9 @wez Implement simple stream support in the ZE scanners.
wez authored
377 memset(&fh, 0, sizeof(fh));
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
378 /* Check if php_ini_path_override is a file */
cecb9df Implemented -n switch to skip parsing ini at startup as suggested by …
Marcus Boerger authored
379 if (!sapi_module.php_ini_ignore) {
380 if (sapi_module.php_ini_path_override && sapi_module.php_ini_path_override[0]) {
381 struct stat statbuf;
382
383 if (!VCWD_STAT(sapi_module.php_ini_path_override, &statbuf)) {
384 if (!((statbuf.st_mode & S_IFMT) == S_IFDIR)) {
385 fh.handle.fp = VCWD_FOPEN(sapi_module.php_ini_path_override, "r");
386 fh.filename = sapi_module.php_ini_path_override;
387 }
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
388 }
389 }
cecb9df Implemented -n switch to skip parsing ini at startup as suggested by …
Marcus Boerger authored
390 /* Search php-%sapi-module-name%.ini file in search path */
391 if (!fh.handle.fp) {
392 const char *fmt = "php-%s.ini";
7e3b508 ws/style fixes
foobar authored
393 char *ini_fname = emalloc(strlen(fmt) + strlen(sapi_module.name));
cecb9df Implemented -n switch to skip parsing ini at startup as suggested by …
Marcus Boerger authored
394 sprintf(ini_fname, fmt, sapi_module.name);
395 fh.handle.fp = php_fopen_with_path(ini_fname, "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
396 efree(ini_fname);
397 if (fh.handle.fp) {
398 fh.filename = php_ini_opened_path;
399 }
e1658ed Minor cleanups to path building and php*.ini search logic.
Preston L. Bannister authored
400 }
cecb9df Implemented -n switch to skip parsing ini at startup as suggested by …
Marcus Boerger authored
401 /* Search php.ini file in search path */
402 if (!fh.handle.fp) {
403 fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
404 if (fh.handle.fp) {
405 fh.filename = php_ini_opened_path;
406 }
8f94a8a First try to open php-SAPI.ini and if it fails fall back to regular
Edin Kadribasic authored
407 }
751cd67 get_cfg_var("get_file_path") didn't work correctly when an alternative
Sander Roobol authored
408 }
7e3b508 ws/style fixes
foobar authored
409
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
410 if (free_ini_search_path) {
411 efree(php_ini_search_path);
412 }
7e3b508 ws/style fixes
foobar authored
413
42c82bb Revert the last patches.
foobar authored
414 PG(safe_mode) = safe_mode_state;
415 PG(open_basedir) = open_basedir;
416
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
417 if (fh.handle.fp) {
418 fh.type = ZEND_HANDLE_FP;
42c82bb Revert the last patches.
foobar authored
419
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
420 zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists);
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
421
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
422 {
423 zval tmp;
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
424
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
425 Z_STRLEN(tmp) = strlen(fh.filename);
426 Z_STRVAL(tmp) = zend_strndup(fh.filename, Z_STRLEN(tmp));
427 Z_TYPE(tmp) = IS_STRING;
428 zend_hash_update(&configuration_hash, "cfg_file_path", sizeof("cfg_file_path"), (void *) &tmp, sizeof(zval), NULL);
7e3b508 ws/style fixes
foobar authored
429 if (php_ini_opened_path) {
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
430 efree(php_ini_opened_path);
7e3b508 ws/style fixes
foobar authored
431 }
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
432 php_ini_opened_path = zend_strndup(Z_STRVAL(tmp), Z_STRLEN(tmp));
433 }
cecb9df Implemented -n switch to skip parsing ini at startup as suggested by …
Marcus Boerger authored
434 }
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
435
436 /* If the config_file_scan_dir is set at compile-time, go and scan this directory and
437 * parse any .ini files found in this directory. */
173b949 Fixed bug: #22011 (-n must ignore all ini files)
foobar authored
438 if (!sapi_module.php_ini_ignore && strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
8d352d2 Fixed bug #21625 (When scanning a directory for ini files, do so in
Ilia Alshanetsky authored
439 struct dirent **namelist;
440 int ndir, i;
441
ec11fe0 Fix the possible conflicts with other libs (like libc-client)
foobar authored
442 if ((ndir = php_scandir(PHP_CONFIG_FILE_SCAN_DIR, &namelist, 0, php_alphasort)) > 0) {
8d352d2 Fixed bug #21625 (When scanning a directory for ini files, do so in
Ilia Alshanetsky authored
443 for (i = 0; i < ndir; i++) {
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
444 /* check for a .ini extension */
8d352d2 Fixed bug #21625 (When scanning a directory for ini files, do so in
Ilia Alshanetsky authored
445 if (!(p = strrchr(namelist[i]->d_name, '.')) || (p && strcmp(p, ".ini"))) {
446 free(namelist[i]);
d454bec - Whitespace
Derick Rethans authored
447 continue;
448 }
8d352d2 Fixed bug #21625 (When scanning a directory for ini files, do so in
Ilia Alshanetsky authored
449 snprintf(ini_file, MAXPATHLEN, "%s%c%s", PHP_CONFIG_FILE_SCAN_DIR, DEFAULT_SLASH, namelist[i]->d_name);
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
450 if (VCWD_STAT(ini_file, &sb) == 0) {
451 if (S_ISREG(sb.st_mode)) {
452 if ((fh.handle.fp = VCWD_FOPEN(ini_file, "r"))) {
453 fh.filename = ini_file;
1ad304c @rlerdorf MFB config-file-scan-dir crash fix
rlerdorf authored
454 fh.type = ZEND_HANDLE_FP;
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
455 zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists);
456 /* Here, add it to the list of ini files read */
457 l = strlen(ini_file);
7e3b508 ws/style fixes
foobar authored
458 total_l += l + 2;
459 p = estrndup(ini_file, l);
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
460 zend_llist_add_element(&scanned_ini_list, &p);
461 }
462 }
463 }
8d352d2 Fixed bug #21625 (When scanning a directory for ini files, do so in
Ilia Alshanetsky authored
464 free(namelist[i]);
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
465 }
8d352d2 Fixed bug #21625 (When scanning a directory for ini files, do so in
Ilia Alshanetsky authored
466 free(namelist);
467
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
468 /*
469 * Don't need an extra byte for the \0 in this malloc as the last
470 * element will not get a trailing , which gives us the byte for the \0
471 */
7e3b508 ws/style fixes
foobar authored
472 php_ini_scanned_files = (char *) malloc(total_l);
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
473 *php_ini_scanned_files = '\0';
7e3b508 ws/style fixes
foobar authored
474 for (element = scanned_ini_list.head; element; element = element->next) {
475 strcat(php_ini_scanned_files, *(char **)element->data);
476 strcat(php_ini_scanned_files, element->next ? ",\n" : "\n");
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
477 }
478 zend_llist_destroy(&scanned_ini_list);
479 }
42c82bb Revert the last patches.
foobar authored
480 }
481 return SUCCESS;
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
482 }
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
483 /* }}} */
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
484
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
485 /* {{{ php_shutdown_config
486 */
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
487 int php_shutdown_config(void)
488 {
42c82bb Revert the last patches.
foobar authored
489 zend_hash_destroy(&configuration_hash);
490 if (php_ini_opened_path) {
491 free(php_ini_opened_path);
492 }
989a61e @rlerdorf As discussed, add --with-config-file-scan-dir compile-time switch def…
rlerdorf authored
493 if (php_ini_scanned_files) {
494 free(php_ini_scanned_files);
495 }
42c82bb Revert the last patches.
foobar authored
496 return SUCCESS;
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
497 }
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
498 /* }}} */
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
499
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
500 /* {{{ php_ini_delayed_modules_startup
501 */
d76cf1d @zsuraski More TSRMLS_FETCH work
zsuraski authored
502 void php_ini_delayed_modules_startup(TSRMLS_D)
9db5589 @zsuraski Recode delayed loading in a much simpler way (switched back to php_in…
zsuraski authored
503 {
42c82bb Revert the last patches.
foobar authored
504 zend_llist_apply(&extension_lists.engine, php_load_zend_extension_cb TSRMLS_CC);
505 zend_llist_apply(&extension_lists.functions, php_load_function_extension_cb TSRMLS_CC);
9db5589 @zsuraski Recode delayed loading in a much simpler way (switched back to php_in…
zsuraski authored
506
42c82bb Revert the last patches.
foobar authored
507 zend_llist_destroy(&extension_lists.engine);
508 zend_llist_destroy(&extension_lists.functions);
9db5589 @zsuraski Recode delayed loading in a much simpler way (switched back to php_in…
zsuraski authored
509 }
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
510 /* }}} */
9db5589 @zsuraski Recode delayed loading in a much simpler way (switched back to php_in…
zsuraski authored
511
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
512 /* {{{ cfg_get_entry
513 */
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
514 zval *cfg_get_entry(char *name, uint name_length)
515 {
42c82bb Revert the last patches.
foobar authored
516 zval *tmp;
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
517
7e3b508 ws/style fixes
foobar authored
518 if (zend_hash_find(&configuration_hash, name, name_length, (void **) &tmp) == SUCCESS) {
42c82bb Revert the last patches.
foobar authored
519 return tmp;
520 } else {
521 return NULL;
522 }
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
523 }
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
524 /* }}} */
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
525
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
526 /* {{{ cfg_get_long
527 */
1159c84 @zsuraski - TSRMLS_FETCH work
zsuraski authored
528 PHPAPI int cfg_get_long(char *varname, long *result)
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
529 {
42c82bb Revert the last patches.
foobar authored
530 zval *tmp, var;
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
531
7e3b508 ws/style fixes
foobar authored
532 if (zend_hash_find(&configuration_hash, varname, strlen(varname) + 1, (void **) &tmp) == FAILURE) {
533 *result = (long) NULL;
42c82bb Revert the last patches.
foobar authored
534 return FAILURE;
535 }
536 var = *tmp;
537 zval_copy_ctor(&var);
538 convert_to_long(&var);
539 *result = Z_LVAL(var);
540 return SUCCESS;
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
541 }
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
542 /* }}} */
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
543
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
544 /* {{{ cfg_get_double
545 */
1159c84 @zsuraski - TSRMLS_FETCH work
zsuraski authored
546 PHPAPI int cfg_get_double(char *varname, double *result)
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
547 {
42c82bb Revert the last patches.
foobar authored
548 zval *tmp, var;
5af649e @zsuraski Revert to the old php_ini.c, and reimplement the binary-path searching.
zsuraski authored
549
7e3b508 ws/style fixes
foobar authored
550 if (zend_hash_find(&configuration_hash, varname, strlen(varname) + 1, (void **) &tmp) == FAILURE) {
551 *result = (double) 0;
42c82bb Revert the last patches.
foobar authored
552 return FAILURE;
553 }
554 var = *tmp;
555 zval_copy_ctor(&var);
556 convert_to_double(&var);
557 *result = Z_DVAL(var);
558 return SUCCESS;
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
559 }
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
560 /* }}} */
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
561
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
562 /* {{{ cfg_get_string
563 */
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
564 PHPAPI int cfg_get_string(char *varname, char **result)
565 {
42c82bb Revert the last patches.
foobar authored
566 zval *tmp;
567
7e3b508 ws/style fixes
foobar authored
568 if (zend_hash_find(&configuration_hash, varname, strlen(varname)+1, (void **) &tmp) == FAILURE) {
569 *result = NULL;
42c82bb Revert the last patches.
foobar authored
570 return FAILURE;
571 }
572 *result = Z_STRVAL_P(tmp);
573 return SUCCESS;
78194a4 @zsuraski - Complete the move to the new INI parser. (Side effect: at last, p…
zsuraski authored
574 }
81e2cf0 @rlerdorf Fix folding and clean up some extensions
rlerdorf authored
575 /* }}} */
2cf1b8d * expanded the following constants and made them available in PHP:
Stig Bakken authored
576
577 /*
578 * Local variables:
579 * tab-width: 4
580 * c-basic-offset: 4
581 * indent-tabs-mode: t
582 * End:
78747bd - Don't wrap lines... this is annoying while coding.
Derick Rethans authored
583 * vim600: sw=4 ts=4 fdm=marker
584 * vim<600: sw=4 ts=4
2cf1b8d * expanded the following constants and made them available in PHP:
Stig Bakken authored
585 */
Something went wrong with that request. Please try again.