From cd28f3caaee1ae2172f9a9afff18049d8822a6dd Mon Sep 17 00:00:00 2001 From: cameronrich Date: Fri, 30 Sep 2011 09:41:05 +0000 Subject: [PATCH] Fixed issue with non-blocking client mode. Added php mime type. git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@219 9a5d90b5-6617-0410-8a86-bb477d3ed2e3 --- httpd/proc.c | 2 ++ ssl/tls1_clnt.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) 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; }