Commit Graph

153 Commits

Author SHA1 Message Date
Antony Dovgal
0db4f06f13 MFH 2007-05-19 12:53:06 +00:00
Antony Dovgal
d85fc29edf MFH 2007-05-14 12:19:34 +00:00
Hannes Magnusson
909894682d MFH: bug#41361 (shell_exec() does not find binaries) 2007-05-12 16:06:46 +00:00
Hannes Magnusson
63c11738f8 use php_strtok_r() rather than strsep()
# Fixes build on, for instance, solaris
2007-05-10 19:48:30 +00:00
Hannes Magnusson
448dbac84f MFH: Fixed PHP CLI to use the php.ini from the binary location 2007-05-06 14:01:26 +00:00
Dmitry Stogov
e1814f0dbe WIN64 support 2007-04-16 08:09:56 +00:00
Marcus Boerger
50ea26760d - Avoid sprintf, even when checked copy'n'paste or changes lead to errors 2007-02-24 02:17:47 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Antony Dovgal
112462d102 MFH 2006-12-28 12:18:54 +00:00
Dmitry Stogov
7d14dad02e MFH: Fixed mess with CGI/CLI -d command line option (now it works with cgi; constants are working exactly like in php.ini; with FastCGI -d affects all requests). 2006-09-19 20:33:12 +00:00
Edin Kadribasic
ef058cdd9a Search for php.ini in CWD in all sapi's *but* CLI.
This patch reverses wrong behavaiour introduced before the
release of 5.1.0.

# We should probably consider killing adding CWD php.ini lookup
# altogether.
2006-09-05 11:54:15 +00:00
Dmitry Stogov
c946b4d1b2 In addtion to path to php.ini, PHPRC now may specify full file name 2006-08-03 11:04:52 +00:00
Dmitry Stogov
acb1e07980 Changed priority of PHPRC environment variable on win32 to be higher then value from registry. 2006-07-04 06:35:49 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
foobar
1890173d8c Revert 2005-09-02 14:05:46 +00:00
foobar
96873fecef it is good idea to return something always 2005-09-02 08:24:14 +00:00
foobar
64cfbf539f MFH: - Fixed bug #34307 (OnUpdateStringUnempty INI options can be set empty) 2005-09-01 14:44:15 +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
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