Merge in the latest fixes from 0.9.6a-beta3.

These changes will be part of OpenSSL 0.9.6a beta3 [engine]

apps/s_server.c

@@ -1395,9 +1395,6 @@ static int www_body(char *hostname, int s, unsigned char *context)
 
 				switch (dot)
 					{
-				case 0:
-					dot = (e[0] == '/') ? 1 : 0;
-					break;
 				case 1:
 					dot = (e[0] == '.') ? 2 : 0;
 					break;
@@ -1408,6 +1405,8 @@ static int www_body(char *hostname, int s, unsigned char *context)
 					dot = (e[0] == '/') ? -1 : 0;
 					break;
 					}
+				if (dot == 0)
+					dot = (e[0] == '/') ? 1 : 0;
 				}
 			dot = (dot == 3) || (dot == -1); /* filename contains ".." component */