diff --git a/httpd/proc.c b/httpd/proc.c
index ae238797c..07c92c2b3 100644
--- a/httpd/proc.c
+++ b/httpd/proc.c
@@ -1203,6 +1203,8 @@ static const char *getmimetype(const char *name)
         return "text/html";
     else if (strstr(name, ".css"))
         return "text/css"; 
+    else if (strstr(name, ".php"))
+        return "application/x-http-php"; 
     else
         return "application/octet-stream";
 }
diff --git a/ssl/tls1_clnt.c b/ssl/tls1_clnt.c
index 616c78976..196b40ed3 100644
--- a/ssl/tls1_clnt.c
+++ b/ssl/tls1_clnt.c
@@ -158,9 +158,10 @@ int do_client_connect(SSL *ssl)
             if (ret < SSL_OK)
                 break;
         }
+
+        ssl->hs_status = ret;            /* connected? */    
     }
 
-    ssl->hs_status = ret;            /* connected? */
     return ret;
 }