summaryrefslogtreecommitdiff
path: root/php.ini-recommended
diff options
context:
space:
mode:
authorWez Furlong <wez@php.net>2002-09-23 18:12:39 +0000
committerWez Furlong <wez@php.net>2002-09-23 18:12:39 +0000
commitc74b9faca5fbd00b0be1dc0ac9906eb5a85b6ef2 (patch)
treeec2d7fc126798f475afb9e8726343bbeea0f4d2e /php.ini-recommended
parent8dde69004255a6f9696182f0f55423f9d09a2073 (diff)
downloadphp-git-c74b9faca5fbd00b0be1dc0ac9906eb5a85b6ef2.tar.gz
Implement a default_socket_timeout and auto_detect_line_endings ini options.
Also move user_agent from BG to FG.
Diffstat (limited to 'php.ini-recommended')
-rw-r--r--php.ini-recommended11
1 files changed, 11 insertions, 0 deletions
diff --git a/php.ini-recommended b/php.ini-recommended
index 9f4d745f59..ecbc97291c 100644
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -483,6 +483,17 @@ allow_url_fopen = On
; Define the user agent for php to send
;user_agent="PHP"
+; Default timeout for socket based streams (seconds)
+default_socket_timeout = 60
+
+; If your scripts have to deal with files from Macintosh systems,
+; or you are running on a Mac and need to deal with files from
+; unix or win32 systems, setting this flag will cause PHP to
+; automatically detect the EOL character in those files so that
+; fgets() and file() will work regardless of the source of the file.
+; auto_detect_line_endings = Off
+
+
;;;;;;;;;;;;;;;;;;;;;;
; Dynamic Extensions ;
;;;;;;;;;;;;;;;;;;;;;;