diff --git a/thirdparty/HttpServer/HttpServer.dll b/thirdparty/HttpServer/HttpServer.dll old mode 100755 new mode 100644 index 9158aec4a..57ceaea73 Binary files a/thirdparty/HttpServer/HttpServer.dll and b/thirdparty/HttpServer/HttpServer.dll differ diff --git a/thirdparty/HttpServer/removed-urlencode-usage.diff b/thirdparty/HttpServer/removed-urlencode-usage.diff new file mode 100644 index 000000000..1ebd818de --- /dev/null +++ b/thirdparty/HttpServer/removed-urlencode-usage.diff @@ -0,0 +1,266 @@ +From 4e4239cf74e23e13c3bee808104d8d213e40fe39 Mon Sep 17 00:00:00 2001 +From: Kenneth Skovhede +Date: Wed, 23 Jul 2014 15:04:20 +0200 +Subject: [PATCH] Removed usage of HttpUtility UrlEncode and + HttpUtility.UrlDecode as these has issues on Mono. + +--- + HttpServer/HttpHelper.cs | 2 +- + HttpServer/HttpRequest.cs | 4 +- + HttpServer/HttpServer.csproj | 1 + + HttpServer/HttpUtilityHelper.cs | 171 ++++++++++++++++++++++++++++++++++++++++ + HttpServer/RequestCookie.cs | 2 +- + HttpServer/ResponseCookie.cs | 2 +- + 6 files changed, 177 insertions(+), 5 deletions(-) + create mode 100644 HttpServer/HttpUtilityHelper.cs + +diff --git a/HttpServer/HttpHelper.cs b/HttpServer/HttpHelper.cs +index 8d11daa..a0d286f 100755 +--- a/HttpServer/HttpHelper.cs ++++ b/HttpServer/HttpHelper.cs +@@ -165,7 +165,7 @@ namespace HttpServer + + private static void Add(IHttpInput input, string name, string value) + { +- input.Add(HttpUtility.UrlDecode(name), HttpUtility.UrlDecode(value)); ++ input.Add(HttpUtilityHelper.UrlDecode(name), HttpUtilityHelper.UrlDecode(value)); + } + } + } +diff --git a/HttpServer/HttpRequest.cs b/HttpServer/HttpRequest.cs +index a52dbed..cacbb7d 100755 +--- a/HttpServer/HttpRequest.cs ++++ b/HttpServer/HttpRequest.cs +@@ -54,12 +54,12 @@ namespace HttpServer + _queryString = HttpHelper.ParseQueryString(_uriPath.Substring(pos + 1)); + _param.SetQueryString(_queryString); + string path = _uriPath.Substring(0, pos); +- _uriPath = System.Web.HttpUtility.UrlDecode(path) + "?" + _uriPath.Substring(pos + 1); ++ _uriPath = HttpUtilityHelper.UrlDecode(path) + "?" + _uriPath.Substring(pos + 1); + UriParts = value.Substring(0, pos).Split(UriSplitters, StringSplitOptions.RemoveEmptyEntries); + } + else + { +- _uriPath = System.Web.HttpUtility.UrlDecode(_uriPath); ++ _uriPath = HttpUtilityHelper.UrlDecode(_uriPath); + UriParts = value.Split(UriSplitters, StringSplitOptions.RemoveEmptyEntries); + } + } +diff --git a/HttpServer/HttpServer.csproj b/HttpServer/HttpServer.csproj +index 81bb2eb..431c406 100644 +--- a/HttpServer/HttpServer.csproj ++++ b/HttpServer/HttpServer.csproj +@@ -134,6 +134,7 @@ + + + ++ + + + ++ ++ ++ + +\ No newline at end of file +diff --git a/HttpServer/httpserver.pfx b/HttpServer/httpserver.pfx +deleted file mode 100755 +index 2ba33088b51785a8dbf88106abf0ec3dd7a54994..0000000000000000000000000000000000000000 +GIT binary patch +literal 0 +HcmV?d00001 + +literal 1756 +zcmY+DeK^zm8^^!juNgM-Sou+mQu2`R6k2pLTIFH;$?!W!GUGT()AF!n7l!$fB&?QB +zO((|DD33*XN`<2(x$4;RkVeaM#Zt1<`POwFu5*2^`*Yv->%Q;L_4(s|!yNP=1ggLs +zbP-y^io2h?qy?&hB^-1nii1u=FdOEmH2$lkQjX%NTtlz`u}f&|pHrF`5Gvt7jW7qQ +zh1a1me_`bDRVei*dsTfO@!?4bQhS2pK>4v(nvZ(m->x{ukuARbs-5CAvx~Odw=Us@ +zHHEuWyb>e4zy4H7c`2i!-x8iqIy^cuzWrRWu*hd((}SF*$Nm{IVU0tGPkA1w}DKewdTx{k#_6FH6@`-P~O49^#UuQPTYF49;krZ}UN5r8U?pbQha{Ql@L+|pl9S#M=Z6t|l +zKfk`Z>B8FVa}m1_-sb1O;+*dBvGAnt&{XLq=Ybi;wV~B{E`1?K(s5F^`p#Lr$Yz5* +zv~RO?e1K50Q01G7;jbO>(TqBWdoZ9LZN)aSiuLC;FWQaq!(}Nt^3p81R#97UOyy4R +z-|_p`ujAtGbYm6*xn^Bt_7myNajS^Wk&}Zq_qB{q6V2!5MLo+kH#;_(v)k-auM2B~ +zoyxv9o=-d@KGrU-pbw=RB%EvsVq9Q|Kz;bUB7LOUmGJPuchG#0JI*0jlXlq4HQ4@XV({ZoJ=U&0hV$rxrSp>4``XckDKS%DSoRxUvs`Z5O>nQJP4B-X +z{rPhPUZ=uJK~_F_B!gIYilUFZUFI|dkS;zaJe$N)Sm#Y=&RvB0kI`jWyoN8Hy_t7qb)s=9~$lsGw^cGlUQ@s4-Zu(r!KKQo@;7@vFUS4i=p +zTrB3{)B0ikzt>!2H6D#ZfdBx&!T&%5JjKKtI0e9fJ>ZBOJm3zv0R+GnAR^2i$!&q{ +zh$jGhzp?FzCnAwOLiZx(fZUG2HlzbaJPBaKA!rS2G>8H@PP!o8$AkiqfggczfC(^w +z6Np6uaR3gWBKKEv4EO=b+>!Vs5Q{Jdk~4uYB#!zvg#&!P^(7z~9f$y!h!WfW{=FI+ +z5$8<=i69U_T-iSr@LzI8f0ZlW(-L$2=g-Ms<(kTYSS!?c5AsuitcZL2~DGuaURhGUU)idEHbtKpL$yYq3UbK +z%KO&A&o#83L$m7wNSk2GjKRck7xs-?_yF_Frmc+djXVb_Gq72G%wcQGdDFVlf%myn +z?Jc_40Q!NHlq+rQL?YSl04s8#-zl!Dmz5mR>ovZo+~Priuko_mE%12erZ1+ts)JOV +zOi|UX|9?JxC`%CPQ{mFh-*`6u1hYHlRfwb4yCLwdf}rOe?P=rRlx)VG;3eHFHVFxx|79-3m_y}N9mQY1 +zaD#X6P)EGKl6);zmysusr$?tSm0hh#f@-R^gQB%oF;kWeJHw{18d}wQl?r5pGDzzU +wttb-R{;yd~$(5O1HS>f0S=&(t-0ZzaPrWSnZT7qu`SceL-kH&*xUY-*2gkbk^#A|> + +diff --git a/HttpServer/test.snk b/HttpServer/test.snk +deleted file mode 100755 +index 8da3182b4ebfb542507eb7ef48ffbfce2bf3995b..0000000000000000000000000000000000000000 +GIT binary patch +literal 0 +HcmV?d00001 + +literal 596 +zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097bzgeh{8PZA&elL^}7m-6lG|{kbaa9P5 +z6e@YDGh=|GP9%|kZDq^AxDp8i8ol~tW*zyPCUH^Y0q!HZ`nqyF+b?rNIuOl6sJ%lW +zlMb&1^h=-twO35$90By~P4G-7iifzzpVSD}Bs+gQv@iL2u8^ioiXa*UMGvLryokaD +zUd}+4OdXNRIong?<<6!9K$)!7 +zByqNO1qp1^_%$`#e+>@`pd;RK{7uWBj<2KCFZnO%#TTJDxSw+v(~D(u#{CaVH$Nxr +zzyiIV;fL=Bs+Gq!@zn0M*%Ne)SNZFA@!M-ZJ$2Q%g3NUhR!8qA0#} +zSJY#IGkNYv4L$XLA)9v59%3fY#qPdXYvdKy)H +iTkg*w>*3ZPja^HsjVZRb