clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,604 Commits 491 Branches 1,363 Tags 844 MiB
206cc46aab
Commit Graph

169 Commits

Author SHA1 Message Date
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
Derick Rethans
2830e45fe7 - Applied patch by Yasuo Ohgaki <yasuo_ohgaki@yahoo.com> 2001-11-01 10:57:49 +00:00
Derick Rethans
a0bbfb590c - <br> -> <br /> 2001-10-06 20:13:39 +00:00
Jeroen van Wolffelaar
c033288573 Back-substitute for Z_* macro's. If it breaks some extension (the script isn't optimal, it parses for example var->zval.value incorrect) please let me know. 2001-09-25 21:58:48 +00:00
Derick Rethans
78747bd2df - Don't wrap lines... this is annoying while coding. 2001-09-09 13:29:31 +00:00
Rasmus Lerdorf
00ef03186e This is a list of char *'s, not zvals (caught by Nick - see bug #13107) 2001-09-03 18:58:00 +00:00
foobar
001df0d028 Yet another TSRM fix. 2001-08-07 20:13:54 +00:00
Sascha Schumann
373b3e101e more tsrm cleanup -- output.c is not doing any fetches anymore 2001-08-05 15:55:43 +00:00
Zeev Suraski
1159c84ab7 - TSRMLS_FETCH work 
- whitespace fixes
 2001-08-05 01:43:02 +00:00
Zeev Suraski
2ec440078a Get rid of a couple of bogus persist_alloc()'s, and some cleanup 2001-08-03 07:15:14 +00:00
Zeev Suraski
b1de7fc900 More TSRMLS_FETCH annihilation. Enough for today... 2001-07-31 07:09:49 +00:00
Zeev Suraski
d76cf1da18 More TSRMLS_FETCH work 2001-07-31 04:53:54 +00:00
Zeev Suraski
d87cc976e1 Redesigned thread safety mechanism - nua nua 2001-07-28 11:36:37 +00:00
Zeev Suraski
fe6f8712a4 - Get rid of ELS_*(), and use TSRMLS_*() instead. 
- Move to the new ts_allocate_id() API
This patch is *bound* to break some files, as I must have had typos somewhere.
If you use any uncommon extension, please try to build it...
 2001-07-27 10:16:41 +00:00
Sebastian Bergmann
e4f109b69f Finish phpinfo() HTML 4.01 tweaking. 2001-06-19 15:21:28 +00:00
Rasmus Lerdorf
81e2cf03ac Fix folding and clean up some extensions 2001-06-06 13:06:12 +00:00
Rasmus Lerdorf
25c3a3a39d vim-6 does folding - clean up a bunch of missing folding tags plus 
some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
 2001-06-05 13:12:10 +00:00
foobar
9d1817ed7f Fix bug: #10323. Every value outputted is now escaped. 2001-05-06 15:20:56 +00:00
Frank M. Kromann
0be5cca176 Fix build on WIn32 
Should the new directorys be static?
 2001-04-23 17:33:22 +00:00
Stig Bakken
2cf1b8d345 * expanded the following constants and made them available in PHP: 
DEFAULT_INCLUDE_PATH
  PEAR_INSTALL_DIR
  PHP_EXTENSION_DIR
  PHP_BINDIR
  PHP_LIBDIR
  PHP_DATADIR
  PHP_SYSCONFDIR
  PHP_LOCALSTATEDIR
  PHP_CONFIG_FILE_PATH
* no longer generating pear/PEAR.php
* fixed some tests
* some more installer work
 2001-04-22 01:09:14 +00:00
Andi Gutmans
a6f90ec7c6 - Get rid of warning. 2001-04-21 11:40:04 +00:00
Zeev Suraski
9db5589161 Recode delayed loading in a much simpler way (switched back to php_ini.c 1.49) 2001-03-17 23:35:32 +00:00
Stanislav Malyshev
7c2ea02288 Don't insert empty path if PHPRC is empty 2001-03-06 11:38:55 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Stanislav Malyshev
2b45f38ec9 Add safety check 2001-02-21 15:20:29 +00:00
Hartmut Holzgraefe
5b741dfb58 # make sebastian and compiler happy .) 2001-02-21 11:16:16 +00:00
Hartmut Holzgraefe
b14d2cc0dc will now initialize dynamic extensions *after* static ones 2001-02-21 01:43:15 +00:00
Zeev Suraski
d294f46f5a - Remove the ini_extension_list global 
- Switch to delayed loading of Zend extensions
 2001-01-15 10:52:02 +00:00
Sascha Schumann
db0b8bc05b Defer loading of extensions until all configuration entries have been 
added to the configuration hash.
 2001-01-15 03:21:05 +00:00
