Change port to use apache by default on win7, update test expectations.

LayoutTests/http/conf/win-httpd.conf

 Timeout 300
 KeepAlive On
 MaxKeepAliveRequests 100
 KeepAliveTimeout 15
 
+LoadModule alias_module modules/mod_alias.so
+LoadModule asis_module modules/mod_asis.so
 LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule include_module modules/mod_include.so
+LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule cgi_module modules/mod_cgi.so 
+LoadModule headers_module modules/mod_headers.so
 LoadModule log_config_module modules/mod_log_config.so
-LoadModule headers_module modules/mod_headers.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule php5_module modules/php5apache2_2.dll
+LoadModule rewrite_module modules/mod_rewrite.so
 LoadModule ssl_module modules/mod_ssl.so
-LoadModule mime_module modules/mod_mime.so
-LoadModule asis_module modules/mod_asis.so
-LoadModule cgi_module modules/mod_cgi.so
-LoadModule negotiation_module modules/mod_negotiation.so
-LoadModule imagemap_module modules/mod_imagemap.so
-LoadModule actions_module modules/mod_actions.so
-LoadModule alias_module modules/mod_alias.so
-LoadModule rewrite_module modules/mod_rewrite.so
-LoadModule php5_module modules/php5apache2_2.dll
-LoadModule autoindex_module modules/mod_autoindex.so
 
 ServerName 127.0.0.1
 
 ScriptInterpreterSource Registry-Strict
 
 <Directory />
     Options Indexes FollowSymLinks MultiViews ExecCGI Includes
     AllowOverride All
     Order allow,deny
     Allow from all
@@ skipping 107 matching lines @@
     Order allow,deny
     Deny from all
     Satisfy All
 </Files>
 
 <Directory  ~ ".*\.\.namedfork">
     Order allow,deny
     Deny from all
     Satisfy All
 </Directory>