Commit Graph

125 Commits

Author SHA1 Message Date
Andi Gutmans
dbeb4158d2 - A belated happy holidays and PHP 5 2004-01-08 08:18:22 +00:00
Wez Furlong
fcdda2e8f8 Fix a problem resolving the php.ini path under win32 terminal services environment.
Remove config-file-path option from configure under win32; it is not used except to display what might have been chosen, so lets default to the getenv() thingy.
2003-12-06 16:04:34 +00:00
Ilia Alshanetsky
24793840b2 Fixed unused variable warning on *nix. 2003-10-20 02:21:25 +00:00
Stanislav Malyshev
06aae4bd9c Enable setting php.ini path via the registry 2003-10-19 10:39:27 +00:00
James Cox
f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +00:00
Marcus Boerger
b5c97d8dab fix phpinfo() & php -i 2003-03-29 21:25:03 +00:00
Shane Caraveo
26296130ad Fix PHPRC overriding other ini files. This is how PHPRC worked prior to
4.3.x, and is usefull for applications that execute PHP and want to
emulate CGI and define alternate INI files (ie. cannot use -c).
2003-03-22 18:54:35 +00:00
Marcus Boerger
63739c7db8 give sapi modules the possibility to overwrite default ini settings 2003-03-18 15:53:33 +00:00
Rasmus Lerdorf
1ad304c2c5 MFB config-file-scan-dir crash fix 2003-02-28 20:48:38 +00:00
foobar
7e3b50896c ws/style fixes 2003-02-19 09:38:11 +00:00
foobar
ec11fe04e9 Fix the possible conflicts with other libs (like libc-client) 2003-02-19 09:25:16 +00:00
Wez Furlong
e52aac940f Implement simple stream support in the ZE scanners. 2003-02-18 09:37:54 +00:00
foobar
173b9493e2 Fixed bug: #22011 (-n must ignore all ini files) 2003-02-03 12:25:28 +00:00
Ilia Alshanetsky
d59d500af7 Moved the scandir code into it's own files so that it can be used by other
OSes where libc does not have a native scandir() implementation.
2003-01-27 20:39:31 +00:00
Shane Caraveo
82f6cef483 Fix broken build by adding scandir and alphasort for win32 2003-01-26 01:39:18 +00:00
Ilia Alshanetsky
8d352d2dd6 Fixed bug #21625 (When scanning a directory for ini files, do so in
alphabetical order. This gives a user a way to control the order in which
the ini files are loaded).
Fixed a bug that would make the code try to read files without an extension
as ini files.
2003-01-25 21:13:00 +00:00
Harald Radi
b51b6f0fbf ini patch to allow 'entry[] = value' entries 2003-01-19 12:18:46 +00:00
Sebastian Bergmann
2c5d4b8c23 Bump year. 2002-12-31 15:59:15 +00:00
Derick Rethans
d454becda8 - Whitespace 2002-12-30 15:03:50 +00:00
Marcus Boerger
cecb9dfc79 Implemented -n switch to skip parsing ini at startup as suggested by Wez.
#The switch 'n' was planned to be used for beautifying....delete n to make
#clear these functions do not have a switch yet.
2002-11-12 20:56:47 +00:00
Sascha Schumann
2909e5c9c9 centralize #include "build-defs.h" and drop (sometimes inconsistent) other
instances
2002-10-24 13:15:49 +00:00
Rasmus Lerdorf
989a61ed98 As discussed, add --with-config-file-scan-dir compile-time switch defining
a directory which will be scanned for *.ini files after the main php.ini
file has been parsed.  This makes it much easier to automatically deploy
a modular PHP since adding extensions which have their own ini switches can
now be done by simply dropping a foo.ini file in the right directory and
restarting.  A list of parsed ini files is maintained and shown on the
phpinfo page.
2002-10-04 04:47:35 +00:00
Colin Viebrock
c7c275b741 fix phpinfo() output for better browser BC 2002-09-26 17:54:54 +00:00
Zeev Suraski
2f4ed252de Compat fix 2002-09-23 12:10:07 +00:00
Colin Viebrock
14a6cc8847 Change phpinfo() to use CSS styling instead of HTML code.
It doesn't render as nicely as it used to on older browsers, but it
does result in smaller files, and opens the door to using your own CSS
to style it differently.

