0
0
mirror of https://github.com/php/php-src.git synced 2024-12-23 00:40:33 +08:00
Commit Graph

341 Commits

Author SHA1 Message Date
Michael Wallner
feb4caad09 update php.ini-* 2013-12-30 14:28:43 +01:00
Michael Wallner
bc1c2b3b31 remove always_populate_raw_post_data INI entries from master, UPGRADING.INTERNALS coming shortly 2013-12-12 11:33:06 +01:00
Christopher Jones
b3a2b44198 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug  (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
2013-10-21 14:21:19 -07:00
Christopher Jones
b6ceea4a25 Fixed bug (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org) 2013-10-21 14:20:35 -07:00
Lior Kaplan
e98fc7de52 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Add information about which INI file is which inside respective files
2013-09-27 17:50:03 +02:00
Ondřej Surý
0ad0a2f56e Add information about which INI file is which inside respective files 2013-09-27 17:46:14 +02:00
Christopher Jones
5ac7c533a0 More OCI8 DTrace probe updates.
Change php.ini-* doc to match an earlier change to config.w32
2013-09-26 21:12:11 -07:00
Adam Harvey
b8beb657ca Merge branch 'PHP-5.5'
* PHP-5.5:
  Tinker with the wording of the short_open_tag description.

Conflicts:
	php.ini-development
	php.ini-production
2013-09-09 16:59:26 -07:00
Adam Harvey
d209c362d2 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Tinker with the wording of the short_open_tag description.
2013-09-09 16:58:35 -07:00
Adam Harvey
160cd8d0a7 Tinker with the wording of the short_open_tag description.
I'm still not thrilled with this, but it's a bit better and addresses the
issues noted in bug . Plus, it now mentions the decoupling of <?=.
2013-09-09 16:56:57 -07:00
Yasuo Ohgaki
8da7aa7e41 Merge branch 'PHP-5.5'
* PHP-5.5:
  Add session.use_strict_mode description to php.ini-*
2013-08-20 18:30:46 +09:00
Yasuo Ohgaki
4cd9796be7 Add session.use_strict_mode description to php.ini-* 2013-08-20 18:30:30 +09:00
Stanislav Malyshev
0f09b978cc Merge branch 'PHP-5.5'
* PHP-5.5:
  php.ini-development/production: remove php_zip.dll
  Update NEWS
  Update NEWS
2013-08-10 17:31:59 -07:00
Stanislav Malyshev
143ec70638 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  php.ini-development/production: remove php_zip.dll
  Update NEWS
2013-08-10 17:31:48 -07:00
Jan Ehrhardt
503d39d925 php.ini-development/production: remove php_zip.dll
Remove the reference to php_zip.dll in php.ini-production and
php.ini-development, because php_zip.dll does not exist anymore since
PHP 5.3
2013-08-10 17:31:40 -07:00
Stanislav Malyshev
1a05648e6d Merge branch 'PHP-5.5'
* PHP-5.5:
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix

Conflicts:
	configure.in
	main/php_version.h
2013-07-21 21:17:59 -07:00
Veres Lajos
b8941a73cc mssql.compatability_mode fix 2013-07-21 21:12:16 -07:00
Yasuo Ohgaki
0a7c88884e Merge branch 'PHP-5.5'
* PHP-5.5:
  Improve php.ini-* documentation
2013-07-18 14:10:34 +09:00
Yasuo Ohgaki
d6692514f8 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Improve php.ini-* documentation
2013-07-18 14:10:05 +09:00
Yasuo Ohgaki
445dffa75a Improve php.ini-* documentation 2013-07-18 14:08:28 +09:00
Stanislav Malyshev
2c8a4af892 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug : add curl.cainfo to php.ini
2013-07-14 23:57:16 -07:00
Stanislav Malyshev
8c663fd4cc Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug : add curl.cainfo to php.ini

Conflicts:
	php.ini-development
	php.ini-production
2013-07-14 23:56:59 -07:00
Stanislav Malyshev
2bad01e61b Fix bug : add curl.cainfo to php.ini
Conflicts:

	php.ini-development
	php.ini-production
2013-07-14 23:56:03 -07:00
Remi Collet
ab165d3465 Merge branch 'PHP-5.5'
* PHP-5.5:
  apply change from opcache readme to php.ini
2013-04-11 07:06:36 +02:00
Remi Collet
6df1e8d3fe apply change from opcache readme to php.ini 2013-04-11 07:05:56 +02:00
Dmitry Stogov
e67e6a1f36 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added opcache.enable_cli=0
2013-03-27 21:08:58 +04:00
Dmitry Stogov
26f3ff25fe Added opcache.enable_cli=0 2013-03-27 21:08:18 +04:00
David Soria Parra
95c3b9ab39 Merge branch 'PHP-5.5'
* PHP-5.5:
  Add OPCache ini settings to php.ini
2013-03-21 15:52:12 +01:00
David Soria Parra
293d5defb4 Add OPCache ini settings to php.ini 2013-03-21 15:51:23 +01:00
Stanislav Malyshev
992bba6aef Merge branch 'PHP-5.5'
* PHP-5.5:
  Add news for bug 
  Implemented Feature  (sys_temp_dir)

Conflicts:
	UPGRADING
2013-01-28 22:56:51 -08:00
ALeX Kazik
475a644bd8 Implemented Feature (sys_temp_dir)
Added a new configuration directive which allows it to change the
temporary directory, the default behavior is unchanged.

This is a useful option if you use all/some hosts inside of one .ini file
with sections and want to change the temp dir per user (maybe it's not
allowed to write outside the users home directory). Since the TMPDIR
variable affects the whole php that way can not be used for this scenario.

(see https://bugs.php.net/bug.php?id=60524)
2013-01-28 22:37:43 -08:00
Bryan Hanks, PMP
e7f8f7c01c Corrected spelling of 'shortcut' 2012-11-12 13:12:13 -06:00
Bryan Hanks, PMP
d0727b58da Corrected grammar/spelling of text in php.ini files
There are no actual code changes here; I corrected grammar and spelling
errors in the php.ini-production and php.ini-development files. I also
rewrote some sentences to make them less cumbersome.
2012-11-12 13:04:32 -06:00
Florian Anderiasch
81de111131 Merge branch 'PHP-5.4'
* PHP-5.4:
  Add syslog support to mail.log 
2012-07-24 14:34:41 +02:00
Florian Anderiasch
ddc8d16245 Add syslog support to mail.log
Patch by Michael Orlitzky
2012-07-24 14:31:30 +02:00
Xinchen Hui
61a13773bc Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed bug  superfluous ";"
2012-05-25 22:34:06 +08:00
Xinchen Hui
91ad40d9bb Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug  superfluous ";"
2012-05-25 22:33:17 +08:00
Xinchen Hui
c3547f1935 Fixed bug superfluous ";" 2012-05-25 22:31:49 +08:00
Johannes Schlüter
9ca4710c9f Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix slight grammar glitch (thanks Dan Brown)
2012-04-19 00:08:42 +02:00
Johannes Schlüter
cc85e7c313 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix slight grammar glitch (thanks Dan Brown)
2012-04-19 00:08:36 +02:00
Johannes Schlüter
710021d1d4 Fix slight grammar glitch (thanks Dan Brown) 2012-04-19 00:07:40 +02:00
Yasuo Ohgaki
cfb2df5fb7 Adjust mbstring php.ini settings 2012-03-27 00:34:21 +09:00
slumbers99
833dcf3cf7 mbstring use UTF-8 2012-03-26 18:56:51 +09:00
Pierre Joye
5f31ecacd8 - Fix bug , ext/sqlite is not bundled anymore, remove it from php.ini 2012-03-17 08:52:27 +00:00
Pierre Joye
8fec627bd8 - Fix bug , ext/sqlite is not bundled anymore, remove it from php.ini 2012-03-17 08:52:27 +00:00
Christopher Jones
4fff4753ac Change PHP 6 refs to PHP 5.4 and sync some spelling with PHP_5_4 branch files 2012-03-01 20:05:18 +00:00
Christopher Jones
32c6c1659f Merge Stas's 5.4 r323128 to trunk 2012-02-09 23:53:07 +00:00
Stanislav Malyshev
fe5d10d072 change 6.0.0 to 5.4.0 2012-02-08 20:12:44 +00:00
Dmitry Stogov
b8a08bf263 Added max_input_vars directive to prevent attacks based on hash collisions 2011-12-15 10:31:02 +00:00
Dmitry Stogov
e467a791d3 Added max_input_vars directive to prevent attacks based on hash collisions 2011-12-15 10:31:02 +00:00
Dmitry Stogov
a099e0d2f6 Added max_input_vars directive to prevent attacks based on hash collisions 2011-12-15 10:31:02 +00:00
Felipe Pena
fbe48da396 - Fixed bug (Simple Typo In php.ini Files)
patch by: danbrown at php.net
2011-12-09 22:43:01 +00:00
Felipe Pena
0c9fb81c50 - Fixed bug (Simple Typo In php.ini Files)
patch by: danbrown at php.net
2011-12-09 22:43:01 +00:00
Felipe Pena
9e06b00e71 - Fixed bug (Simple Typo In php.ini Files)
patch by: danbrown at php.net
2011-12-09 22:43:01 +00:00
Hannes Magnusson
0a7fd1962b Uhh.. Can't believe noone noticed the gc option was missing from our ini files 2011-12-08 14:57:02 +00:00
Hannes Magnusson
6b7d4bd322 Uhh.. Can't believe noone noticed the gc option was missing from our ini files 2011-12-08 14:57:02 +00:00
Hannes Magnusson
d0f7573b39 Uhh.. Can't believe noone noticed the gc option was missing from our ini files 2011-12-08 14:57:02 +00:00
Christopher Jones
5fdb19fba0 Miscellaneous: move misplaced entry; fix typos; note more precise OCI8 DLL dependency; remove session.entropy_file setting which was only in PHP_5_3 php.ini-development 2011-11-29 22:33:55 +00:00
Christopher Jones
d9e955c6b2 Miscellaneous: move misplaced entry; fix typos; note more precise OCI8 DLL dependency; remove session.entropy_file setting which was only in PHP_5_3 php.ini-development 2011-11-29 22:33:55 +00:00
Christopher Jones
e612e7a405 Miscellaneous: move misplaced entry; fix typos; note more precise OCI8 DLL dependency; remove session.entropy_file setting which was only in PHP_5_3 php.ini-development 2011-11-29 22:33:55 +00:00
Pierre Joye
d4406ad0a4 - add crt warning ini 2011-11-24 12:51:28 +00:00
Pierre Joye
22f80eadf7 - add crt warning ini 2011-11-24 12:51:28 +00:00
Pierre Joye
91983739e7 - add crt warning ini 2011-11-24 12:51:28 +00:00
Christian Stocker
c9b5d92821 Fix wrong comment
Add new xsl ini options to php.ini
2011-10-06 18:30:55 +00:00
Peter Cowburn
24cbd8f3fe typofix (procgress to progress) 2011-10-03 08:45:06 +00:00
Peter Cowburn
004cc53ab9 typofix (procgress to progress) 2011-10-03 08:45:06 +00:00
Peter Cowburn
4750c3fbe1 Fix php.ini comment () 2011-10-03 08:40:26 +00:00
Peter Cowburn
8f545a7429 Fix php.ini comment () 2011-10-03 08:40:26 +00:00
Hannes Magnusson
2db05d6f41 Fixed bug#55430, introduce the session.upload_progress family to the world 2011-08-30 11:13:22 +00:00
Hannes Magnusson
3c1874143c Fixed bug#55430, introduce the session.upload_progress family to the world 2011-08-30 11:13:22 +00:00
Arpad Ray
8590f2587a add friendly log messages (req ) 2011-08-29 21:59:27 +00:00
Arpad Ray
88e36378ff add friendly log messages (req ) 2011-08-29 21:59:27 +00:00
Hannes Magnusson
2594143683 Add missing session ini options "skeletons" until they become atleast documented 2011-08-29 20:50:33 +00:00
Hannes Magnusson
23b3468bc9 Add missing session ini options "skeletons" until they become atleast documented 2011-08-29 20:50:33 +00:00
Hannes Magnusson
88c4f560d0 Sync -development with -production 2011-08-23 10:00:18 +00:00
Hannes Magnusson
17fb5f539d Sync -development with -production 2011-08-23 10:00:18 +00:00
Hannes Magnusson
5f38ffb167 Sync -development with -production 2011-08-23 10:00:18 +00:00
Derick Rethans
840ef1e320 - Turn on html_errors by default again in php.ini-production like it was in
PHP 5.3, but only generate docref links when the docref_root INI setting is
  not empty.
2011-08-10 16:31:29 +00:00
Derick Rethans
7b84e7ea1c - Turn on html_errors by default again in php.ini-production like it was in
PHP 5.3, but only generate docref links when the docref_root INI setting is
  not empty.
2011-08-10 16:31:29 +00:00
Stanislav Malyshev
24392c37d9 No E_STRICT in production 2011-07-24 05:42:29 +00:00
Stanislav Malyshev
3f43c3ef9d No E_STRICT in production 2011-07-24 05:42:29 +00:00
Stanislav Malyshev
4d926b1fa3 Change E_ALL to include E_STRICT 2011-07-23 22:07:22 +00:00
Stanislav Malyshev
7bb8f9eecb Change E_ALL to include E_STRICT 2011-07-23 22:07:22 +00:00
Pierre Joye
9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Pierre Joye
cc1c7af037 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Pierre Joye
ecfc54c5e6 - cleanup 2011-07-19 12:02:22 +00:00
Pierre Joye
8ebba9c69d - cleanup 2011-07-19 12:02:22 +00:00
Pierrick Charron
1368364469 Fix common typos in the source code (Reported in Bug )
# External libraries were excluded
# Thanks eitan at eitanadler dot com for the first patch :)
2011-04-03 21:46:52 +00:00
Gustavo André dos Santos Lopes
5fad615ff5 - Changed php.ini files to match the hard-coded default for serialize_precision. 2011-02-09 00:25:44 +00:00
Gustavo André dos Santos Lopes
efa9a8ee53 - Changed php.ini files to match the hard-coded default for serialize_precision. 2011-02-09 00:25:44 +00:00
Adam Harvey
39210df0ed Implement request (Deprecated HTML in sample php.ini). 2011-01-07 03:43:20 +00:00
Adam Harvey
abf0ea0110 Implement request (Deprecated HTML in sample php.ini). 2011-01-07 03:43:20 +00:00
Moriyoshi Koizumi
b0f8ac5299 - Update ini descriptions. It is still possible that zend.multibyte will be removed in the near future as it is confirmed to not impose any significant overhead with the standard configuration even when it is enabled. 2010-12-21 06:57:46 +00:00
Gustavo André dos Santos Lopes
c8622a07f5 - Adding enable_post_data_reading to php.ini-* 2010-12-16 11:27:17 +00:00
Jani Taskinen
ab80d4e4b7 - $_REQUEST is also JIT global now 2010-12-14 15:42:22 +00:00
Pierre Joye
269a6b09a3 -add a link to snmp install doc about the MIBS data, remove static or removed exts 2010-12-13 21:07:13 +00:00
Pierre Joye
acd87493ec -add a link to snmp install doc about the MIBS data, remove static or removed exts 2010-12-13 21:07:13 +00:00
Pierre Joye
cba0322c81 - not anymore in core or builtin 2010-12-07 23:53:51 +00:00
Adam Harvey
7111501381 Update INI files per doc bug (mail.log is poorly documented). 2010-11-29 03:44:56 +00:00
Adam Harvey
07ea326cda Update INI files per doc bug (mail.log is poorly documented). 2010-11-29 03:44:56 +00:00
Patrick Allaert
9ef050ca64 Reviewing php.ini-* configurations files:
* Making both files as similar as possible
* Removed trailing whitespaces
* Fixed some spelling mistakes
* Section [PostgresSQL] -> [PostgreSQL]
* Introducing missing mysqli.allow_{local_infile,persistent} entries in -development
2010-11-18 10:13:58 +00:00
Adam Harvey
baa6f7fc71 Fix bug (php.ini should use portable example of find) by using POSIX
compliant syntax in the suggested find command for cleaning up session files in
the shipped php.ini files.
2010-10-18 02:10:29 +00:00
Adam Harvey
6a289f4d10 Fix bug (php.ini should use portable example of find) by using POSIX
compliant syntax in the suggested find command for cleaning up session files in
the shipped php.ini files.
2010-10-18 02:10:29 +00:00
Kalle Sommer Nielsen
0ff6f90446 Fixed bug (exif is placed before mbstring in php.ini) 2010-08-16 00:26:39 +00:00
Kalle Sommer Nielsen
61a1bad720 Fixed bug (exif is placed before mbstring in php.ini) 2010-08-16 00:26:39 +00:00
Pierre Joye
d27d572a7d - typo 2010-06-24 00:15:12 +00:00
Pierre Joye
07985e9172 - typo 2010-06-24 00:15:12 +00:00
Pierre Joye
761dbeedbb - duplicate entry 2010-06-08 13:48:02 +00:00
Pierre Joye
26a91baa63 - duplicate entry 2010-06-08 13:48:02 +00:00
Pierre Joye
f8b17007e0 - [DOC] add session.entropy* support to windows 2010-06-08 13:46:19 +00:00
Pierre Joye
bfe51d3895 - [DOC] add session.entropy* support to windows 2010-06-08 13:46:19 +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
Felipe Pena
0a6bcd44a7 - Removed allow_call_time_pass_reference (Pierrick) 2010-04-26 00:13:34 +00:00
Kalle Sommer Nielsen
9a38f301d6 Remove highlight.bg, it was removed in the old trunk and its not referenced in zend_highlight.c, meaning its not even implemented correctly in 5.3. 2010-04-21 21:56:24 +00:00
Kalle Sommer Nielsen
febee11285 Removed register_globals 2010-04-21 01:27:22 +00:00
Christopher Jones
ff515d0ee4 Fix php.ini comment typo 2010-04-15 19:22:01 +00:00
Christopher Jones
4cf81c81d0 Fix php.ini comment typo 2010-04-15 19:22:01 +00:00
Kalle Sommer Nielsen
a5304b138f Removed register_long_arrays ini option (and $HTTP_SESSION_VARS from ext/session) 2010-04-15 16:36:08 +00:00
Kalle Sommer Nielsen
4e7b11ccce Removed y2k_compliance ini option, making it "always" enabled internally
- The only reference to y2k_compliance was in php_std_date(). Browsers thats not compatable have a marketshare of 0.01% if they even are in use today
2010-04-12 07:34:30 +00:00
Kalle Sommer Nielsen
8087be61d0 * Changed the way removed ini directives are shown so its easier to add new ones
* Removed define_syslog_variables and its associated functions
2010-04-12 01:52:55 +00:00
Rasmus Lerdorf
9692a3619c Set session.entropy_file to /dev/urandom or /dev/arandom by
default if present at compile-time.  Addresses part of bug 
2010-03-31 18:03:17 +00:00
Rasmus Lerdorf
906dd4eac5 Switch default_charset, if not specified, from ISO-8859-1 to UTF-8
I have been wanting to make this change for years, but there is a small
chance of BC issues, so it shouldn't go into a minor release.
2010-03-23 18:08:06 +00:00
Ilia Alshanetsky
9d095a6011 Make sure that max_file_uploads is set to 20 by-default in all places 2009-11-05 13:29:34 +00:00
Ilia Alshanetsky
e2211cee86 Introduced a max_file_uploads INI setting, which is set to limit the
number of file uploads per-request to 100 by default, to prevent possible
DOS via temporary file exhaustion.
2009-10-27 16:13:48 +00:00
Gwynne Raskind
c08473090c MFH: document the hash name functionality available since 5.3 2009-07-17 13:22:56 +00:00
Stanislav Malyshev
c7eb83def9 add intl option 2009-07-13 23:57:20 +00:00
Lukas Smith
84dcca9f48 MFH: removed references to track_vars, since this option doesnt exist since ages 2009-07-02 13:34:38 +00:00
Johannes Schlüter
ccb33c060f MFH Add missing ini entries (Mikko) 2009-06-28 17:56:18 +00:00
Johannes Schlüter
6d68dbc331 MFH: Add ibase settings 2009-06-28 16:41:17 +00:00
Johannes Schlüter
3840317d40 MFH: Add two ini settings and remove ini setting which is commented out in code 2009-06-28 15:56:19 +00:00
Johannes Schlüter
79e1cf2fe0 MFH: fix typo 2009-06-28 15:29:24 +00:00
Johannes Schlüter
c9fa89534c MFH: Add missing MySQL entries 2009-06-28 15:21:19 +00:00
Hannes Magnusson
3ca8e5ab0f - Remove outdated version information
- Remove no-longer-existing windows dll (there could be more..)
- List missing INI directives (need to add descriptions to them and sort
  them correctly..)
2009-06-27 13:29:53 +00:00
Pierre Joye
8991998d7a - win extension_dir 2009-05-04 15:20:38 +00:00
Philip Olson
c1ccccc658 Implemented new shorter URLs for ini settings (ex: php.net/short-open-tag) 2009-04-10 01:18:49 +00:00
Philip Olson
9d2c39ac41 Fixed typo 2009-04-10 00:10:31 +00:00
Hannes Magnusson
d038c5f0db MFH: Mention which directives are hardcoded using the CLI SAPI 2009-04-06 08:37:33 +00:00
Pierre Joye
3526fe5dad - update extension= 2009-03-26 18:45:37 +00:00
Eric Stewart
0b41f612ac Corrected missing comment. 2009-03-26 01:38:53 +00:00
Eric Stewart
e0669bf1ab 1. Involves an mbstring setting correction regarding:
http://marc.info/?l=php-cvs&m=123596904426621&w=2

2. Added mbstring.http_output_conv_mimetype directive.

3. Adds an additional comment including XOR in the list of usable bitwise operators.

4. Note regarding the merge of E_STRICT into E_ALL in PHP 6.0.0.

5. Notes regarding [PATH] and [HOST] use in CGI/FastCGI.
2009-03-23 02:36:34 +00:00
Johannes Schlüter
c3fcaf1d7d MFH: Replace old php.ini files with the new ones according to
http://wiki.php.net/rfc/newinis (by Eric Lee Stewart)
2009-03-17 19:19:17 +00:00