Index: .htaccess
===================================================================
RCS file: /cvs/drupal/drupal/.htaccess,v
retrieving revision 1.60
diff -u -r1.60 .htaccess
--- .htaccess	28 Jan 2005 16:30:37 -0000	1.60
+++ .htaccess	14 Feb 2005 07:06:20 -0000
@@ -29,13 +29,9 @@
    php_value magic_quotes_gpc        0
    php_value magic_quotes_runtime    0
    php_value magic_quotes_sybase     0
    php_value arg_separator.output    "&"
-   php_value session.cache_expire    200000
-   php_value session.gc_maxlifetime  200000
-   php_value session.cookie_lifetime 2000000
    php_value session.auto_start      0
-   php_value session.save_handler    user
-   php_value session.cache_limiter   none
    php_value allow_call_time_pass_reference  On
 </IfModule>
Index: sites/default/settings.php
===================================================================
RCS file: /cvs/drupal/drupal/sites/default/settings.php,v
retrieving revision 1.5
diff -u -r1.5 settings.php
--- settings.php	25 Jan 2005 20:40:34 -0000	1.5
+++ settings.php	14 Feb 2005 20:58:26 -0000
@@ -43,9 +43,20 @@
 #
 # PHP settings:
 #
-#   To see what PHP settings are known to work well, take a look at
-#   the .htaccesss file in Drupal's root directory.  If you get
-#   unexpected warnings or errors, double-check your PHP settings.
+#   To see what PHP settings are known to work well, read the PHP
+#   documentation at http://www.php.net/manual/en/ini.php#ini.list
+#   and take a look at the .htaccess file to see which settings are
+#   used there. Settings defined here should not be duplicated there
+#   to avoid conflict issues.
+ini_set('session.cache_expire', 200000);
+ini_set('session.cache_limiter', 'none');
+ini_set('session.gc_maxlifetime', 200000);
+ini_set('session.cookie_lifetime', 2000000);
+ini_set('session.save_handler', 'user');
+// ini_set('session.cookie_path', '/drupal');        // Specify cookie path if site is in a subdirectory
+// ini_set('session.save_path', '/home/drupal/tmp'); // Specify a local session directory for greater security
+// ini_set('session.use_only_cookies', 1);           // Disable URL based session management
+// ini_set('session.use_trans_sid', 1);              // Disable URL based session management
 
 #
 # Variable overrides: