Commit Graph

172 Commits

Author SHA1 Message Date
Marcus Boerger
d4f5b3f0a9 - This is PHP 6 - if this ... ever gets out 2009-03-10 23:40:06 +00:00
Sebastian Bergmann
7f4dc8702a Bump copyright year, 3 of 3. 2008-12-31 11:12:40 +00:00
Marcus Boerger
a4d74dc48f - Do not show empty ini directive tables for modules without ini entries. 2008-12-30 19:08:42 +00:00
Pierre Joye
cc64e2f1e2 - MFB: move declaration on top and fix build error 2008-08-13 21:51:54 +00:00
Jani Taskinen
bc6a9ad209 [DOC]- Added methods to change/disable --with-config-file-scan-dir=PATH at
[DOC]  startup:
[DOC]
[DOC]  To disable: Override default php.ini by using both -c and -n with
[DOC]              CGI/CLI or set "PHP_INI_SCAN_DIR" environment variable
[DOC]              to an empty string.
[DOC]
[DOC]  To change: Simply set "PHP_INI_SCAN_DIR" environment variable to point
[DOC]             to another path.

- Fixed bug #42604 ("make test" fails with --with-config-file-scan-dir=/some/path)
- Implemented FR #45114 (Option to change --with-config-file-scan-dir)
2008-08-13 00:49:59 +00:00
Felipe Pena
a5f867f3d5 - Constness (Added const qualifier to several function parameters) 2008-08-12 17:15:59 +00:00
Dmitry Stogov
f3c82b0055 Optimized request startup sequence for php.ini without per dir and per host conf
igurations
2008-04-15 11:32:13 +00:00
Marcus Boerger
f2ce43983f - Rename dump_config_hash() to get_config_hash() as it doesn't dump 2008-02-03 14:35:29 +00:00
Sebastian Bergmann
9b620d50b4 Bump copyright year, 2 of 2. 2007-12-31 07:12:20 +00:00
Jani Taskinen
38d7b36439 - No zval is stored here 2007-11-26 16:34:07 +00:00
Jani Taskinen
ad9605a722 - Allow using full path to load modules using "extension" directive 2007-11-09 16:26:55 +00:00
Jani Taskinen
ae2b2b1465 - Added support for [HOST=www.example.com] sections
# Works the same way as PATH, just the SERVER_NAME is matched with these
2007-11-09 16:02:50 +00:00
Yiduo (David) Wang
95da0dc570 Added macros for managing zval refcounts and is_ref statuses 2007-10-07 05:15:07 +00:00
Jani Taskinen
69eafc407f - Fix warning 2007-10-01 12:26:55 +00:00
Jani Taskinen
0d0117bfdf - Fix win32 build. 2007-09-28 10:23:14 +00:00
Jani Taskinen
f964370a35 - Added ".htaccess" style user-defined php.ini files support for
CGI/FastCGI.
- Added support for special [PATH=/opt/httpd/www.example.com/] sections
  in php.ini. All directives set in these sections will not be able to be
  overridden in user-defined ini-files or during runtime in the specified
  path.

- Improved php.ini handling:
  . Added better error reporting for syntax errors in php.ini files
  . Allowed "ini-variables" to be used almost everywhere ini php.ini files
  . Allowed using alphanumeric/variable indexes in "array" ini options
  . Fixed get_cfg_var() to be able to return "array" ini options

- Fixed bug #27372 (parse error loading browscap.ini at apache startup)
- Fixed bug #42069 (parse_ini_file() allows using some non-alpha numeric
  characters)

@DOC Pierre promised to handle the manual part of this :D
2007-09-28 02:04:28 +00:00
Jani Taskinen
210c7781fc ws fixes 2007-08-31 08:13:07 +00:00
Jani Taskinen
31dd0907c0 ws + apify cfg_get_entry 2007-08-31 08:09:41 +00:00
Antony Dovgal
c66d75a933 use correct constant 2007-05-19 12:52:31 +00:00
Antony Dovgal
f6a01b2ace use estrdup() and plug the leak 2007-05-14 12:19:25 +00:00
Hannes Magnusson
e7c7f95ecd Fixed bug#41361 (shell_exec() does not find binaries) 2007-05-12 16:06:07 +00:00
Hannes Magnusson
c85e26cb06 MFB - use php_strtok_r() rather than strsep() 2007-05-10 19:51:19 +00:00
Hannes Magnusson
f1e35024fb - Don't pick up php.ini from cwd on BSDs
- "Resolve" (with the help of $PATH) to /path/to/php and pick up
	the php.ini from there
