Commit Graph

207 Commits

Author SHA1 Message Date
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Remi Collet
da84f3af75 Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
php_ini_scanned_path, from --with-config-file-scan-dir option or
from PHP_INI_SCAN_DIR environment variable allow a single path.

In some case it could be useful to allow multiple.

In the proposed patch, multiple paths are allow, using syntax inspired
from Unix MANPATH (: separated list, empty string for builtin value).

For example, this allow to use:
PHP_INI_SCAN_DIR=/foo/php.d:/bar/php.d   php
PHP_INI_SCAN_DIR=:/myproject/php.d       php
PHP_INI_SCAN_DIR=/myproject/php.d:       php

Real use case: in SCL for dependent collections where each collection
provides a separate tree for extensions, libraries and ini files.
2014-01-29 09:53:22 +01:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Anatol Belski
e7a4cf8d7e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix buffer overrun
2013-07-15 17:35:29 +02:00
Anatol Belski
9561e598a0 fix buffer overrun 2013-07-15 17:34:36 +02:00
David Soria Parra
c542e969f2 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix typos
2013-03-19 15:11:48 +01:00
Carson McDonald
c6f6bf88d8 Fix typos 2013-03-19 15:11:34 +01:00
Dmitry Stogov
0b8b6a727d Added ability to load zend_extensions without absolute path names 2013-03-17 11:42:25 +04:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Xinchen Hui
b5766cdcac Implemented FR #54514 (Get php binary path during script execution). 2011-12-07 10:33:13 +00:00
Xinchen Hui
5aa1fb6074 Implemented FR #54514 (Get php binary path during script execution). 2011-12-07 10:33:13 +00:00
Xinchen Hui
0420858004 Merge -r317306 to trunk 2011-12-07 10:28:56 +00:00
Pierre Joye
d435ddbe52 - be sure to check if the var ha not been removed between the two calls 2011-09-26 08:49:28 +00:00
Rasmus Lerdorf
6379f87b31 Fix another Coverity warning by initializing this to NULL prior to the strtok_r call 2011-08-06 21:10:29 +00:00
Rasmus Lerdorf
1bc34a491c Fix another Coverity warning by initializing this to NULL prior to the strtok_r call 2011-08-06 21:10:29 +00:00
Pierre Joye
801d140782 - fix bug #54204, Can't set a value with a PATH section in php.ini 2011-07-18 10:25:36 +00:00
Pierre Joye
ba22d8a37b - fix bug #54204, Can't set a value with a PATH section in php.ini 2011-07-18 10:25:36 +00:00
Pierre Joye
458ce08ab3 - path len check and fix buffer overrun 2011-01-19 14:21:46 +00:00
Pierre Joye
52aa5735f1 - path len sanity check 2011-01-17 14:29:16 +00:00
Pierre Joye
80e5f0f774 - remove local redeclaration 2011-01-10 08:28:47 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Jérôme Loyet
e1b87cce1f - Fixed #52045 (FPM tries to open php.ini from the current dir)
- Add php_ini_ignore_cwd to _sapi_module_struct
2010-11-11 17:24:27 +00:00
Adam Harvey
02b2a28882 Fix bug #52786 (PHP should reset section to [PHP] after ini sections). Patch by
Fedora at famillecollet dot com.
2010-09-09 05:11:05 +00:00
Felipe Pena
1fc65cbf03 - Fixed crash on non-Windows build 2010-08-30 21:34:54 +00:00
Pierre Joye
2721bbfcf9 - fix possible leak and error while fetching PHPRC 2010-08-30 17:05:56 +00:00
Antony Dovgal
01f828ebb0 fix bug #51276 (php_load_extension() is missing when HAVE_LIBDL is undefined) 2010-06-08 12:54:11 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
2010-04-26 23:53:30 +00:00
Jani Taskinen
e421bee7af - Fixed bug #48811 (Directives in PATH section do not get applied to subdirectories) 2010-01-16 21:01:12 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Pierre Joye
e4adfe4f61 - #48779, fix another use case where / usage may differ 2009-10-15 13:09:25 +00:00
Pierre Joye
e5d4b019b9 - #48779, improve fix, drop usage of _tolower and use zend_strtolower 2009-10-12 14:40:27 +00:00
Pierre Joye
112379ba24 - fix possible issue in TS environment (we don't have to do that anymore anyway in 5.3+) 2009-10-11 21:04:35 +00:00
Pierre Joye
4d63bd1132 - #48779, don't loop twice over the path chars 2009-10-11 20:50:53 +00:00
Felipe Pena
994307d429 - Fixed build and comment-style 2009-10-09 20:01:16 +00:00
Garrett Serack
8e5a00e546 - changed ini file directives [PATH=](on Win32) and [HOST=](on all) to be case insensitive (garretts) 2009-10-09 19:43:00 +00:00
Derick Rethans
d29d24427f - MFH: Get rid of the four different versions of zend_extension* and only use
zend_extension. Because of the API identifier change in PHP 5.3 you also get
  a proper warning message now.
#- [DOC]
2009-05-18 21:33:38 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Marcus Boerger
d6d4121546 - MFH Do not show empty ini directive tables for modules without ini entries. 2008-12-30 19:08:54 +00:00
Pierre Joye
1463a824e8 - move declaration on top and fix build error 2008-08-13 17:49:13 +00:00
Jani Taskinen
e5e6f553a2 MFH 2008-08-13 00:53:28 +00:00
Felipe Pena
cf7384aa40 - MFH: Constness (Added const qualifier to several function parameters) 2008-08-12 17:20:25 +00:00
Dmitry Stogov
ba8e3174ce Optimized request startup sequence for php.ini without per dir and per host configurations 2008-04-15 11:31:58 +00:00
Marcus Boerger
fa94dabd97 - MFH Rename dump_config_hash() to get_config_hash() as it doesn't dump 2008-02-03 14:35:59 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Jani Taskinen
c75b88760b MFH: No zval is stored here 2007-11-26 16:34:30 +00:00
Jani Taskinen
02d966c263 MFH:- Added support for [HOST=www.example.com] special sections
MFH:- Allowed using full path to load modules using "extension" directive
2007-11-09 16:27:43 +00:00
Yiduo (David) Wang
4b4d634cb9 MFH: Added macros for managing zval refcounts and is_ref statuses 2007-10-07 05:22:07 +00:00