Zeev Suraski
fc1cdda10d Remove stale code 2001-01-13 13:10:50 +00:00
Zeev Suraski
bd0ac7fe14 Many patches. I hope I remember them all: 
- Make sapi_module available to external modules (PHPAPI)
- Make the php.ini path reported in phpinfo() always point to
  real full path of the php.ini file
- Optimized the ISAPI module not to read unnecessary server
  variables and read necessary variables at most once.
 2001-01-02 22:49:31 +00:00
Zeev Suraski
338b9b0819 - Make the INI mechanism thread safe (fix necessary API changes from Zend) 
- Make the Win32 non-TS configuration build again
 2000-12-27 15:43:05 +00:00
Zeev Suraski
92d37f688e - Fix phpinfo() 
- Fix non-thread-safe build
 2000-10-31 16:06:46 +00:00
Zeev Suraski
78194a47b7 - Complete the move to the new INI parser. (Side effect: at last, people 
can finally have spaces and tabs in their extension statements...)
 2000-10-30 23:39:14 +00:00
Zeev Suraski
4af433d627 Use the new INI parser for parse_ini_str() 
- parse_ini_str() is now thread-safe, and supported under Windows (Zeev)
 2000-10-29 22:42:01 +00:00
Zeev Suraski
1fd09132c2 Initial steps to move the INI mechanism to the Zend engine 2000-10-29 11:38:26 +00:00
Zeev Suraski
b7ecaacd07 More security-related (control) patches: 
- Avoid displaying errors during startup, unless display_startup_errors is enabled.
- Implemented post_size_max limit.  Defaults to 8MB.
- Implemented file_uploads on/off directive (defaults to on).
 2000-09-09 15:02:15 +00:00
Zeev Suraski
12adebbc3a - Fix leak 
- Remove redundant php_ini code
 2000-09-05 21:18:00 +00:00
Sascha Schumann
8e0ae5d152 Cleaning up some mess 2000-08-21 09:50:53 +00:00
Zeev Suraski
168ccfc133 Disable the hash_apply() protection on hashes that persist across requests - it's unsafe 
because we may be aborted at any point
@- Fixed a possible data corruption in case of a huge amount of aborted requests (Zeev)
 2000-07-11 14:29:38 +00:00
Zeev Suraski
d1f1d40527 - Make the INI entries sorted in phpinfo() 2000-06-03 03:05:29 +00:00
Zeev Suraski
e043439ff6 Update the license with the new clause 6 2000-05-18 15:34:45 +00:00
Colin Viebrock
1ddc9ff852 Prettying up the output of phpinfo(). Someone has to tell me how 
to get a new .gif logo in there, and why the ZEND_DEBUG output is
causing seg faults.

I also need to go through all the modules and fix up the output they
create.
 2000-04-05 20:17:02 +00:00
Zeev Suraski
1261271839 Allow the INI callbacks to know at what stage PHP is 2000-02-26 15:36:23 +00:00
Stig Bakken
ba03c9f2aa started implementing directives for default mimetype/charset 2000-02-24 22:00:47 +00:00
Zeev Suraski
9b621d1c8f Get the license right... (this won't make it to RC1 of B4) 2000-02-19 23:21:46 +00:00
Zeev Suraski
39cb8fe0ac Fix PostgreSQL startup routine in thread-safe mode 2000-02-05 17:26:35 +00:00
Sascha Schumann
43ae2bffbb Happy Y2K patch! Happy new year (or the new millennium, depending on whether 
you start counting at 0 or 1).
 2000-01-01 01:32:05 +00:00
Andi Gutmans
7ebbe20fb0 - Should fix short_tags and co. problem. 1999-09-05 19:49:54 +00:00
Zeev Suraski
58e24ac18a - Add PHP Modules workspace 
- Get the MySQL module to compile&work under thread-safe Win32
- Fix various thread safety issues with dynamic modules
 1999-08-13 21:03:27 +00:00
Zeev Suraski
3cb1eb0471 Removed '3' from key functions in PHP (maintained compatibility through 
php3_compat.h)
 1999-08-02 19:17:14 +00:00
Zeev Suraski
c5724cbd14 License update 1999-07-16 13:13:16 +00:00
Andi Gutmans
3e6bce59b3 - Add a bitwise flag to phpinfo() 
- Import a draft of the new PHP license
 1999-07-14 16:02:10 +00:00
Zeev Suraski
bb190f8565 Implement new get_ini_entry() for Zend 1999-06-19 19:23:24 +00:00
Zeev Suraski
3cad348509 * Add a new workspace for dynamic PHP extensions. 
* Add a few functions to PHP's API.
* Get the MySQL extension up-to-date and thread safe.
* Add a project for building the MySQL extension under Win32.
 1999-06-04 10:45:54 +00:00
Sascha Schumann
31da7331fe kill some warnings 1999-05-30 12:00:06 +00:00
Zeev Suraski
d62a739cca More fixes. Should hopefully work well now. 1999-05-22 12:19:57 +00:00