Implement a default_socket_timeout and auto_detect_line_endings ini options.

Also move user_agent from BG to FG.

1 files changed, 10 insertions, 1 deletions

diff --git a/php.ini-dist b/php.ini-dist
index 83cfc94351..fc2211be0c 100644
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -215,7 +215,6 @@ expose_php = On
 max_execution_time = 30     ; Maximum execution time of each script, in seconds
 memory_limit = 8M      ; Maximum amount of memory a script may consume (8MB)
 
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Error handling and logging ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -469,6 +468,16 @@ allow_url_fopen = On
 ; Define the User-Agent string
 ; 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 ;