2007-04-25 10:02:23 +00:00
Dmitry Stogov
2908322c14 WIN64 support 2007-04-16 09:43:53 +00:00
Marcus Boerger
20a40063c5 - avoid sprintf 2007-02-24 16:25:58 +00:00
Sebastian Bergmann
3717df72ae Bump year. 2007-01-01 09:29:37 +00:00
Antony Dovgal
fbf05e4b70 use strlcat() 2006-12-28 12:18:47 +00:00
Edin Kadribasic
b279fe502a MFB 2006-09-05 11:55:08 +00:00
Dmitry Stogov
a0f7f6680a In addtion to path to php.ini, PHPRC now may specify full file name 2006-08-03 11:05:09 +00:00
Dmitry Stogov
a72dd9fe17 Changed priority of PHPRC environment variable on win32 to be higher then value from registry. 2006-07-04 06:38:32 +00:00
Ilia Alshanetsky
27e175eef0 So long safe_mode mode.
Also removed the magic_quotes configure option, no longer relevant since
the magic is gone :-).
2006-03-08 14:41:45 +00:00
Dmitry Stogov
09ca61c125 Made server wide switch for unicode on/off (according to PDM). 2006-02-13 10:23:59 +00:00
foobar
251c5173fd bump year and license version 2006-01-01 13:10:10 +00:00
foobar
7d92b356d9 revert 2005-09-02 14:08:09 +00:00
foobar
1496355faf MFB: Always return something, even if it succeeds :) 2005-09-02 08:26:05 +00:00
foobar
ec0b4f91f4 - Fixed bug #34307 (OnUpdateStringUnempty INI options can be set as empty) 2005-09-01 14:42:54 +00:00
foobar
000a9e3015 - Fixed problem with -dextension=foobar.so not having it's MINIT run. 2005-08-08 16:49:44 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
foobar
f66d5f0cc5 - Fixed few logic errors in php*.ini search path creation as documented here:
http://fi.php.net/manual/en/configuration.php#configuration.file

#
# Before this patch:
#
# $ strace php -r 'echo 1;' 2>&1 | grep php.ini
# open("/www/php/lib/php.ini", O_RDONLY)  = 3
# lstat64("/www/php/lib/php.ini", {st_mode=S_IFREG|0640, st_size=46264, ...}) = 0
#
# With this patch:
#
# $ strace php -r 'echo 1;' 2>&1 | grep php.ini
# open("./php.ini", O_RDONLY)             = -1 ENOENT (No such file or directory)
# open("/usr/src/php5_1_full/sapi/cli/php.ini", O_RDONLY) = -1 ENOENT (No such file or directory)
# open("/www/php/lib/php.ini", O_RDONLY)  = 3
# lstat64("/www/php/lib/php.ini", {st_mode=S_IFREG|0640, st_size=46264, ...}) = 0
#
2005-07-29 14:29:27 +00:00
Antony Dovgal
98694f919c ws fix 2005-07-27 15:16:14 +00:00
Hartmut Holzgraefe
882cb200cc edge case: do not remove trailing slash for root directory (Bug #33882) 2005-07-27 15:13:50 +00:00
Hartmut Holzgraefe
7e071d9a1f php.ini search logic needs to use the absolute path of the running binary
when looking for php.ini in the directory the php binary is installed in
2005-07-27 15:12:18 +00:00
Dmitry Stogov
f47c78487b Improved PHP extension loading mechanism with support for module dependencies and conflicts 2005-06-17 09:39:23 +00:00
Ilia Alshanetsky
2a2d49b947 Fixed bug #30050 (Possible crash inside php_shutdown_config()).
# Patch suggestion by nw at softwarekombinat dot de
2004-09-17 02:48:41 +00:00
Andi Gutmans
56f8195fe5 - Nuke empty_string. It is a reminanent from the time where RETURN_FALSE()
used to return "" and not bool(false). It's not worth keeping it because
  STR_FREE() and zval_dtor() always have to check for it and it slows down
  the general case. In addition, it seems that empty_string has been abused
  quite a lot, and was used not only for setting zval's but generally in
  PHP code instead of "", which wasn't the intention. Last but not least,
  nuking empty_string should improve stability as I doubt every place
  correctly checked if they are not mistakenly erealloc()'ing it or
  calling efree() on it.
  NOTE: Some code is probably broken. Each extension maintainer should
  check and see that my changes are OK. Also, I haven't had time to touch
  PECL yet. Will try and do it tomorrow.
2004-07-19 07:19:50 +00:00
Derick Rethans
ac9f4cc2af - We always need to destroy the llist though. 2004-02-14 12:35:59 +00:00
Derick Rethans
3781af53cd - Fixed zero bytes memory allocation when no extra ini files are found in the
--with-config-file-scan-dir specified directory. (patch by Eric Colinet
  <e.colinet@laposte.net>)
2004-02-14 12:29:04 +00:00
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