1 --- php-5.2.9/php.ini-recommended.ORIG Thu Jan 29 12:15:27 2009 |
1 --- php-5.2.17/php.ini-recommended.ORIG Tue Feb 1 21:23:46 2011 |
2 +++ php-5.2.9/php.ini-recommended Thu Jan 29 12:17:55 2009 |
2 +++ php-5.2.17/php.ini-recommended Mon Jan 17 08:53:16 2011 |
3 @@ -523,6 +523,7 @@ |
3 @@ -523,6 +523,7 @@ |
4 |
4 |
5 ; UNIX: "/path1:/path2" |
5 ; UNIX: "/path1:/path2" |
6 ;include_path = ".:/php/includes" |
6 ;include_path = ".:/php/includes" |
7 +;include_path = ".:/var/php/<<VERSION>>/pear" |
7 +;include_path = ".:/var/php/<<VERSION>>/pear" |
15 -extension_dir = "./" |
15 -extension_dir = "./" |
16 +extension_dir = "/usr/php/<<VERSION>>/modules:/var/php/<<VERSION>>/modules" |
16 +extension_dir = "/usr/php/<<VERSION>>/modules:/var/php/<<VERSION>>/modules" |
17 |
17 |
18 ; Whether or not to enable the dl() function. The dl() function does NOT work |
18 ; Whether or not to enable the dl() function. The dl() function does NOT work |
19 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically |
19 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically |
20 @@ -620,7 +621,7 @@ |
20 @@ -623,7 +624,7 @@ |
21 ; user_agent="PHP" |
21 ; user_agent="PHP" |
22 |
22 |
23 ; Default timeout for socket based streams (seconds) |
23 ; Default timeout for socket based streams (seconds) |
24 -default_socket_timeout = 60 |
24 -default_socket_timeout = 60 |
25 +default_socket_timeout = 1800 |
25 +default_socket_timeout = 1800 |
26 |
26 |
27 ; If your scripts have to deal with files from Macintosh systems, |
27 ; If your scripts have to deal with files from Macintosh systems, |
28 ; or you are running on a Mac and need to deal with files from |
28 ; or you are running on a Mac and need to deal with files from |
29 @@ -650,60 +651,12 @@ |
29 @@ -653,60 +654,12 @@ |
30 ; Note that it should be the name of the module only; no directory information |
30 ; Note that it should be the name of the module only; no directory information |
31 ; needs to go here. Specify the location of the extension with the |
31 ; needs to go here. Specify the location of the extension with the |
32 ; extension_dir directive above. |
32 ; extension_dir directive above. |
33 +; |
33 +; |
34 +; Bundled extensions are configured to load automatically within extension |
34 +; Bundled extensions are configured to load automatically within extension |
44 - |
44 - |
45 -;extension=php_bz2.dll |
45 -;extension=php_bz2.dll |
46 -;extension=php_curl.dll |
46 -;extension=php_curl.dll |
47 -;extension=php_dba.dll |
47 -;extension=php_dba.dll |
48 -;extension=php_dbase.dll |
48 -;extension=php_dbase.dll |
49 -;extension=php_exif.dll |
|
50 -;extension=php_fdf.dll |
49 -;extension=php_fdf.dll |
51 -;extension=php_gd2.dll |
50 -;extension=php_gd2.dll |
52 -;extension=php_gettext.dll |
51 -;extension=php_gettext.dll |
53 -;extension=php_gmp.dll |
52 -;extension=php_gmp.dll |
54 -;extension=php_ifx.dll |
53 -;extension=php_ifx.dll |
55 -;extension=php_imap.dll |
54 -;extension=php_imap.dll |
56 -;extension=php_interbase.dll |
55 -;extension=php_interbase.dll |
57 -;extension=php_ldap.dll |
56 -;extension=php_ldap.dll |
58 -;extension=php_mbstring.dll |
57 -;extension=php_mbstring.dll |
|
58 -;extension=php_exif.dll |
59 -;extension=php_mcrypt.dll |
59 -;extension=php_mcrypt.dll |
60 -;extension=php_mhash.dll |
60 -;extension=php_mhash.dll |
61 -;extension=php_mime_magic.dll |
61 -;extension=php_mime_magic.dll |
62 -;extension=php_ming.dll |
62 -;extension=php_ming.dll |
63 -;extension=php_msql.dll |
63 -;extension=php_msql.dll |
89 -;extension=php_zip.dll |
89 -;extension=php_zip.dll |
90 - |
90 - |
91 ;;;;;;;;;;;;;;;;;;; |
91 ;;;;;;;;;;;;;;;;;;; |
92 ; Module Settings ; |
92 ; Module Settings ; |
93 ;;;;;;;;;;;;;;;;;;; |
93 ;;;;;;;;;;;;;;;;;;; |
94 @@ -1041,6 +994,7 @@ |
94 @@ -1044,6 +997,7 @@ |
95 ; where MODE is the octal representation of the mode. Note that this |
95 ; where MODE is the octal representation of the mode. Note that this |
96 ; does not overwrite the process's umask. |
96 ; does not overwrite the process's umask. |
97 ;session.save_path = "/tmp" |
97 ;session.save_path = "/tmp" |
98 +session.save_path = "/var/php/<<VERSION>>/sessions" |
98 +session.save_path = "/var/php/<<VERSION>>/sessions" |
99 |
99 |
100 ; Whether to use cookies. |
100 ; Whether to use cookies. |
101 session.use_cookies = 1 |
101 session.use_cookies = 1 |
102 @@ -1079,11 +1033,11 @@ |
102 @@ -1082,11 +1036,11 @@ |
103 ; on each request. |
103 ; on each request. |
104 |
104 |
105 session.gc_probability = 1 |
105 session.gc_probability = 1 |
106 -session.gc_divisor = 1000 |
106 -session.gc_divisor = 1000 |
107 +session.gc_divisor = 5000 |
107 +session.gc_divisor = 5000 |
111 -session.gc_maxlifetime = 1440 |
111 -session.gc_maxlifetime = 1440 |
112 +session.gc_maxlifetime = 6000 |
112 +session.gc_maxlifetime = 6000 |
113 |
113 |
114 ; NOTE: If you are using the subdirectory option for storing session files |
114 ; NOTE: If you are using the subdirectory option for storing session files |
115 ; (see session.save_path above), then garbage collection does *not* |
115 ; (see session.save_path above), then garbage collection does *not* |
116 @@ -1111,12 +1065,11 @@ |
116 @@ -1114,12 +1068,11 @@ |
117 session.entropy_length = 0 |
117 session.entropy_length = 0 |
118 |
118 |
119 ; Specified here to create the session id. |
119 ; Specified here to create the session id. |
120 -session.entropy_file = |
120 -session.entropy_file = |
121 +;session.entropy_file = |
121 +;session.entropy_file = |