There is a patch to Zend/zend_ini.c, but I don't have enough Karma, so
Derick has the patch.
2002-09-19 21:57:25 +00:00
Anantha Kesari H Y
3798528753 NetWare related changes/modifications 2002-09-09 11:43:50 +00:00
Jan Lehnardt
d6497fc96e - reenable "no value" output. thanks to sebastian for pointing that out. 2002-08-29 10:24:02 +00:00
Jan Lehnardt
6676617693 - add phpinfo() support for CLI.
@phpinfo() support for CLI (jan)
2002-08-28 22:31:51 +00:00
Preston L. Bannister
e1658ed6c4 Minor cleanups to path building and php*.ini search logic.
Made path_seperator string static (which solves the lookup problems Sebastian saw).
2002-08-12 05:37:03 +00:00
Edin Kadribasic
8f94a8a744 First try to open php-SAPI.ini and if it fails fall back to regular
php.ini file. For example cli version of PHP will first try to open
php-cli.ini in the usual ini file search path and only if it fails
will it try to open php.ini using the same path.
2002-07-29 12:17:34 +00:00
Sander Roobol
751cd67cc0 get_cfg_var("get_file_path") didn't work correctly when an alternative
php.ini _file_ was specified using -c
2002-05-19 14:45:31 +00:00
Sascha Schumann
a769454d79 reenable php_html_puts 2002-05-12 14:48:22 +00:00
Zeev Suraski
b9fd10786b Use portable #define 2002-05-11 13:49:44 +00:00
Zeev Suraski
bf97148978 Centralize html_puts() logic - php_html_puts() remains as an API wrapper 2002-05-11 12:41:33 +00:00
Zeev Suraski
5af649efbd Revert to the old php_ini.c, and reimplement the binary-path searching.
Should now also work under UNIX (CLI/CGI)
2002-05-11 03:41:17 +00:00
foobar
c241dc5c8b ws fix 2002-05-09 22:46:45 +00:00
Preston L. Bannister
0c7cfcda4f Detect when running under IIS and default force_redirect to zero. This This means an explicit php.ini setting is no longer required.
(NO extraneous whitespace changes this time (sigh)).
2002-05-09 21:18:26 +00:00
Preston L. Bannister
6de4f3a459 Add check for php.ini in same directory as php.exe (or equivalent executable that loaded php4ts.dll). Check is done before looking in the Windows directory. This allows distinct php.ini files when different applications using PHP are installed on the same system. Should be backwards compatible.
Note that checking for in CWD php.ini may be a security risk(?), and can now be made compile-time configurable by removing a single #define.

(This time with tabs for leading indent).
2002-05-09 20:34:53 +00:00
foobar
42c82bb40d Revert the last patches. 2002-05-09 20:03:36 +00:00
Preston L. Bannister
fb0c506592 Add check for php.ini in same directory as php.exe (or equivalent executable that loaded php4ts.dll). Check is done before looks in the Windows directory.
This allows distinct php.ini files when different applications using PHP are installed on the same system.  Should be backwards compatible.

Note that checking for php.ini in CWD may be a security risk(?), and can now be made compile-time configurable by removing a single #define.
2002-05-09 19:51:18 +00:00
Yasuo Ohgaki
e17161443a Avoid defining/using S_ISDIR macro. 2002-04-19 05:48:22 +00:00
Sebastian Bergmann
c2dd85ce15 Patch by Marcus Börger. 2002-04-17 17:25:18 +00:00
Marcus Boerger
7bb4b5bd76 fix cli/cgi -c <path>|<file>
#hope this fixes it really (works for me)
2002-04-16 19:08:02 +00:00
Yasuo Ohgaki
3381fe4394 Fix cli/cgi -c option
# I must be sleeping
2002-04-13 14:12:17 +00:00
Yasuo Ohgaki
439b56842f CGI/CLI take file and dir for -c option by this.
@ Both 'file' and 'path to php.ini' is allowed for "-c" cli/cgi option. (Yasuo)
2002-04-12 00:20:29 +00:00
Frank M. Kromann
46a7b0cf61 Killing compiler warning on Win32 2002-03-05 00:21:28 +00:00
Sascha Schumann
b4d5aa5c50 Supply php_html_puts which escapes a whole string.. now fully works in ZTS
mode, too.
2002-03-04 18:46:55 +00:00
Edin Kadribasic
ab2564053f Removed CWD from php_ini_search_path when using CLI SAPI. 2002-02-28 12:12:39 +00:00
Sebastian Bergmann
38933514e1 Update headers. 2001-12-11 15:32:16 +00:00
Sterling Hughes
b91a66699c Z_TYPE(filehandle)?? ok.. whatever... ;) 2001-11-26 18:57:44 +00:00