Can't login to admin after upgrading to 1.3.9g

[joeljordan]

Configure Files both reflect the following:

define('HTTP_SERVER', 'http://www.domain.com');
define('HTTPS_SERVER', 'https://www.domain.com');
define('HTTP_CATALOG_SERVER', 'http://www.domain.com');
define('HTTPS_CATALOG_SERVER', 'https://www.domain.com');

Originally, they did not have the "www" preceding the domain name. I have tried removing and re-adding "www" but neither works.

So, inside my /admin was another .htaccess file. I deleted the following:

# $Id: .htaccess 1105 2005-04-04 22:05:35Z birdbrain $
#
# This is used with Apache WebServers
#
# For this to work, you must include the parameter 'Options' to
# the AllowOverride configuration
#
# Example:
#
# <Directory "/usr/local/apache/htdocs">
# AllowOverride Options
# </Directory>
#
# 'All' with also work. (This configuration is in the
# apache/conf/httpd.conf file)
# The following makes adjustments to the SSL protocol for Internet
# Explorer browsers
<IfModule mod_setenvif.c>
<IfDefine SSL>
SetEnvIf User-Agent ".*MSIE.*" \
nokeepalive ssl-unclean-shutdown \
downgrade-1.0 force-response-1.0
</IfDefine>
</IfModule>
# Fix certain PHP values
#<IfModule mod_php4.c>
# php_value session.use_trans_sid 0
# php_value register_globals 1
#</IfModule>
# to turn off register_globals
# php_value register_globals 0

And now everything works fine.

Did I need to keep any of that in there?