From 6b41b193276ddb798e617c55c2a26c0f24a887d5 Mon Sep 17 00:00:00 2001
From: Davide Beatrici <davidebeatrici@gmail.com>
Date: Sun, 20 Oct 2019 01:12:55 +0200
Subject: [PATCH 1/4] Mayaqua.h: include <stddef.h>, for "wchar_t"

---
 src/Mayaqua/Mayaqua.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Mayaqua/Mayaqua.h b/src/Mayaqua/Mayaqua.h
index 63c2edc3..07b27726 100644
--- a/src/Mayaqua/Mayaqua.h
+++ b/src/Mayaqua/Mayaqua.h
@@ -8,6 +8,8 @@
 #ifndef	MAYAQUA_H
 #define	MAYAQUA_H
 
+#include <stddef.h>
+
 // PenCore.dll related
 #define	PENCORE_DLL_NAME		"|PenCore.dll"
 // #define	PENCORE_DLL_NAME_X64	"|PenCore_x64.dll" // commonized to x86

From 04ecbf843aa9397eac3968b0876133573a3d803e Mon Sep 17 00:00:00 2001
From: Davide Beatrici <davidebeatrici@gmail.com>
Date: Sun, 20 Oct 2019 00:44:57 +0200
Subject: [PATCH 2/4] Mayaqua.h: include <stdio.h> for "FILE"

---
 src/Mayaqua/Mayaqua.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Mayaqua/Mayaqua.h b/src/Mayaqua/Mayaqua.h
index 07b27726..1e176fa5 100644
--- a/src/Mayaqua/Mayaqua.h
+++ b/src/Mayaqua/Mayaqua.h
@@ -9,6 +9,7 @@
 #define	MAYAQUA_H
 
 #include <stddef.h>
+#include <stdio.h>
 
 // PenCore.dll related
 #define	PENCORE_DLL_NAME		"|PenCore.dll"

From c3d6ffc533c50adf132aafe9010b186758193c9a Mon Sep 17 00:00:00 2001
From: Davide Beatrici <davidebeatrici@gmail.com>
Date: Sun, 20 Oct 2019 00:46:36 +0200
Subject: [PATCH 3/4] Move GetMimeTypeFromFileName() and related structure to
 Mayaqua

The structure (containing all mimetypes) occupies almost 700 lines, which are a lot.

This is just the beginning of the refactor plan.
---
 src/Cedar/CedarType.h      |   1 -
 src/Cedar/Protocol.c       | 720 ------------------------------------
 src/Cedar/Protocol.h       |   8 -
 src/Mayaqua/HTTP.c         | 723 +++++++++++++++++++++++++++++++++++++
 src/Mayaqua/HTTP.h         |  13 +
 src/Mayaqua/MayaType.h     |   3 +-
 src/Mayaqua/Mayaqua.h      |   3 +
 src/Mayaqua/Mayaqua.vcproj |   8 +
 8 files changed, 749 insertions(+), 730 deletions(-)
 create mode 100644 src/Mayaqua/HTTP.c
 create mode 100644 src/Mayaqua/HTTP.h

diff --git a/src/Cedar/CedarType.h b/src/Cedar/CedarType.h
index e9190e25..8b821996 100644
--- a/src/Cedar/CedarType.h
+++ b/src/Cedar/CedarType.h
@@ -137,7 +137,6 @@ typedef struct BLACK BLACK;
 typedef struct SEND_SIGNATURE_PARAM SEND_SIGNATURE_PARAM;
 typedef struct UPDATE_CLIENT UPDATE_CLIENT;
 typedef struct UPDATE_CLIENT_SETTING UPDATE_CLIENT_SETTING;
-typedef struct HTTP_MIME_TYPE HTTP_MIME_TYPE;
 
 
 // ==============================================================
diff --git a/src/Cedar/Protocol.c b/src/Cedar/Protocol.c
index 52eb839d..482efba8 100644
--- a/src/Cedar/Protocol.c
+++ b/src/Cedar/Protocol.c
@@ -9,726 +9,6 @@
 
 static UCHAR ssl_packet_start[3] = {0x17, 0x03, 0x00};
 
-// MIME list from https://www.freeformatter.com/mime-types-list.html
-static HTTP_MIME_TYPE http_mime_types[] =
-{
-	{".x3d", "application/vnd.hzn-3d-crossword"},
-	{".3gp", "video/3gpp"},
-	{".3g2", "video/3gpp2"},
-	{".mseq", "application/vnd.mseq"},
-	{".pwn", "application/vnd.3m.post-it-notes"},
-	{".plb", "application/vnd.3gpp.pic-bw-large"},
-	{".psb", "application/vnd.3gpp.pic-bw-small"},
-	{".pvb", "application/vnd.3gpp.pic-bw-var"},
-	{".tcap", "application/vnd.3gpp2.tcap"},
-	{".7z", "application/x-7z-compressed"},
-	{".abw", "application/x-abiword"},
-	{".ace", "application/x-ace-compressed"},
-	{".acc", "application/vnd.americandynamics.acc"},
-	{".acu", "application/vnd.acucobol"},
-	{".atc", "application/vnd.acucorp"},
-	{".adp", "audio/adpcm"},
-	{".aab", "application/x-authorware-bin"},
-	{".aam", "application/x-authorware-map"},
-	{".aas", "application/x-authorware-seg"},
-	{".air", "application/vnd.adobe.air-application-installer-package+zip"},
-	{".swf", "application/x-shockwave-flash"},
-	{".fxp", "application/vnd.adobe.fxp"},
-	{".pdf", "application/pdf"},
-	{".ppd", "application/vnd.cups-ppd"},
-	{".dir", "application/x-director"},
-	{".xdp", "application/vnd.adobe.xdp+xml"},
-	{".xfdf", "application/vnd.adobe.xfdf"},
-	{".aac", "audio/x-aac"},
-	{".ahead", "application/vnd.ahead.space"},
-	{".azf", "application/vnd.airzip.filesecure.azf"},
-	{".azs", "application/vnd.airzip.filesecure.azs"},
-	{".azw", "application/vnd.amazon.ebook"},
-	{".ami", "application/vnd.amiga.ami"},
-	{".apk", "application/vnd.android.package-archive"},
-	{".cii", "application/vnd.anser-web-certificate-issue-initiation"},
-	{".fti", "application/vnd.anser-web-funds-transfer-initiation"},
-	{".atx", "application/vnd.antix.game-component"},
-	{".dmg", "application/x-apple-diskimage"},
-	{".mpkg", "application/vnd.apple.installer+xml"},
-	{".aw", "application/applixware"},
-	{".les", "application/vnd.hhe.lesson-player"},
-	{".swi", "application/vnd.aristanetworks.swi"},
-	{".s", "text/x-asm"},
-	{".atomcat", "application/atomcat+xml"},
-	{".atomsvc", "application/atomsvc+xml"},
-	{".atom", "application/atom+xml"},
-	{".ac", "application/pkix-attr-cert"},
-	{".aif", "audio/x-aiff"},
-	{".avi", "video/x-msvideo"},
-	{".aep", "application/vnd.audiograph"},
-	{".dxf", "image/vnd.dxf"},
-	{".dwf", "model/vnd.dwf"},
-	{".par", "text/plain-bas"},
-	{".bcpio", "application/x-bcpio"},
-	{".bin", "application/octet-stream"},
-	{".bmp", "image/bmp"},
-	{".torrent", "application/x-bittorrent"},
-	{".cod", "application/vnd.rim.cod"},
-	{".mpm", "application/vnd.blueice.multipass"},
-	{".bmi", "application/vnd.bmi"},
-	{".sh", "application/x-sh"},
-	{".btif", "image/prs.btif"},
-	{".rep", "application/vnd.businessobjects"},
-	{".bz", "application/x-bzip"},
-	{".bz2", "application/x-bzip2"},
-	{".csh", "application/x-csh"},
-	{".c", "text/x-c"},
-	{".cdxml", "application/vnd.chemdraw+xml"},
-	{".css", "text/css"},
-	{".cdx", "chemical/x-cdx"},
-	{".cml", "chemical/x-cml"},
-	{".csml", "chemical/x-csml"},
-	{".cdbcmsg", "application/vnd.contact.cmsg"},
-	{".cla", "application/vnd.claymore"},
-	{".c4g", "application/vnd.clonk.c4group"},
-	{".sub", "image/vnd.dvb.subtitle"},
-	{".cdmia", "application/cdmi-capability"},
-	{".cdmic", "application/cdmi-container"},
-	{".cdmid", "application/cdmi-domain"},
-	{".cdmio", "application/cdmi-object"},
-	{".cdmiq", "application/cdmi-queue"},
-	{".c11amc", "application/vnd.cluetrust.cartomobile-config"},
-	{".c11amz", "application/vnd.cluetrust.cartomobile-config-pkg"},
-	{".ras", "image/x-cmu-raster"},
-	{".dae", "model/vnd.collada+xml"},
-	{".csv", "text/csv"},
-	{".cpt", "application/mac-compactpro"},
-	{".wmlc", "application/vnd.wap.wmlc"},
-	{".cgm", "image/cgm"},
-	{".ice", "x-conference/x-cooltalk"},
-	{".cmx", "image/x-cmx"},
-	{".xar", "application/vnd.xara"},
-	{".cmc", "application/vnd.cosmocaller"},
-	{".cpio", "application/x-cpio"},
-	{".clkx", "application/vnd.crick.clicker"},
-	{".clkk", "application/vnd.crick.clicker.keyboard"},
-	{".clkp", "application/vnd.crick.clicker.palette"},
-	{".clkt", "application/vnd.crick.clicker.template"},
-	{".clkw", "application/vnd.crick.clicker.wordbank"},
-	{".wbs", "application/vnd.criticaltools.wbs+xml"},
-	{".cryptonote", "application/vnd.rig.cryptonote"},
-	{".cif", "chemical/x-cif"},
-	{".cmdf", "chemical/x-cmdf"},
-	{".cu", "application/cu-seeme"},
-	{".cww", "application/prs.cww"},
-	{".curl", "text/vnd.curl"},
-	{".dcurl", "text/vnd.curl.dcurl"},
-	{".mcurl", "text/vnd.curl.mcurl"},
-	{".scurl", "text/vnd.curl.scurl"},
-	{".car", "application/vnd.curl.car"},
-	{".pcurl", "application/vnd.curl.pcurl"},
-	{".cmp", "application/vnd.yellowriver-custom-menu"},
-	{".dssc", "application/dssc+der"},
-	{".xdssc", "application/dssc+xml"},
-	{".deb", "application/x-debian-package"},
-	{".uva", "audio/vnd.dece.audio"},
-	{".uvi", "image/vnd.dece.graphic"},
-	{".uvh", "video/vnd.dece.hd"},
-	{".uvm", "video/vnd.dece.mobile"},
-	{".uvu", "video/vnd.uvvu.mp4"},
-	{".uvp", "video/vnd.dece.pd"},
-	{".uvs", "video/vnd.dece.sd"},
-	{".uvv", "video/vnd.dece.video"},
-	{".dvi", "application/x-dvi"},
-	{".seed", "application/vnd.fdsn.seed"},
-	{".dtb", "application/x-dtbook+xml"},
-	{".res", "application/x-dtbresource+xml"},
-	{".ait", "application/vnd.dvb.ait"},
-	{".svc", "application/vnd.dvb.service"},
-	{".eol", "audio/vnd.digital-winds"},
-	{".djvu", "image/vnd.djvu"},
-	{".dtd", "application/xml-dtd"},
-	{".mlp", "application/vnd.dolby.mlp"},
-	{".wad", "application/x-doom"},
-	{".dpg", "application/vnd.dpgraph"},
-	{".dra", "audio/vnd.dra"},
-	{".dfac", "application/vnd.dreamfactory"},
-	{".dts", "audio/vnd.dts"},
-	{".dtshd", "audio/vnd.dts.hd"},
-	{".dwg", "image/vnd.dwg"},
-	{".geo", "application/vnd.dynageo"},
-	{".es", "application/ecmascript"},
-	{".mag", "application/vnd.ecowin.chart"},
-	{".mmr", "image/vnd.fujixerox.edmics-mmr"},
-	{".rlc", "image/vnd.fujixerox.edmics-rlc"},
-	{".exi", "application/exi"},
-	{".mgz", "application/vnd.proteus.magazine"},
-	{".epub", "application/epub+zip"},
-	{".eml", "message/rfc822"},
-	{".nml", "application/vnd.enliven"},
-	{".xpr", "application/vnd.is-xpr"},
-	{".xif", "image/vnd.xiff"},
-	{".xfdl", "application/vnd.xfdl"},
-	{".emma", "application/emma+xml"},
-	{".ez2", "application/vnd.ezpix-album"},
-	{".ez3", "application/vnd.ezpix-package"},
-	{".fst", "image/vnd.fst"},
-	{".fvt", "video/vnd.fvt"},
-	{".fbs", "image/vnd.fastbidsheet"},
-	{".fe_launch", "application/vnd.denovo.fcselayout-link"},
-	{".f4v", "video/x-f4v"},
-	{".flv", "video/x-flv"},
-	{".fpx", "image/vnd.fpx"},
-	{".npx", "image/vnd.net-fpx"},
-	{".flx", "text/vnd.fmi.flexstor"},
-	{".fli", "video/x-fli"},
-	{".ftc", "application/vnd.fluxtime.clip"},
-	{".fdf", "application/vnd.fdf"},
-	{".f", "text/x-fortran"},
-	{".mif", "application/vnd.mif"},
-	{".fm", "application/vnd.framemaker"},
-	{".fh", "image/x-freehand"},
-	{".fsc", "application/vnd.fsc.weblaunch"},
-	{".fnc", "application/vnd.frogans.fnc"},
-	{".ltf", "application/vnd.frogans.ltf"},
-	{".ddd", "application/vnd.fujixerox.ddd"},
-	{".xdw", "application/vnd.fujixerox.docuworks"},
-	{".xbd", "application/vnd.fujixerox.docuworks.binder"},
-	{".oas", "application/vnd.fujitsu.oasys"},
-	{".oa2", "application/vnd.fujitsu.oasys2"},
-	{".oa3", "application/vnd.fujitsu.oasys3"},
-	{".fg5", "application/vnd.fujitsu.oasysgp"},
-	{".bh2", "application/vnd.fujitsu.oasysprs"},
-	{".spl", "application/x-futuresplash"},
-	{".fzs", "application/vnd.fuzzysheet"},
-	{".g3", "image/g3fax"},
-	{".gmx", "application/vnd.gmx"},
-	{".gtw", "model/vnd.gtw"},
-	{".txd", "application/vnd.genomatix.tuxedo"},
-	{".ggb", "application/vnd.geogebra.file"},
-	{".ggt", "application/vnd.geogebra.tool"},
-	{".gdl", "model/vnd.gdl"},
-	{".gex", "application/vnd.geometry-explorer"},
-	{".gxt", "application/vnd.geonext"},
-	{".g2w", "application/vnd.geoplan"},
-	{".g3w", "application/vnd.geospace"},
-	{".gsf", "application/x-font-ghostscript"},
-	{".bdf", "application/x-font-bdf"},
-	{".gtar", "application/x-gtar"},
-	{".texinfo", "application/x-texinfo"},
-	{".gnumeric", "application/x-gnumeric"},
-	{".kml", "application/vnd.google-earth.kml+xml"},
-	{".kmz", "application/vnd.google-earth.kmz"},
-	{".gqf", "application/vnd.grafeq"},
-	{".gif", "image/gif"},
-	{".gv", "text/vnd.graphviz"},
-	{".gac", "application/vnd.groove-account"},
-	{".ghf", "application/vnd.groove-help"},
-	{".gim", "application/vnd.groove-identity-message"},
-	{".grv", "application/vnd.groove-injector"},
-	{".gtm", "application/vnd.groove-tool-message"},
-	{".tpl", "application/vnd.groove-tool-template"},
-	{".vcg", "application/vnd.groove-vcard"},
-	{".h261", "video/h261"},
-	{".h263", "video/h263"},
-	{".h264", "video/h264"},
-	{".hpid", "application/vnd.hp-hpid"},
-	{".hps", "application/vnd.hp-hps"},
-	{".hdf", "application/x-hdf"},
-	{".rip", "audio/vnd.rip"},
-	{".hbci", "application/vnd.hbci"},
-	{".jlt", "application/vnd.hp-jlyt"},
-	{".pcl", "application/vnd.hp-pcl"},
-	{".hpgl", "application/vnd.hp-hpgl"},
-	{".hvs", "application/vnd.yamaha.hv-script"},
-	{".hvd", "application/vnd.yamaha.hv-dic"},
-	{".hvp", "application/vnd.yamaha.hv-voice"},
-	{".sfd-hdstx", "application/vnd.hydrostatix.sof-data"},
-	{".stk", "application/hyperstudio"},
-	{".hal", "application/vnd.hal+xml"},
-	{".htm", "text/html; charset=utf-8"},
-	{".html", "text/html; charset=utf-8"},
-	{".irm", "application/vnd.ibm.rights-management"},
-	{".sc", "application/vnd.ibm.secure-container"},
-	{".ics", "text/calendar"},
-	{".icc", "application/vnd.iccprofile"},
-	{".ico", "image/x-icon"},
-	{".igl", "application/vnd.igloader"},
-	{".ief", "image/ief"},
-	{".ivp", "application/vnd.immervision-ivp"},
-	{".ivu", "application/vnd.immervision-ivu"},
-	{".rif", "application/reginfo+xml"},
-	{".3dml", "text/vnd.in3d.3dml"},
-	{".spot", "text/vnd.in3d.spot"},
-	{".igs", "model/iges"},
-	{".i2g", "application/vnd.intergeo"},
-	{".cdy", "application/vnd.cinderella"},
-	{".xpw", "application/vnd.intercon.formnet"},
-	{".fcs", "application/vnd.isac.fcs"},
-	{".ipfix", "application/ipfix"},
-	{".cer", "application/pkix-cert"},
-	{".pki", "application/pkixcmp"},
-	{".crl", "application/pkix-crl"},
-	{".pkipath", "application/pkix-pkipath"},
-	{".igm", "application/vnd.insors.igm"},
-	{".rcprofile", "application/vnd.ipunplugged.rcprofile"},
-	{".irp", "application/vnd.irepository.package+xml"},
-	{".jad", "text/vnd.sun.j2me.app-descriptor"},
-	{".jar", "application/java-archive"},
-	{".class", "application/java-vm"},
-	{".jnlp", "application/x-java-jnlp-file"},
-	{".ser", "application/java-serialized-object"},
-	{".java", "text/x-java-source"},
-	{".js", "application/javascript"},
-	{".json", "application/json"},
-	{".joda", "application/vnd.joost.joda-archive"},
-	{".jpm", "video/jpm"},
-	{".jpg", "image/jpeg"},
-	{".jpeg", "image/jpeg"},
-	{".pjpeg", "image/pjpeg"},
-	{".jpgv", "video/jpeg"},
-	{".ktz", "application/vnd.kahootz"},
-	{".mmd", "application/vnd.chipnuts.karaoke-mmd"},
-	{".karbon", "application/vnd.kde.karbon"},
-	{".chrt", "application/vnd.kde.kchart"},
-	{".kfo", "application/vnd.kde.kformula"},
-	{".flw", "application/vnd.kde.kivio"},
-	{".kon", "application/vnd.kde.kontour"},
-	{".kpr", "application/vnd.kde.kpresenter"},
-	{".ksp", "application/vnd.kde.kspread"},
-	{".kwd", "application/vnd.kde.kword"},
-	{".htke", "application/vnd.kenameaapp"},
-	{".kia", "application/vnd.kidspiration"},
-	{".kne", "application/vnd.kinar"},
-	{".sse", "application/vnd.kodak-descriptor"},
-	{".lasxml", "application/vnd.las.las+xml"},
-	{".latex", "application/x-latex"},
-	{".lbd", "application/vnd.llamagraphics.life-balance.desktop"},
-	{".lbe", "application/vnd.llamagraphics.life-balance.exchange+xml"},
-	{".jam", "application/vnd.jam"},
-	{"0.123", "application/vnd.lotus-1-2-3"},
-	{".apr", "application/vnd.lotus-approach"},
-	{".pre", "application/vnd.lotus-freelance"},
-	{".nsf", "application/vnd.lotus-notes"},
-	{".org", "application/vnd.lotus-organizer"},
-	{".scm", "application/vnd.lotus-screencam"},
-	{".lwp", "application/vnd.lotus-wordpro"},
-	{".lvp", "audio/vnd.lucent.voice"},
-	{".m3u", "audio/x-mpegurl"},
-	{".m4v", "video/x-m4v"},
-	{".hqx", "application/mac-binhex40"},
-	{".portpkg", "application/vnd.macports.portpkg"},
-	{".mgp", "application/vnd.osgeo.mapguide.package"},
-	{".mrc", "application/marc"},
-	{".mrcx", "application/marcxml+xml"},
-	{".mxf", "application/mxf"},
-	{".nbp", "application/vnd.wolfram.player"},
-	{".ma", "application/mathematica"},
-	{".mathml", "application/mathml+xml"},
-	{".mbox", "application/mbox"},
-	{".mc1", "application/vnd.medcalcdata"},
-	{".mscml", "application/mediaservercontrol+xml"},
-	{".cdkey", "application/vnd.mediastation.cdkey"},
-	{".mwf", "application/vnd.mfer"},
-	{".mfm", "application/vnd.mfmp"},
-	{".msh", "model/mesh"},
-	{".mads", "application/mads+xml"},
-	{".mets", "application/mets+xml"},
-	{".mods", "application/mods+xml"},
-	{".meta4", "application/metalink4+xml"},
-	{".mcd", "application/vnd.mcd"},
-	{".flo", "application/vnd.micrografx.flo"},
-	{".igx", "application/vnd.micrografx.igx"},
-	{".es3", "application/vnd.eszigno3+xml"},
-	{".mdb", "application/x-msaccess"},
-	{".asf", "video/x-ms-asf"},
-	{".exe", "application/x-msdownload"},
-	{".cil", "application/vnd.ms-artgalry"},
-	{".cab", "application/vnd.ms-cab-compressed"},
-	{".ims", "application/vnd.ms-ims"},
-	{".application", "application/x-ms-application"},
-	{".clp", "application/x-msclip"},
-	{".mdi", "image/vnd.ms-modi"},
-	{".eot", "application/vnd.ms-fontobject"},
-	{".xls", "application/vnd.ms-excel"},
-	{".xlam", "application/vnd.ms-excel.addin.macroenabled.12"},
-	{".xlsb", "application/vnd.ms-excel.sheet.binary.macroenabled.12"},
-	{".xltm", "application/vnd.ms-excel.template.macroenabled.12"},
-	{".xlsm", "application/vnd.ms-excel.sheet.macroenabled.12"},
-	{".chm", "application/vnd.ms-htmlhelp"},
-	{".crd", "application/x-mscardfile"},
-	{".lrm", "application/vnd.ms-lrm"},
-	{".mvb", "application/x-msmediaview"},
-	{".mny", "application/x-msmoney"},
-	{".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation"},
-	{".sldx", "application/vnd.openxmlformats-officedocument.presentationml.slide"},
-	{".ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow"},
-	{".potx", "application/vnd.openxmlformats-officedocument.presentationml.template"},
-	{".xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"},
-	{".xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template"},
-	{".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document"},
-	{".dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template"},
-	{".obd", "application/x-msbinder"},
-	{".thmx", "application/vnd.ms-officetheme"},
-	{".onetoc", "application/onenote"},
-	{".pya", "audio/vnd.ms-playready.media.pya"},
-	{".pyv", "video/vnd.ms-playready.media.pyv"},
-	{".ppt", "application/vnd.ms-powerpoint"},
-	{".ppam", "application/vnd.ms-powerpoint.addin.macroenabled.12"},
-	{".sldm", "application/vnd.ms-powerpoint.slide.macroenabled.12"},
-	{".pptm", "application/vnd.ms-powerpoint.presentation.macroenabled.12"},
-	{".ppsm", "application/vnd.ms-powerpoint.slideshow.macroenabled.12"},
-	{".potm", "application/vnd.ms-powerpoint.template.macroenabled.12"},
-	{".mpp", "application/vnd.ms-project"},
-	{".pub", "application/x-mspublisher"},
-	{".scd", "application/x-msschedule"},
-	{".xap", "application/x-silverlight-app"},
-	{".stl", "application/vnd.ms-pki.stl"},
-	{".cat", "application/vnd.ms-pki.seccat"},
-	{".vsd", "application/vnd.visio"},
-	{".vsdx", "application/vnd.visio2013"},
-	{".wm", "video/x-ms-wm"},
-	{".wma", "audio/x-ms-wma"},
-	{".wax", "audio/x-ms-wax"},
-	{".wmx", "video/x-ms-wmx"},
-	{".wmd", "application/x-ms-wmd"},
-	{".wpl", "application/vnd.ms-wpl"},
-	{".wmz", "application/x-ms-wmz"},
-	{".wmv", "video/x-ms-wmv"},
-	{".wvx", "video/x-ms-wvx"},
-	{".wmf", "application/x-msmetafile"},
-	{".trm", "application/x-msterminal"},
-	{".doc", "application/msword"},
-	{".docm", "application/vnd.ms-word.document.macroenabled.12"},
-	{".dotm", "application/vnd.ms-word.template.macroenabled.12"},
-	{".wri", "application/x-mswrite"},
-	{".wps", "application/vnd.ms-works"},
-	{".xbap", "application/x-ms-xbap"},
-	{".xps", "application/vnd.ms-xpsdocument"},
-	{".mid", "audio/midi"},
-	{".mpy", "application/vnd.ibm.minipay"},
-	{".afp", "application/vnd.ibm.modcap"},
-	{".rms", "application/vnd.jcp.javame.midlet-rms"},
-	{".tmo", "application/vnd.tmobile-livetv"},
-	{".prc", "application/x-mobipocket-ebook"},
-	{".mbk", "application/vnd.mobius.mbk"},
-	{".dis", "application/vnd.mobius.dis"},
-	{".plc", "application/vnd.mobius.plc"},
-	{".mqy", "application/vnd.mobius.mqy"},
-	{".msl", "application/vnd.mobius.msl"},
-	{".txf", "application/vnd.mobius.txf"},
-	{".daf", "application/vnd.mobius.daf"},
-	{".fly", "text/vnd.fly"},
-	{".mpc", "application/vnd.mophun.certificate"},
-	{".mpn", "application/vnd.mophun.application"},
-	{".mj2", "video/mj2"},
-	{".mpga", "audio/mpeg"},
-	{".mxu", "video/vnd.mpegurl"},
-	{".mpeg", "video/mpeg"},
-	{".m21", "application/mp21"},
-	{".mp4a", "audio/mp4"},
-	{".mp4", "video/mp4"},
-	{".mp4", "application/mp4"},
-	{".m3u8", "application/vnd.apple.mpegurl"},
-	{".mus", "application/vnd.musician"},
-	{".msty", "application/vnd.muvee.style"},
-	{".mxml", "application/xv+xml"},
-	{".ngdat", "application/vnd.nokia.n-gage.data"},
-	{".n-gage", "application/vnd.nokia.n-gage.symbian.install"},
-	{".ncx", "application/x-dtbncx+xml"},
-	{".nc", "application/x-netcdf"},
-	{".nlu", "application/vnd.neurolanguage.nlu"},
-	{".dna", "application/vnd.dna"},
-	{".nnd", "application/vnd.noblenet-directory"},
-	{".nns", "application/vnd.noblenet-sealer"},
-	{".nnw", "application/vnd.noblenet-web"},
-	{".rpst", "application/vnd.nokia.radio-preset"},
-	{".rpss", "application/vnd.nokia.radio-presets"},
-	{".n3", "text/n3"},
-	{".edm", "application/vnd.novadigm.edm"},
-	{".edx", "application/vnd.novadigm.edx"},
-	{".ext", "application/vnd.novadigm.ext"},
-	{".gph", "application/vnd.flographit"},
-	{".ecelp4800", "audio/vnd.nuera.ecelp4800"},
-	{".ecelp7470", "audio/vnd.nuera.ecelp7470"},
-	{".ecelp9600", "audio/vnd.nuera.ecelp9600"},
-	{".oda", "application/oda"},
-	{".ogx", "application/ogg"},
-	{".oga", "audio/ogg"},
-	{".ogv", "video/ogg"},
-	{".dd2", "application/vnd.oma.dd2+xml"},
-	{".oth", "application/vnd.oasis.opendocument.text-web"},
-	{".opf", "application/oebps-package+xml"},
-	{".qbo", "application/vnd.intu.qbo"},
-	{".oxt", "application/vnd.openofficeorg.extension"},
-	{".osf", "application/vnd.yamaha.openscoreformat"},
-	{".weba", "audio/webm"},
-	{".webm", "video/webm"},
-	{".odc", "application/vnd.oasis.opendocument.chart"},
-	{".otc", "application/vnd.oasis.opendocument.chart-template"},
-	{".odb", "application/vnd.oasis.opendocument.database"},
-	{".odf", "application/vnd.oasis.opendocument.formula"},
-	{".odft", "application/vnd.oasis.opendocument.formula-template"},
-	{".odg", "application/vnd.oasis.opendocument.graphics"},
-	{".otg", "application/vnd.oasis.opendocument.graphics-template"},
-	{".odi", "application/vnd.oasis.opendocument.image"},
-	{".oti", "application/vnd.oasis.opendocument.image-template"},
-	{".odp", "application/vnd.oasis.opendocument.presentation"},
-	{".otp", "application/vnd.oasis.opendocument.presentation-template"},
-	{".ods", "application/vnd.oasis.opendocument.spreadsheet"},
-	{".ots", "application/vnd.oasis.opendocument.spreadsheet-template"},
-	{".odt", "application/vnd.oasis.opendocument.text"},
-	{".odm", "application/vnd.oasis.opendocument.text-master"},
-	{".ott", "application/vnd.oasis.opendocument.text-template"},
-	{".ktx", "image/ktx"},
-	{".sxc", "application/vnd.sun.xml.calc"},
-	{".stc", "application/vnd.sun.xml.calc.template"},
-	{".sxd", "application/vnd.sun.xml.draw"},
-	{".std", "application/vnd.sun.xml.draw.template"},
-	{".sxi", "application/vnd.sun.xml.impress"},
-	{".sti", "application/vnd.sun.xml.impress.template"},
-	{".sxm", "application/vnd.sun.xml.math"},
-	{".sxw", "application/vnd.sun.xml.writer"},
-	{".sxg", "application/vnd.sun.xml.writer.global"},
-	{".stw", "application/vnd.sun.xml.writer.template"},
-	{".otf", "application/x-font-otf"},
-	{".osfpvg", "application/vnd.yamaha.openscoreformat.osfpvg+xml"},
-	{".dp", "application/vnd.osgi.dp"},
-	{".pdb", "application/vnd.palm"},
-	{".p", "text/x-pascal"},
-	{".paw", "application/vnd.pawaafile"},
-	{".pclxl", "application/vnd.hp-pclxl"},
-	{".efif", "application/vnd.picsel"},
-	{".pcx", "image/x-pcx"},
-	{".psd", "image/vnd.adobe.photoshop"},
-	{".prf", "application/pics-rules"},
-	{".pic", "image/x-pict"},
-	{".chat", "application/x-chat"},
-	{".p10", "application/pkcs10"},
-	{".p12", "application/x-pkcs12"},
-	{".p7m", "application/pkcs7-mime"},
-	{".p7s", "application/pkcs7-signature"},
-	{".p7r", "application/x-pkcs7-certreqresp"},
-	{".p7b", "application/x-pkcs7-certificates"},
-	{".p8", "application/pkcs8"},
-	{".plf", "application/vnd.pocketlearn"},
-	{".pnm", "image/x-portable-anymap"},
-	{".pbm", "image/x-portable-bitmap"},
-	{".pcf", "application/x-font-pcf"},
-	{".pfr", "application/font-tdpfr"},
-	{".pgn", "application/x-chess-pgn"},
-	{".pgm", "image/x-portable-graymap"},
-	{".png", "image/png"},
-	{".png", "image/x-citrix-png"},
-	{".png", "image/x-png"},
-	{".ppm", "image/x-portable-pixmap"},
-	{".pskcxml", "application/pskc+xml"},
-	{".pml", "application/vnd.ctc-posml"},
-	{".ai", "application/postscript"},
-	{".pfa", "application/x-font-type1"},
-	{".pbd", "application/vnd.powerbuilder6"},
-	{".pgp", "application/pgp-encrypted"},
-	{".pgp", "application/pgp-signature"},
-	{".box", "application/vnd.previewsystems.box"},
-	{".ptid", "application/vnd.pvi.ptid1"},
-	{".pls", "application/pls+xml"},
-	{".str", "application/vnd.pg.format"},
-	{".ei6", "application/vnd.pg.osasli"},
-	{".dsc", "text/prs.lines.tag"},
-	{".psf", "application/x-font-linux-psf"},
-	{".qps", "application/vnd.publishare-delta-tree"},
-	{".wg", "application/vnd.pmi.widget"},
-	{".qxd", "application/vnd.quark.quarkxpress"},
-	{".esf", "application/vnd.epson.esf"},
-	{".msf", "application/vnd.epson.msf"},
-	{".ssf", "application/vnd.epson.ssf"},
-	{".qam", "application/vnd.epson.quickanime"},
-	{".qfx", "application/vnd.intu.qfx"},
-	{".qt", "video/quicktime"},
-	{".rar", "application/x-rar-compressed"},
-	{".ram", "audio/x-pn-realaudio"},
-	{".rmp", "audio/x-pn-realaudio-plugin"},
-	{".rsd", "application/rsd+xml"},
-	{".rm", "application/vnd.rn-realmedia"},
-	{".bed", "application/vnd.realvnc.bed"},
-	{".mxl", "application/vnd.recordare.musicxml"},
-	{".musicxml", "application/vnd.recordare.musicxml+xml"},
-	{".rnc", "application/relax-ng-compact-syntax"},
-	{".rdz", "application/vnd.data-vision.rdz"},
-	{".rdf", "application/rdf+xml"},
-	{".rp9", "application/vnd.cloanto.rp9"},
-	{".jisp", "application/vnd.jisp"},
-	{".rtf", "application/rtf"},
-	{".rtx", "text/richtext"},
-	{".link66", "application/vnd.route66.link66+xml"},
-	{".rss", "application/rss+xml"},
-	{".shf", "application/shf+xml"},
-	{".st", "application/vnd.sailingtracker.track"},
-	{".svg", "image/svg+xml"},
-	{".sus", "application/vnd.sus-calendar"},
-	{".sru", "application/sru+xml"},
-	{".setpay", "application/set-payment-initiation"},
-	{".setreg", "application/set-registration-initiation"},
-	{".sema", "application/vnd.sema"},
-	{".semd", "application/vnd.semd"},
-	{".semf", "application/vnd.semf"},
-	{".see", "application/vnd.seemail"},
-	{".snf", "application/x-font-snf"},
-	{".spq", "application/scvp-vp-request"},
-	{".spp", "application/scvp-vp-response"},
-	{".scq", "application/scvp-cv-request"},
-	{".scs", "application/scvp-cv-response"},
-	{".sdp", "application/sdp"},
-	{".etx", "text/x-setext"},
-	{".movie", "video/x-sgi-movie"},
-	{".ifm", "application/vnd.shana.informed.formdata"},
-	{".itp", "application/vnd.shana.informed.formtemplate"},
-	{".iif", "application/vnd.shana.informed.interchange"},
-	{".ipk", "application/vnd.shana.informed.package"},
-	{".tfi", "application/thraud+xml"},
-	{".shar", "application/x-shar"},
-	{".rgb", "image/x-rgb"},
-	{".slt", "application/vnd.epson.salt"},
-	{".aso", "application/vnd.accpac.simply.aso"},
-	{".imp", "application/vnd.accpac.simply.imp"},
-	{".twd", "application/vnd.simtech-mindmapper"},
-	{".csp", "application/vnd.commonspace"},
-	{".saf", "application/vnd.yamaha.smaf-audio"},
-	{".mmf", "application/vnd.smaf"},
-	{".spf", "application/vnd.yamaha.smaf-phrase"},
-	{".teacher", "application/vnd.smart.teacher"},
-	{".svd", "application/vnd.svd"},
-	{".rq", "application/sparql-query"},
-	{".srx", "application/sparql-results+xml"},
-	{".gram", "application/srgs"},
-	{".grxml", "application/srgs+xml"},
-	{".ssml", "application/ssml+xml"},
-	{".skp", "application/vnd.koan"},
-	{".sgml", "text/sgml"},
-	{".sdc", "application/vnd.stardivision.calc"},
-	{".sda", "application/vnd.stardivision.draw"},
-	{".sdd", "application/vnd.stardivision.impress"},
-	{".smf", "application/vnd.stardivision.math"},
-	{".sdw", "application/vnd.stardivision.writer"},
-	{".sgl", "application/vnd.stardivision.writer-global"},
-	{".sm", "application/vnd.stepmania.stepchart"},
-	{".sit", "application/x-stuffit"},
-	{".sitx", "application/x-stuffitx"},
-	{".sdkm", "application/vnd.solent.sdkm+xml"},
-	{".xo", "application/vnd.olpc-sugar"},
-	{".au", "audio/basic"},
-	{".wqd", "application/vnd.wqd"},
-	{".sis", "application/vnd.symbian.install"},
-	{".smi", "application/smil+xml"},
-	{".xsm", "application/vnd.syncml+xml"},
-	{".bdm", "application/vnd.syncml.dm+wbxml"},
-	{".xdm", "application/vnd.syncml.dm+xml"},
-	{".sv4cpio", "application/x-sv4cpio"},
-	{".sv4crc", "application/x-sv4crc"},
-	{".sbml", "application/sbml+xml"},
-	{".tsv", "text/tab-separated-values"},
-	{".tiff", "image/tiff"},
-	{".tao", "application/vnd.tao.intent-module-archive"},
-	{".tar", "application/x-tar"},
-	{".tcl", "application/x-tcl"},
-	{".tex", "application/x-tex"},
-	{".tfm", "application/x-tex-tfm"},
-	{".tei", "application/tei+xml"},
-	{".txt", "text/plain; charset=utf-8"},
-	{".md", "text/markdown; charset=utf-8"},
-	{".dxp", "application/vnd.spotfire.dxp"},
-	{".sfs", "application/vnd.spotfire.sfs"},
-	{".tsd", "application/timestamped-data"},
-	{".tpt", "application/vnd.trid.tpt"},
-	{".mxs", "application/vnd.triscape.mxs"},
-	{".t", "text/troff"},
-	{".tra", "application/vnd.trueapp"},
-	{".ttf", "application/x-font-ttf"},
-	{".ttl", "text/turtle"},
-	{".umj", "application/vnd.umajin"},
-	{".uoml", "application/vnd.uoml+xml"},
-	{".unityweb", "application/vnd.unity"},
-	{".ufd", "application/vnd.ufdl"},
-	{".uri", "text/uri-list"},
-	{".utz", "application/vnd.uiq.theme"},
-	{".ustar", "application/x-ustar"},
-	{".uu", "text/x-uuencode"},
-	{".vcs", "text/x-vcalendar"},
-	{".vcf", "text/x-vcard"},
-	{".vcd", "application/x-cdlink"},
-	{".vsf", "application/vnd.vsf"},
-	{".wrl", "model/vrml"},
-	{".vcx", "application/vnd.vcx"},
-	{".mts", "model/vnd.mts"},
-	{".vtu", "model/vnd.vtu"},
-	{".vis", "application/vnd.visionary"},
-	{".viv", "video/vnd.vivo"},
-	{".ccxml", "application/ccxml+xml"},
-	{".vxml", "application/voicexml+xml"},
-	{".src", "application/x-wais-source"},
-	{".wbxml", "application/vnd.wap.wbxml"},
-	{".wbmp", "image/vnd.wap.wbmp"},
-	{".wav", "audio/x-wav"},
-	{".davmount", "application/davmount+xml"},
-	{".woff", "application/x-font-woff"},
-	{".wspolicy", "application/wspolicy+xml"},
-	{".webp", "image/webp"},
-	{".wtb", "application/vnd.webturbo"},
-	{".wgt", "application/widget"},
-	{".hlp", "application/winhlp"},
-	{".wml", "text/vnd.wap.wml"},
-	{".wmls", "text/vnd.wap.wmlscript"},
-	{".wmlsc", "application/vnd.wap.wmlscriptc"},
-	{".wpd", "application/vnd.wordperfect"},
-	{".stf", "application/vnd.wt.stf"},
-	{".wsdl", "application/wsdl+xml"},
-	{".xbm", "image/x-xbitmap"},
-	{".xpm", "image/x-xpixmap"},
-	{".xwd", "image/x-xwindowdump"},
-	{".der", "application/x-x509-ca-cert"},
-	{".fig", "application/x-xfig"},
-	{".xhtml", "application/xhtml+xml"},
-	{".xml", "application/xml"},
-	{".xdf", "application/xcap-diff+xml"},
-	{".xenc", "application/xenc+xml"},
-	{".xer", "application/patch-ops-error+xml"},
-	{".rl", "application/resource-lists+xml"},
-	{".rs", "application/rls-services+xml"},
-	{".rld", "application/resource-lists-diff+xml"},
-	{".xslt", "application/xslt+xml"},
-	{".xop", "application/xop+xml"},
-	{".xpi", "application/x-xpinstall"},
-	{".xspf", "application/xspf+xml"},
-	{".xul", "application/vnd.mozilla.xul+xml"},
-	{".xyz", "chemical/x-xyz"},
-	{".yaml", "text/yaml"},
-	{".yang", "application/yang"},
-	{".yin", "application/yin+xml"},
-	{".zir", "application/vnd.zul"},
-	{".zip", "application/zip"},
-	{".zmm", "application/vnd.handheld-entertainment+xml"},
-	{".zaz", "application/vnd.zzazz.deck+xml"},
-};
-
-// Get HTTP MIME type from filename
-char *GetMimeTypeFromFileName(char *filename)
-{
-	UINT i;
-	UINT num = sizeof(http_mime_types) / sizeof(HTTP_MIME_TYPE);
-	if (filename == NULL)
-	{
-		return NULL;
-	}
-
-	for (i = 0;i < num;i++)
-	{
-		HTTP_MIME_TYPE *a = &http_mime_types[i];
-
-		if (EndWith(filename, a->Extension))
-		{
-			return a->MimeType;
-		}
-	}
-
-	return NULL;
-}
-
 // Download and save intermediate certificates if necessary
 bool DownloadAndSaveIntermediateCertificatesIfNecessary(X *x)
 {
diff --git a/src/Cedar/Protocol.h b/src/Cedar/Protocol.h
index 78e4b6ef..fabc0887 100644
--- a/src/Cedar/Protocol.h
+++ b/src/Cedar/Protocol.h
@@ -8,13 +8,6 @@
 #ifndef	PROTOCOL_H
 #define	PROTOCOL_H
 
-// MIME types
-struct HTTP_MIME_TYPE
-{
-	char *Extension;
-	char *MimeType;
-};
-
 // The parameters that will be passed to the certificate confirmation thread
 struct CHECK_CERT_THREAD_PROC
 {
@@ -197,6 +190,5 @@ X *FindCertIssuerFromCertList(LIST *o, X *x);
 bool TryGetRootCertChain(LIST *o, X *x, bool auto_save, X **found_root_x);
 bool TryGetParentCertFromCertList(LIST *o, X *x, LIST *found_chain);
 bool DownloadAndSaveIntermediateCertificatesIfNecessary(X *x);
-char *GetMimeTypeFromFileName(char *filename);
 
 #endif	// PROTOCOL_H
diff --git a/src/Mayaqua/HTTP.c b/src/Mayaqua/HTTP.c
new file mode 100644
index 00000000..153d9854
--- /dev/null
+++ b/src/Mayaqua/HTTP.c
@@ -0,0 +1,723 @@
+#include <GlobalConst.h>
+
+#include <Mayaqua/Mayaqua.h>
+
+// MIME list from https://www.freeformatter.com/mime-types-list.html
+static const HTTP_MIME_TYPE http_mime_types[] =
+{
+	{".x3d", "application/vnd.hzn-3d-crossword"},
+	{".3gp", "video/3gpp"},
+	{".3g2", "video/3gpp2"},
+	{".mseq", "application/vnd.mseq"},
+	{".pwn", "application/vnd.3m.post-it-notes"},
+	{".plb", "application/vnd.3gpp.pic-bw-large"},
+	{".psb", "application/vnd.3gpp.pic-bw-small"},
+	{".pvb", "application/vnd.3gpp.pic-bw-var"},
+	{".tcap", "application/vnd.3gpp2.tcap"},
+	{".7z", "application/x-7z-compressed"},
+	{".abw", "application/x-abiword"},
+	{".ace", "application/x-ace-compressed"},
+	{".acc", "application/vnd.americandynamics.acc"},
+	{".acu", "application/vnd.acucobol"},
+	{".atc", "application/vnd.acucorp"},
+	{".adp", "audio/adpcm"},
+	{".aab", "application/x-authorware-bin"},
+	{".aam", "application/x-authorware-map"},
+	{".aas", "application/x-authorware-seg"},
+	{".air", "application/vnd.adobe.air-application-installer-package+zip"},
+	{".swf", "application/x-shockwave-flash"},
+	{".fxp", "application/vnd.adobe.fxp"},
+	{".pdf", "application/pdf"},
+	{".ppd", "application/vnd.cups-ppd"},
+	{".dir", "application/x-director"},
+	{".xdp", "application/vnd.adobe.xdp+xml"},
+	{".xfdf", "application/vnd.adobe.xfdf"},
+	{".aac", "audio/x-aac"},
+	{".ahead", "application/vnd.ahead.space"},
+	{".azf", "application/vnd.airzip.filesecure.azf"},
+	{".azs", "application/vnd.airzip.filesecure.azs"},
+	{".azw", "application/vnd.amazon.ebook"},
+	{".ami", "application/vnd.amiga.ami"},
+	{".apk", "application/vnd.android.package-archive"},
+	{".cii", "application/vnd.anser-web-certificate-issue-initiation"},
+	{".fti", "application/vnd.anser-web-funds-transfer-initiation"},
+	{".atx", "application/vnd.antix.game-component"},
+	{".dmg", "application/x-apple-diskimage"},
+	{".mpkg", "application/vnd.apple.installer+xml"},
+	{".aw", "application/applixware"},
+	{".les", "application/vnd.hhe.lesson-player"},
+	{".swi", "application/vnd.aristanetworks.swi"},
+	{".s", "text/x-asm"},
+	{".atomcat", "application/atomcat+xml"},
+	{".atomsvc", "application/atomsvc+xml"},
+	{".atom", "application/atom+xml"},
+	{".ac", "application/pkix-attr-cert"},
+	{".aif", "audio/x-aiff"},
+	{".avi", "video/x-msvideo"},
+	{".aep", "application/vnd.audiograph"},
+	{".dxf", "image/vnd.dxf"},
+	{".dwf", "model/vnd.dwf"},
+	{".par", "text/plain-bas"},
+	{".bcpio", "application/x-bcpio"},
+	{".bin", "application/octet-stream"},
+	{".bmp", "image/bmp"},
+	{".torrent", "application/x-bittorrent"},
+	{".cod", "application/vnd.rim.cod"},
+	{".mpm", "application/vnd.blueice.multipass"},
+	{".bmi", "application/vnd.bmi"},
+	{".sh", "application/x-sh"},
+	{".btif", "image/prs.btif"},
+	{".rep", "application/vnd.businessobjects"},
+	{".bz", "application/x-bzip"},
+	{".bz2", "application/x-bzip2"},
+	{".csh", "application/x-csh"},
+	{".c", "text/x-c"},
+	{".cdxml", "application/vnd.chemdraw+xml"},
+	{".css", "text/css"},
+	{".cdx", "chemical/x-cdx"},
+	{".cml", "chemical/x-cml"},
+	{".csml", "chemical/x-csml"},
+	{".cdbcmsg", "application/vnd.contact.cmsg"},
+	{".cla", "application/vnd.claymore"},
+	{".c4g", "application/vnd.clonk.c4group"},
+	{".sub", "image/vnd.dvb.subtitle"},
+	{".cdmia", "application/cdmi-capability"},
+	{".cdmic", "application/cdmi-container"},
+	{".cdmid", "application/cdmi-domain"},
+	{".cdmio", "application/cdmi-object"},
+	{".cdmiq", "application/cdmi-queue"},
+	{".c11amc", "application/vnd.cluetrust.cartomobile-config"},
+	{".c11amz", "application/vnd.cluetrust.cartomobile-config-pkg"},
+	{".ras", "image/x-cmu-raster"},
+	{".dae", "model/vnd.collada+xml"},
+	{".csv", "text/csv"},
+	{".cpt", "application/mac-compactpro"},
+	{".wmlc", "application/vnd.wap.wmlc"},
+	{".cgm", "image/cgm"},
+	{".ice", "x-conference/x-cooltalk"},
+	{".cmx", "image/x-cmx"},
+	{".xar", "application/vnd.xara"},
+	{".cmc", "application/vnd.cosmocaller"},
+	{".cpio", "application/x-cpio"},
+	{".clkx", "application/vnd.crick.clicker"},
+	{".clkk", "application/vnd.crick.clicker.keyboard"},
+	{".clkp", "application/vnd.crick.clicker.palette"},
+	{".clkt", "application/vnd.crick.clicker.template"},
+	{".clkw", "application/vnd.crick.clicker.wordbank"},
+	{".wbs", "application/vnd.criticaltools.wbs+xml"},
+	{".cryptonote", "application/vnd.rig.cryptonote"},
+	{".cif", "chemical/x-cif"},
+	{".cmdf", "chemical/x-cmdf"},
+	{".cu", "application/cu-seeme"},
+	{".cww", "application/prs.cww"},
+	{".curl", "text/vnd.curl"},
+	{".dcurl", "text/vnd.curl.dcurl"},
+	{".mcurl", "text/vnd.curl.mcurl"},
+	{".scurl", "text/vnd.curl.scurl"},
+	{".car", "application/vnd.curl.car"},
+	{".pcurl", "application/vnd.curl.pcurl"},
+	{".cmp", "application/vnd.yellowriver-custom-menu"},
+	{".dssc", "application/dssc+der"},
+	{".xdssc", "application/dssc+xml"},
+	{".deb", "application/x-debian-package"},
+	{".uva", "audio/vnd.dece.audio"},
+	{".uvi", "image/vnd.dece.graphic"},
+	{".uvh", "video/vnd.dece.hd"},
+	{".uvm", "video/vnd.dece.mobile"},
+	{".uvu", "video/vnd.uvvu.mp4"},
+	{".uvp", "video/vnd.dece.pd"},
+	{".uvs", "video/vnd.dece.sd"},
+	{".uvv", "video/vnd.dece.video"},
+	{".dvi", "application/x-dvi"},
+	{".seed", "application/vnd.fdsn.seed"},
+	{".dtb", "application/x-dtbook+xml"},
+	{".res", "application/x-dtbresource+xml"},
+	{".ait", "application/vnd.dvb.ait"},
+	{".svc", "application/vnd.dvb.service"},
+	{".eol", "audio/vnd.digital-winds"},
+	{".djvu", "image/vnd.djvu"},
+	{".dtd", "application/xml-dtd"},
+	{".mlp", "application/vnd.dolby.mlp"},
+	{".wad", "application/x-doom"},
+	{".dpg", "application/vnd.dpgraph"},
+	{".dra", "audio/vnd.dra"},
+	{".dfac", "application/vnd.dreamfactory"},
+	{".dts", "audio/vnd.dts"},
+	{".dtshd", "audio/vnd.dts.hd"},
+	{".dwg", "image/vnd.dwg"},
+	{".geo", "application/vnd.dynageo"},
+	{".es", "application/ecmascript"},
+	{".mag", "application/vnd.ecowin.chart"},
+	{".mmr", "image/vnd.fujixerox.edmics-mmr"},
+	{".rlc", "image/vnd.fujixerox.edmics-rlc"},
+	{".exi", "application/exi"},
+	{".mgz", "application/vnd.proteus.magazine"},
+	{".epub", "application/epub+zip"},
+	{".eml", "message/rfc822"},
+	{".nml", "application/vnd.enliven"},
+	{".xpr", "application/vnd.is-xpr"},
+	{".xif", "image/vnd.xiff"},
+	{".xfdl", "application/vnd.xfdl"},
+	{".emma", "application/emma+xml"},
+	{".ez2", "application/vnd.ezpix-album"},
+	{".ez3", "application/vnd.ezpix-package"},
+	{".fst", "image/vnd.fst"},
+	{".fvt", "video/vnd.fvt"},
+	{".fbs", "image/vnd.fastbidsheet"},
+	{".fe_launch", "application/vnd.denovo.fcselayout-link"},
+	{".f4v", "video/x-f4v"},
+	{".flv", "video/x-flv"},
+	{".fpx", "image/vnd.fpx"},
+	{".npx", "image/vnd.net-fpx"},
+	{".flx", "text/vnd.fmi.flexstor"},
+	{".fli", "video/x-fli"},
+	{".ftc", "application/vnd.fluxtime.clip"},
+	{".fdf", "application/vnd.fdf"},
+	{".f", "text/x-fortran"},
+	{".mif", "application/vnd.mif"},
+	{".fm", "application/vnd.framemaker"},
+	{".fh", "image/x-freehand"},
+	{".fsc", "application/vnd.fsc.weblaunch"},
+	{".fnc", "application/vnd.frogans.fnc"},
+	{".ltf", "application/vnd.frogans.ltf"},
+	{".ddd", "application/vnd.fujixerox.ddd"},
+	{".xdw", "application/vnd.fujixerox.docuworks"},
+	{".xbd", "application/vnd.fujixerox.docuworks.binder"},
+	{".oas", "application/vnd.fujitsu.oasys"},
+	{".oa2", "application/vnd.fujitsu.oasys2"},
+	{".oa3", "application/vnd.fujitsu.oasys3"},
+	{".fg5", "application/vnd.fujitsu.oasysgp"},
+	{".bh2", "application/vnd.fujitsu.oasysprs"},
+	{".spl", "application/x-futuresplash"},
+	{".fzs", "application/vnd.fuzzysheet"},
+	{".g3", "image/g3fax"},
+	{".gmx", "application/vnd.gmx"},
+	{".gtw", "model/vnd.gtw"},
+	{".txd", "application/vnd.genomatix.tuxedo"},
+	{".ggb", "application/vnd.geogebra.file"},
+	{".ggt", "application/vnd.geogebra.tool"},
+	{".gdl", "model/vnd.gdl"},
+	{".gex", "application/vnd.geometry-explorer"},
+	{".gxt", "application/vnd.geonext"},
+	{".g2w", "application/vnd.geoplan"},
+	{".g3w", "application/vnd.geospace"},
+	{".gsf", "application/x-font-ghostscript"},
+	{".bdf", "application/x-font-bdf"},
+	{".gtar", "application/x-gtar"},
+	{".texinfo", "application/x-texinfo"},
+	{".gnumeric", "application/x-gnumeric"},
+	{".kml", "application/vnd.google-earth.kml+xml"},
+	{".kmz", "application/vnd.google-earth.kmz"},
+	{".gqf", "application/vnd.grafeq"},
+	{".gif", "image/gif"},
+	{".gv", "text/vnd.graphviz"},
+	{".gac", "application/vnd.groove-account"},
+	{".ghf", "application/vnd.groove-help"},
+	{".gim", "application/vnd.groove-identity-message"},
+	{".grv", "application/vnd.groove-injector"},
+	{".gtm", "application/vnd.groove-tool-message"},
+	{".tpl", "application/vnd.groove-tool-template"},
+	{".vcg", "application/vnd.groove-vcard"},
+	{".h261", "video/h261"},
+	{".h263", "video/h263"},
+	{".h264", "video/h264"},
+	{".hpid", "application/vnd.hp-hpid"},
+	{".hps", "application/vnd.hp-hps"},
+	{".hdf", "application/x-hdf"},
+	{".rip", "audio/vnd.rip"},
+	{".hbci", "application/vnd.hbci"},
+	{".jlt", "application/vnd.hp-jlyt"},
+	{".pcl", "application/vnd.hp-pcl"},
+	{".hpgl", "application/vnd.hp-hpgl"},
+	{".hvs", "application/vnd.yamaha.hv-script"},
+	{".hvd", "application/vnd.yamaha.hv-dic"},
+	{".hvp", "application/vnd.yamaha.hv-voice"},
+	{".sfd-hdstx", "application/vnd.hydrostatix.sof-data"},
+	{".stk", "application/hyperstudio"},
+	{".hal", "application/vnd.hal+xml"},
+	{".htm", "text/html; charset=utf-8"},
+	{".html", "text/html; charset=utf-8"},
+	{".irm", "application/vnd.ibm.rights-management"},
+	{".sc", "application/vnd.ibm.secure-container"},
+	{".ics", "text/calendar"},
+	{".icc", "application/vnd.iccprofile"},
+	{".ico", "image/x-icon"},
+	{".igl", "application/vnd.igloader"},
+	{".ief", "image/ief"},
+	{".ivp", "application/vnd.immervision-ivp"},
+	{".ivu", "application/vnd.immervision-ivu"},
+	{".rif", "application/reginfo+xml"},
+	{".3dml", "text/vnd.in3d.3dml"},
+	{".spot", "text/vnd.in3d.spot"},
+	{".igs", "model/iges"},
+	{".i2g", "application/vnd.intergeo"},
+	{".cdy", "application/vnd.cinderella"},
+	{".xpw", "application/vnd.intercon.formnet"},
+	{".fcs", "application/vnd.isac.fcs"},
+	{".ipfix", "application/ipfix"},
+	{".cer", "application/pkix-cert"},
+	{".pki", "application/pkixcmp"},
+	{".crl", "application/pkix-crl"},
+	{".pkipath", "application/pkix-pkipath"},
+	{".igm", "application/vnd.insors.igm"},
+	{".rcprofile", "application/vnd.ipunplugged.rcprofile"},
+	{".irp", "application/vnd.irepository.package+xml"},
+	{".jad", "text/vnd.sun.j2me.app-descriptor"},
+	{".jar", "application/java-archive"},
+	{".class", "application/java-vm"},
+	{".jnlp", "application/x-java-jnlp-file"},
+	{".ser", "application/java-serialized-object"},
+	{".java", "text/x-java-source"},
+	{".js", "application/javascript"},
+	{".json", "application/json"},
+	{".joda", "application/vnd.joost.joda-archive"},
+	{".jpm", "video/jpm"},
+	{".jpg", "image/jpeg"},
+	{".jpeg", "image/jpeg"},
+	{".pjpeg", "image/pjpeg"},
+	{".jpgv", "video/jpeg"},
+	{".ktz", "application/vnd.kahootz"},
+	{".mmd", "application/vnd.chipnuts.karaoke-mmd"},
+	{".karbon", "application/vnd.kde.karbon"},
+	{".chrt", "application/vnd.kde.kchart"},
+	{".kfo", "application/vnd.kde.kformula"},
+	{".flw", "application/vnd.kde.kivio"},
+	{".kon", "application/vnd.kde.kontour"},
+	{".kpr", "application/vnd.kde.kpresenter"},
+	{".ksp", "application/vnd.kde.kspread"},
+	{".kwd", "application/vnd.kde.kword"},
+	{".htke", "application/vnd.kenameaapp"},
+	{".kia", "application/vnd.kidspiration"},
+	{".kne", "application/vnd.kinar"},
+	{".sse", "application/vnd.kodak-descriptor"},
+	{".lasxml", "application/vnd.las.las+xml"},
+	{".latex", "application/x-latex"},
+	{".lbd", "application/vnd.llamagraphics.life-balance.desktop"},
+	{".lbe", "application/vnd.llamagraphics.life-balance.exchange+xml"},
+	{".jam", "application/vnd.jam"},
+	{"0.123", "application/vnd.lotus-1-2-3"},
+	{".apr", "application/vnd.lotus-approach"},
+	{".pre", "application/vnd.lotus-freelance"},
+	{".nsf", "application/vnd.lotus-notes"},
+	{".org", "application/vnd.lotus-organizer"},
+	{".scm", "application/vnd.lotus-screencam"},
+	{".lwp", "application/vnd.lotus-wordpro"},
+	{".lvp", "audio/vnd.lucent.voice"},
+	{".m3u", "audio/x-mpegurl"},
+	{".m4v", "video/x-m4v"},
+	{".hqx", "application/mac-binhex40"},
+	{".portpkg", "application/vnd.macports.portpkg"},
+	{".mgp", "application/vnd.osgeo.mapguide.package"},
+	{".mrc", "application/marc"},
+	{".mrcx", "application/marcxml+xml"},
+	{".mxf", "application/mxf"},
+	{".nbp", "application/vnd.wolfram.player"},
+	{".ma", "application/mathematica"},
+	{".mathml", "application/mathml+xml"},
+	{".mbox", "application/mbox"},
+	{".mc1", "application/vnd.medcalcdata"},
+	{".mscml", "application/mediaservercontrol+xml"},
+	{".cdkey", "application/vnd.mediastation.cdkey"},
+	{".mwf", "application/vnd.mfer"},
+	{".mfm", "application/vnd.mfmp"},
+	{".msh", "model/mesh"},
+	{".mads", "application/mads+xml"},
+	{".mets", "application/mets+xml"},
+	{".mods", "application/mods+xml"},
+	{".meta4", "application/metalink4+xml"},
+	{".mcd", "application/vnd.mcd"},
+	{".flo", "application/vnd.micrografx.flo"},
+	{".igx", "application/vnd.micrografx.igx"},
+	{".es3", "application/vnd.eszigno3+xml"},
+	{".mdb", "application/x-msaccess"},
+	{".asf", "video/x-ms-asf"},
+	{".exe", "application/x-msdownload"},
+	{".cil", "application/vnd.ms-artgalry"},
+	{".cab", "application/vnd.ms-cab-compressed"},
+	{".ims", "application/vnd.ms-ims"},
+	{".application", "application/x-ms-application"},
+	{".clp", "application/x-msclip"},
+	{".mdi", "image/vnd.ms-modi"},
+	{".eot", "application/vnd.ms-fontobject"},
+	{".xls", "application/vnd.ms-excel"},
+	{".xlam", "application/vnd.ms-excel.addin.macroenabled.12"},
+	{".xlsb", "application/vnd.ms-excel.sheet.binary.macroenabled.12"},
+	{".xltm", "application/vnd.ms-excel.template.macroenabled.12"},
+	{".xlsm", "application/vnd.ms-excel.sheet.macroenabled.12"},
+	{".chm", "application/vnd.ms-htmlhelp"},
+	{".crd", "application/x-mscardfile"},
+	{".lrm", "application/vnd.ms-lrm"},
+	{".mvb", "application/x-msmediaview"},
+	{".mny", "application/x-msmoney"},
+	{".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation"},
+	{".sldx", "application/vnd.openxmlformats-officedocument.presentationml.slide"},
+	{".ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow"},
+	{".potx", "application/vnd.openxmlformats-officedocument.presentationml.template"},
+	{".xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"},
+	{".xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template"},
+	{".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document"},
+	{".dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template"},
+	{".obd", "application/x-msbinder"},
+	{".thmx", "application/vnd.ms-officetheme"},
+	{".onetoc", "application/onenote"},
+	{".pya", "audio/vnd.ms-playready.media.pya"},
+	{".pyv", "video/vnd.ms-playready.media.pyv"},
+	{".ppt", "application/vnd.ms-powerpoint"},
+	{".ppam", "application/vnd.ms-powerpoint.addin.macroenabled.12"},
+	{".sldm", "application/vnd.ms-powerpoint.slide.macroenabled.12"},
+	{".pptm", "application/vnd.ms-powerpoint.presentation.macroenabled.12"},
+	{".ppsm", "application/vnd.ms-powerpoint.slideshow.macroenabled.12"},
+	{".potm", "application/vnd.ms-powerpoint.template.macroenabled.12"},
+	{".mpp", "application/vnd.ms-project"},
+	{".pub", "application/x-mspublisher"},
+	{".scd", "application/x-msschedule"},
+	{".xap", "application/x-silverlight-app"},
+	{".stl", "application/vnd.ms-pki.stl"},
+	{".cat", "application/vnd.ms-pki.seccat"},
+	{".vsd", "application/vnd.visio"},
+	{".vsdx", "application/vnd.visio2013"},
+	{".wm", "video/x-ms-wm"},
+	{".wma", "audio/x-ms-wma"},
+	{".wax", "audio/x-ms-wax"},
+	{".wmx", "video/x-ms-wmx"},
+	{".wmd", "application/x-ms-wmd"},
+	{".wpl", "application/vnd.ms-wpl"},
+	{".wmz", "application/x-ms-wmz"},
+	{".wmv", "video/x-ms-wmv"},
+	{".wvx", "video/x-ms-wvx"},
+	{".wmf", "application/x-msmetafile"},
+	{".trm", "application/x-msterminal"},
+	{".doc", "application/msword"},
+	{".docm", "application/vnd.ms-word.document.macroenabled.12"},
+	{".dotm", "application/vnd.ms-word.template.macroenabled.12"},
+	{".wri", "application/x-mswrite"},
+	{".wps", "application/vnd.ms-works"},
+	{".xbap", "application/x-ms-xbap"},
+	{".xps", "application/vnd.ms-xpsdocument"},
+	{".mid", "audio/midi"},
+	{".mpy", "application/vnd.ibm.minipay"},
+	{".afp", "application/vnd.ibm.modcap"},
+	{".rms", "application/vnd.jcp.javame.midlet-rms"},
+	{".tmo", "application/vnd.tmobile-livetv"},
+	{".prc", "application/x-mobipocket-ebook"},
+	{".mbk", "application/vnd.mobius.mbk"},
+	{".dis", "application/vnd.mobius.dis"},
+	{".plc", "application/vnd.mobius.plc"},
+	{".mqy", "application/vnd.mobius.mqy"},
+	{".msl", "application/vnd.mobius.msl"},
+	{".txf", "application/vnd.mobius.txf"},
+	{".daf", "application/vnd.mobius.daf"},
+	{".fly", "text/vnd.fly"},
+	{".mpc", "application/vnd.mophun.certificate"},
+	{".mpn", "application/vnd.mophun.application"},
+	{".mj2", "video/mj2"},
+	{".mpga", "audio/mpeg"},
+	{".mxu", "video/vnd.mpegurl"},
+	{".mpeg", "video/mpeg"},
+	{".m21", "application/mp21"},
+	{".mp4a", "audio/mp4"},
+	{".mp4", "video/mp4"},
+	{".mp4", "application/mp4"},
+	{".m3u8", "application/vnd.apple.mpegurl"},
+	{".mus", "application/vnd.musician"},
+	{".msty", "application/vnd.muvee.style"},
+	{".mxml", "application/xv+xml"},
+	{".ngdat", "application/vnd.nokia.n-gage.data"},
+	{".n-gage", "application/vnd.nokia.n-gage.symbian.install"},
+	{".ncx", "application/x-dtbncx+xml"},
+	{".nc", "application/x-netcdf"},
+	{".nlu", "application/vnd.neurolanguage.nlu"},
+	{".dna", "application/vnd.dna"},
+	{".nnd", "application/vnd.noblenet-directory"},
+	{".nns", "application/vnd.noblenet-sealer"},
+	{".nnw", "application/vnd.noblenet-web"},
+	{".rpst", "application/vnd.nokia.radio-preset"},
+	{".rpss", "application/vnd.nokia.radio-presets"},
+	{".n3", "text/n3"},
+	{".edm", "application/vnd.novadigm.edm"},
+	{".edx", "application/vnd.novadigm.edx"},
+	{".ext", "application/vnd.novadigm.ext"},
+	{".gph", "application/vnd.flographit"},
+	{".ecelp4800", "audio/vnd.nuera.ecelp4800"},
+	{".ecelp7470", "audio/vnd.nuera.ecelp7470"},
+	{".ecelp9600", "audio/vnd.nuera.ecelp9600"},
+	{".oda", "application/oda"},
+	{".ogx", "application/ogg"},
+	{".oga", "audio/ogg"},
+	{".ogv", "video/ogg"},
+	{".dd2", "application/vnd.oma.dd2+xml"},
+	{".oth", "application/vnd.oasis.opendocument.text-web"},
+	{".opf", "application/oebps-package+xml"},
+	{".qbo", "application/vnd.intu.qbo"},
+	{".oxt", "application/vnd.openofficeorg.extension"},
+	{".osf", "application/vnd.yamaha.openscoreformat"},
+	{".weba", "audio/webm"},
+	{".webm", "video/webm"},
+	{".odc", "application/vnd.oasis.opendocument.chart"},
+	{".otc", "application/vnd.oasis.opendocument.chart-template"},
+	{".odb", "application/vnd.oasis.opendocument.database"},
+	{".odf", "application/vnd.oasis.opendocument.formula"},
+	{".odft", "application/vnd.oasis.opendocument.formula-template"},
+	{".odg", "application/vnd.oasis.opendocument.graphics"},
+	{".otg", "application/vnd.oasis.opendocument.graphics-template"},
+	{".odi", "application/vnd.oasis.opendocument.image"},
+	{".oti", "application/vnd.oasis.opendocument.image-template"},
+	{".odp", "application/vnd.oasis.opendocument.presentation"},
+	{".otp", "application/vnd.oasis.opendocument.presentation-template"},
+	{".ods", "application/vnd.oasis.opendocument.spreadsheet"},
+	{".ots", "application/vnd.oasis.opendocument.spreadsheet-template"},
+	{".odt", "application/vnd.oasis.opendocument.text"},
+	{".odm", "application/vnd.oasis.opendocument.text-master"},
+	{".ott", "application/vnd.oasis.opendocument.text-template"},
+	{".ktx", "image/ktx"},
+	{".sxc", "application/vnd.sun.xml.calc"},
+	{".stc", "application/vnd.sun.xml.calc.template"},
+	{".sxd", "application/vnd.sun.xml.draw"},
+	{".std", "application/vnd.sun.xml.draw.template"},
+	{".sxi", "application/vnd.sun.xml.impress"},
+	{".sti", "application/vnd.sun.xml.impress.template"},
+	{".sxm", "application/vnd.sun.xml.math"},
+	{".sxw", "application/vnd.sun.xml.writer"},
+	{".sxg", "application/vnd.sun.xml.writer.global"},
+	{".stw", "application/vnd.sun.xml.writer.template"},
+	{".otf", "application/x-font-otf"},
+	{".osfpvg", "application/vnd.yamaha.openscoreformat.osfpvg+xml"},
+	{".dp", "application/vnd.osgi.dp"},
+	{".pdb", "application/vnd.palm"},
+	{".p", "text/x-pascal"},
+	{".paw", "application/vnd.pawaafile"},
+	{".pclxl", "application/vnd.hp-pclxl"},
+	{".efif", "application/vnd.picsel"},
+	{".pcx", "image/x-pcx"},
+	{".psd", "image/vnd.adobe.photoshop"},
+	{".prf", "application/pics-rules"},
+	{".pic", "image/x-pict"},
+	{".chat", "application/x-chat"},
+	{".p10", "application/pkcs10"},
+	{".p12", "application/x-pkcs12"},
+	{".p7m", "application/pkcs7-mime"},
+	{".p7s", "application/pkcs7-signature"},
+	{".p7r", "application/x-pkcs7-certreqresp"},
+	{".p7b", "application/x-pkcs7-certificates"},
+	{".p8", "application/pkcs8"},
+	{".plf", "application/vnd.pocketlearn"},
+	{".pnm", "image/x-portable-anymap"},
+	{".pbm", "image/x-portable-bitmap"},
+	{".pcf", "application/x-font-pcf"},
+	{".pfr", "application/font-tdpfr"},
+	{".pgn", "application/x-chess-pgn"},
+	{".pgm", "image/x-portable-graymap"},
+	{".png", "image/png"},
+	{".png", "image/x-citrix-png"},
+	{".png", "image/x-png"},
+	{".ppm", "image/x-portable-pixmap"},
+	{".pskcxml", "application/pskc+xml"},
+	{".pml", "application/vnd.ctc-posml"},
+	{".ai", "application/postscript"},
+	{".pfa", "application/x-font-type1"},
+	{".pbd", "application/vnd.powerbuilder6"},
+	{".pgp", "application/pgp-encrypted"},
+	{".pgp", "application/pgp-signature"},
+	{".box", "application/vnd.previewsystems.box"},
+	{".ptid", "application/vnd.pvi.ptid1"},
+	{".pls", "application/pls+xml"},
+	{".str", "application/vnd.pg.format"},
+	{".ei6", "application/vnd.pg.osasli"},
+	{".dsc", "text/prs.lines.tag"},
+	{".psf", "application/x-font-linux-psf"},
+	{".qps", "application/vnd.publishare-delta-tree"},
+	{".wg", "application/vnd.pmi.widget"},
+	{".qxd", "application/vnd.quark.quarkxpress"},
+	{".esf", "application/vnd.epson.esf"},
+	{".msf", "application/vnd.epson.msf"},
+	{".ssf", "application/vnd.epson.ssf"},
+	{".qam", "application/vnd.epson.quickanime"},
+	{".qfx", "application/vnd.intu.qfx"},
+	{".qt", "video/quicktime"},
+	{".rar", "application/x-rar-compressed"},
+	{".ram", "audio/x-pn-realaudio"},
+	{".rmp", "audio/x-pn-realaudio-plugin"},
+	{".rsd", "application/rsd+xml"},
+	{".rm", "application/vnd.rn-realmedia"},
+	{".bed", "application/vnd.realvnc.bed"},
+	{".mxl", "application/vnd.recordare.musicxml"},
+	{".musicxml", "application/vnd.recordare.musicxml+xml"},
+	{".rnc", "application/relax-ng-compact-syntax"},
+	{".rdz", "application/vnd.data-vision.rdz"},
+	{".rdf", "application/rdf+xml"},
+	{".rp9", "application/vnd.cloanto.rp9"},
+	{".jisp", "application/vnd.jisp"},
+	{".rtf", "application/rtf"},
+	{".rtx", "text/richtext"},
+	{".link66", "application/vnd.route66.link66+xml"},
+	{".rss", "application/rss+xml"},
+	{".shf", "application/shf+xml"},
+	{".st", "application/vnd.sailingtracker.track"},
+	{".svg", "image/svg+xml"},
+	{".sus", "application/vnd.sus-calendar"},
+	{".sru", "application/sru+xml"},
+	{".setpay", "application/set-payment-initiation"},
+	{".setreg", "application/set-registration-initiation"},
+	{".sema", "application/vnd.sema"},
+	{".semd", "application/vnd.semd"},
+	{".semf", "application/vnd.semf"},
+	{".see", "application/vnd.seemail"},
+	{".snf", "application/x-font-snf"},
+	{".spq", "application/scvp-vp-request"},
+	{".spp", "application/scvp-vp-response"},
+	{".scq", "application/scvp-cv-request"},
+	{".scs", "application/scvp-cv-response"},
+	{".sdp", "application/sdp"},
+	{".etx", "text/x-setext"},
+	{".movie", "video/x-sgi-movie"},
+	{".ifm", "application/vnd.shana.informed.formdata"},
+	{".itp", "application/vnd.shana.informed.formtemplate"},
+	{".iif", "application/vnd.shana.informed.interchange"},
+	{".ipk", "application/vnd.shana.informed.package"},
+	{".tfi", "application/thraud+xml"},
+	{".shar", "application/x-shar"},
+	{".rgb", "image/x-rgb"},
+	{".slt", "application/vnd.epson.salt"},
+	{".aso", "application/vnd.accpac.simply.aso"},
+	{".imp", "application/vnd.accpac.simply.imp"},
+	{".twd", "application/vnd.simtech-mindmapper"},
+	{".csp", "application/vnd.commonspace"},
+	{".saf", "application/vnd.yamaha.smaf-audio"},
+	{".mmf", "application/vnd.smaf"},
+	{".spf", "application/vnd.yamaha.smaf-phrase"},
+	{".teacher", "application/vnd.smart.teacher"},
+	{".svd", "application/vnd.svd"},
+	{".rq", "application/sparql-query"},
+	{".srx", "application/sparql-results+xml"},
+	{".gram", "application/srgs"},
+	{".grxml", "application/srgs+xml"},
+	{".ssml", "application/ssml+xml"},
+	{".skp", "application/vnd.koan"},
+	{".sgml", "text/sgml"},
+	{".sdc", "application/vnd.stardivision.calc"},
+	{".sda", "application/vnd.stardivision.draw"},
+	{".sdd", "application/vnd.stardivision.impress"},
+	{".smf", "application/vnd.stardivision.math"},
+	{".sdw", "application/vnd.stardivision.writer"},
+	{".sgl", "application/vnd.stardivision.writer-global"},
+	{".sm", "application/vnd.stepmania.stepchart"},
+	{".sit", "application/x-stuffit"},
+	{".sitx", "application/x-stuffitx"},
+	{".sdkm", "application/vnd.solent.sdkm+xml"},
+	{".xo", "application/vnd.olpc-sugar"},
+	{".au", "audio/basic"},
+	{".wqd", "application/vnd.wqd"},
+	{".sis", "application/vnd.symbian.install"},
+	{".smi", "application/smil+xml"},
+	{".xsm", "application/vnd.syncml+xml"},
+	{".bdm", "application/vnd.syncml.dm+wbxml"},
+	{".xdm", "application/vnd.syncml.dm+xml"},
+	{".sv4cpio", "application/x-sv4cpio"},
+	{".sv4crc", "application/x-sv4crc"},
+	{".sbml", "application/sbml+xml"},
+	{".tsv", "text/tab-separated-values"},
+	{".tiff", "image/tiff"},
+	{".tao", "application/vnd.tao.intent-module-archive"},
+	{".tar", "application/x-tar"},
+	{".tcl", "application/x-tcl"},
+	{".tex", "application/x-tex"},
+	{".tfm", "application/x-tex-tfm"},
+	{".tei", "application/tei+xml"},
+	{".txt", "text/plain; charset=utf-8"},
+	{".md", "text/markdown; charset=utf-8"},
+	{".dxp", "application/vnd.spotfire.dxp"},
+	{".sfs", "application/vnd.spotfire.sfs"},
+	{".tsd", "application/timestamped-data"},
+	{".tpt", "application/vnd.trid.tpt"},
+	{".mxs", "application/vnd.triscape.mxs"},
+	{".t", "text/troff"},
+	{".tra", "application/vnd.trueapp"},
+	{".ttf", "application/x-font-ttf"},
+	{".ttl", "text/turtle"},
+	{".umj", "application/vnd.umajin"},
+	{".uoml", "application/vnd.uoml+xml"},
+	{".unityweb", "application/vnd.unity"},
+	{".ufd", "application/vnd.ufdl"},
+	{".uri", "text/uri-list"},
+	{".utz", "application/vnd.uiq.theme"},
+	{".ustar", "application/x-ustar"},
+	{".uu", "text/x-uuencode"},
+	{".vcs", "text/x-vcalendar"},
+	{".vcf", "text/x-vcard"},
+	{".vcd", "application/x-cdlink"},
+	{".vsf", "application/vnd.vsf"},
+	{".wrl", "model/vrml"},
+	{".vcx", "application/vnd.vcx"},
+	{".mts", "model/vnd.mts"},
+	{".vtu", "model/vnd.vtu"},
+	{".vis", "application/vnd.visionary"},
+	{".viv", "video/vnd.vivo"},
+	{".ccxml", "application/ccxml+xml"},
+	{".vxml", "application/voicexml+xml"},
+	{".src", "application/x-wais-source"},
+	{".wbxml", "application/vnd.wap.wbxml"},
+	{".wbmp", "image/vnd.wap.wbmp"},
+	{".wav", "audio/x-wav"},
+	{".davmount", "application/davmount+xml"},
+	{".woff", "application/x-font-woff"},
+	{".wspolicy", "application/wspolicy+xml"},
+	{".webp", "image/webp"},
+	{".wtb", "application/vnd.webturbo"},
+	{".wgt", "application/widget"},
+	{".hlp", "application/winhlp"},
+	{".wml", "text/vnd.wap.wml"},
+	{".wmls", "text/vnd.wap.wmlscript"},
+	{".wmlsc", "application/vnd.wap.wmlscriptc"},
+	{".wpd", "application/vnd.wordperfect"},
+	{".stf", "application/vnd.wt.stf"},
+	{".wsdl", "application/wsdl+xml"},
+	{".xbm", "image/x-xbitmap"},
+	{".xpm", "image/x-xpixmap"},
+	{".xwd", "image/x-xwindowdump"},
+	{".der", "application/x-x509-ca-cert"},
+	{".fig", "application/x-xfig"},
+	{".xhtml", "application/xhtml+xml"},
+	{".xml", "application/xml"},
+	{".xdf", "application/xcap-diff+xml"},
+	{".xenc", "application/xenc+xml"},
+	{".xer", "application/patch-ops-error+xml"},
+	{".rl", "application/resource-lists+xml"},
+	{".rs", "application/rls-services+xml"},
+	{".rld", "application/resource-lists-diff+xml"},
+	{".xslt", "application/xslt+xml"},
+	{".xop", "application/xop+xml"},
+	{".xpi", "application/x-xpinstall"},
+	{".xspf", "application/xspf+xml"},
+	{".xul", "application/vnd.mozilla.xul+xml"},
+	{".xyz", "chemical/x-xyz"},
+	{".yaml", "text/yaml"},
+	{".yang", "application/yang"},
+	{".yin", "application/yin+xml"},
+	{".zir", "application/vnd.zul"},
+	{".zip", "application/zip"},
+	{".zmm", "application/vnd.handheld-entertainment+xml"},
+	{".zaz", "application/vnd.zzazz.deck+xml"},
+};
+
+// Detect HTTP MIME type from filename
+char *GetMimeTypeFromFileName(char *filename)
+{
+	UINT i;
+	const UINT num = sizeof(http_mime_types) / sizeof(HTTP_MIME_TYPE);
+	if (filename == NULL)
+	{
+		return NULL;
+	}
+
+	for (i = 0; i < num; ++i)
+	{
+		const HTTP_MIME_TYPE *a = &http_mime_types[i];
+
+		if (EndWith(filename, a->Extension))
+		{
+			return a->MimeType;
+		}
+	}
+
+	return NULL;
+}
diff --git a/src/Mayaqua/HTTP.h b/src/Mayaqua/HTTP.h
new file mode 100644
index 00000000..f5f3b149
--- /dev/null
+++ b/src/Mayaqua/HTTP.h
@@ -0,0 +1,13 @@
+#ifndef HTTP_H
+#define HTTP_H
+
+// MIME type
+struct HTTP_MIME_TYPE
+{
+	char *Extension;
+	char *MimeType;
+};
+
+char *GetMimeTypeFromFileName(char *filename);
+
+#endif
diff --git a/src/Mayaqua/MayaType.h b/src/Mayaqua/MayaType.h
index b00174be..8f4cdece 100644
--- a/src/Mayaqua/MayaType.h
+++ b/src/Mayaqua/MayaType.h
@@ -507,7 +507,8 @@ typedef struct DHCP_MODIFY_OPTION DHCP_MODIFY_OPTION;
 typedef struct NBTDG_HEADER NBTDG_HEADER;
 typedef struct IKE_HEADER IKE_HEADER;
 
-
+// HTTP.h
+typedef struct HTTP_MIME_TYPE HTTP_MIME_TYPE;
 
 #endif	// MAYATYPE_H
 
diff --git a/src/Mayaqua/Mayaqua.h b/src/Mayaqua/Mayaqua.h
index 1e176fa5..45fec94f 100644
--- a/src/Mayaqua/Mayaqua.h
+++ b/src/Mayaqua/Mayaqua.h
@@ -273,6 +273,9 @@ int iconv_close (iconv_t __cd);
 // TCP/IP
 #include <Mayaqua/TcpIp.h>
 
+// HTTP
+#include <Mayaqua/HTTP.h>
+
 // 64 bit real-time clock
 #include <Mayaqua/Tick64.h>
 
diff --git a/src/Mayaqua/Mayaqua.vcproj b/src/Mayaqua/Mayaqua.vcproj
index e9cbe938..efd2aa72 100644
--- a/src/Mayaqua/Mayaqua.vcproj
+++ b/src/Mayaqua/Mayaqua.vcproj
@@ -326,6 +326,10 @@
 				RelativePath=".\FileIO.c"
 				>
 			</File>
+			<File
+				RelativePath=".\HTTP.c"
+				>
+			</File>
 			<File
 				RelativePath=".\Internat.c"
 				>
@@ -416,6 +420,10 @@
 				RelativePath=".\FileIO.h"
 				>
 			</File>
+			<File
+				RelativePath=".\HTTP.h"
+				>
+			</File>
 			<File
 				RelativePath=".\Internat.h"
 				>

From 2f90e9ecb8425deca5080aebf765294c45b5afd9 Mon Sep 17 00:00:00 2001
From: Davide Beatrici <davidebeatrici@gmail.com>
Date: Sun, 20 Oct 2019 02:17:42 +0200
Subject: [PATCH 4/4] Mayaqua: move HTTP functions from "Network" to "HTTP"

---
 src/Mayaqua/HTTP.c    | 854 +++++++++++++++++++++++++++++++++++++++++
 src/Mayaqua/HTTP.h    |  65 ++++
 src/Mayaqua/Network.c | 863 ------------------------------------------
 src/Mayaqua/Network.h |  73 ----
 4 files changed, 919 insertions(+), 936 deletions(-)

diff --git a/src/Mayaqua/HTTP.c b/src/Mayaqua/HTTP.c
index 153d9854..7869a55c 100644
--- a/src/Mayaqua/HTTP.c
+++ b/src/Mayaqua/HTTP.c
@@ -2,6 +2,11 @@
 
 #include <Mayaqua/Mayaqua.h>
 
+static char http_404_str[] = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n<HTML><HEAD>\r\n<TITLE>404 Not Found</TITLE>\r\n</HEAD><BODY>\r\n<H1>Not Found</H1>\r\nThe requested URL $TARGET$ was not found on this server.<P>\r\n<HR>\r\n<ADDRESS>HTTP Server at $HOST$ Port $PORT$</ADDRESS>\r\n</BODY></HTML>\r\n";
+static char http_403_str[] = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n<HTML><HEAD>\r\n<TITLE>403 Forbidden</TITLE>\r\n</HEAD><BODY>\r\n<H1>Forbidden</H1>\r\nYou don't have permission to access $TARGET$\r\non this server.<P>\r\n<HR>\r\n<ADDRESS>HTTP Server at $HOST$ Port $PORT$</ADDRESS>\r\n</BODY></HTML>\r\n";
+static char http_500_str[] = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n<HTML><HEAD>\r\n<TITLE>500 Server Error</TITLE>\r\n</HEAD><BODY>\r\n<H1>Server Error</H1>\r\nServer Error<P>\r\n<HR>\r\n<ADDRESS>HTTP Server at $HOST$ Port $PORT$</ADDRESS>\r\n</BODY></HTML>\r\n";
+static char http_501_str[] = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n<HTML><HEAD>\r\n<TITLE>501 Method Not Implemented</TITLE>\r\n</HEAD><BODY>\r\n<H1>Method Not Implemented</H1>\r\n$METHOD$ to $TARGET$ not supported.<P>\r\nInvalid method in request $METHOD$ $TARGET$ $VERSION$<P>\r\n<HR>\r\n<ADDRESS>HTTP Server at $HOST$ Port $PORT$</ADDRESS>\r\n</BODY></HTML>\r\n";
+
 // MIME list from https://www.freeformatter.com/mime-types-list.html
 static const HTTP_MIME_TYPE http_mime_types[] =
 {
@@ -721,3 +726,852 @@ char *GetMimeTypeFromFileName(char *filename)
 
 	return NULL;
 }
+
+// Generate the date and time string for the HTTP header
+void GetHttpDateStr(char *str, UINT size, UINT64 t)
+{
+	SYSTEMTIME s;
+	static char *wday[] =
+	{
+		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
+	};
+	static char *month[] =
+	{
+		"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
+		"Nov", "Dec",
+	};
+	// Validate arguments
+	if (str == NULL)
+	{
+		return;
+	}
+	UINT64ToSystem(&s, t);
+
+	Format(str, size, "%s, %02u %s %04u %02u:%02u:%02u GMT",
+		wday[s.wDayOfWeek], s.wDay, month[s.wMonth - 1], s.wYear,
+		s.wHour, s.wMinute, s.wSecond);
+}
+
+// Replace unsafe characters in target
+void ReplaceUnsafeCharInHttpTarget(char *target)
+{
+	UINT i;
+	for(i = 0; target[i] ; i++) {
+		if(target[i] == '<')
+			target[i] = '(';
+		else if(target[i] == '>')
+			target[i] = ')';
+	}
+}
+
+// Create an HTTP header
+HTTP_HEADER *NewHttpHeader(char *method, char *target, char *version)
+{
+	return NewHttpHeaderEx(method, target, version, false);
+}
+HTTP_HEADER *NewHttpHeaderEx(char *method, char *target, char *version, bool no_sort)
+{
+	HTTP_HEADER *header;
+	// Validate arguments
+	if (method == NULL || target == NULL || version == NULL)
+	{
+		return NULL;
+	}
+
+	header = ZeroMalloc(sizeof(HTTP_HEADER));
+
+	header->Method = CopyStr(method);
+	header->Target = CopyStr(target);
+	header->Version = CopyStr(version);
+	header->ValueList = NewListFast(no_sort ? NULL : CompareHttpValue);
+
+	return header;
+}
+
+// Release the HTTP header
+void FreeHttpHeader(HTTP_HEADER *header)
+{
+	UINT i;
+	HTTP_VALUE **values;
+	// Validate arguments
+	if (header == NULL)
+	{
+		return;
+	}
+
+	Free(header->Method);
+	Free(header->Target);
+	Free(header->Version);
+
+	values = ToArray(header->ValueList);
+	for (i = 0;i < LIST_NUM(header->ValueList);i++)
+	{
+		FreeHttpValue(values[i]);
+	}
+	Free(values);
+
+	ReleaseList(header->ValueList);
+
+	Free(header);
+}
+
+// Create a new HTTP value
+HTTP_VALUE *NewHttpValue(char *name, char *data)
+{
+	HTTP_VALUE *v;
+	// Validate arguments
+	if (name == NULL || data == NULL)
+	{
+		return NULL;
+	}
+
+	v = ZeroMalloc(sizeof(HTTP_VALUE));
+
+	v->Name = CopyStr(name);
+	v->Data = CopyStr(data);
+
+	Trim(v->Name);
+	Trim(v->Data);
+
+	return v;
+}
+
+// Release the HTTP value
+void FreeHttpValue(HTTP_VALUE *value)
+{
+	// Validate arguments
+	if (value == NULL)
+	{
+		return;
+	}
+
+	Free(value->Data);
+	Free(value->Name);
+
+	Free(value);
+}
+
+// Comparison function of the HTTP value
+int CompareHttpValue(void *p1, void *p2)
+{
+	HTTP_VALUE *v1, *v2;
+	if (p1 == NULL || p2 == NULL)
+	{
+		return 0;
+	}
+	v1 = *(HTTP_VALUE **)p1;
+	v2 = *(HTTP_VALUE **)p2;
+	if (v1 == NULL || v2 == NULL)
+	{
+		return 0;
+	}
+	return StrCmpi(v1->Name, v2->Name);
+}
+
+// Look for an HTTP value in an HTTP header
+HTTP_VALUE *GetHttpValue(HTTP_HEADER *header, char *name)
+{
+	HTTP_VALUE *v, t;
+	// Validate arguments
+	if (header == NULL || name == NULL)
+	{
+		return NULL;
+	}
+
+	t.Name = name;
+	v = Search(header->ValueList, &t);
+	if (v == NULL)
+	{
+		return NULL;
+	}
+
+	return v;
+}
+
+// Add an HTTP value to the HTTP header
+void AddHttpValue(HTTP_HEADER *header, HTTP_VALUE *value)
+{
+	// Validate arguments
+	if (header == NULL || value == NULL)
+	{
+		return;
+	}
+
+	if (LIST_NUM(header->ValueList) < HTTP_HEADER_MAX_LINES)
+	{
+		Insert(header->ValueList, value);
+	}
+	else
+	{
+		FreeHttpValue(value);
+	}
+}
+
+// Adds the HTTP value contained in the string to the HTTP header
+bool AddHttpValueStr(HTTP_HEADER* header, char *string)
+{
+	HTTP_VALUE *value = NULL;
+	UINT pos = 0;
+	char *value_name = NULL;
+	char *value_data = NULL;
+
+	// Validate arguments
+	if (header == NULL || IsEmptyStr(string))
+	{
+		return false;
+	}
+
+	// Sanitize string
+	EnSafeHttpHeaderValueStr(string, ' ');
+
+	// Get the position of the colon
+	pos = SearchStr(string, ":", 0);
+	if (pos == INFINITE)
+	{
+		// The colon does not exist
+		return false;
+	}
+
+	if ((pos + 1) >= StrLen(string))
+	{
+		// There is no data
+		return false;
+	}
+
+	// Divide into the name and the data
+	value_name = Malloc(pos + 1);
+	Copy(value_name, string, pos);
+	value_name[pos] = 0;
+	value_data = &string[pos + 1];
+
+	value = NewHttpValue(value_name, value_data);
+	if (value == NULL)
+	{
+		Free(value_name);
+		return false;
+	}
+
+	Free(value_name);
+
+	AddHttpValue(header, value);
+
+	return true;
+}
+
+// Get the Content-Length value from the HTTP header
+UINT GetContentLength(HTTP_HEADER *header)
+{
+	UINT ret;
+	HTTP_VALUE *v;
+	// Validate arguments
+	if (header == NULL)
+	{
+		return 0;
+	}
+
+	v = GetHttpValue(header, "Content-Length");
+	if (v == NULL)
+	{
+		return 0;
+	}
+
+	ret = ToInt(v->Data);
+
+	return ret;
+}
+
+// Send HTTP data
+bool PostHttp(SOCK *s, HTTP_HEADER *header, void *post_data, UINT post_size)
+{
+	char *header_str;
+	BUF *b;
+	bool ret;
+	// Validate arguments
+	if (s == NULL || header == NULL || (post_size != 0 && post_data == NULL))
+	{
+		return false;
+	}
+
+	// Check whether the Content-Length exists?
+	if (GetHttpValue(header, "Content-Length") == NULL)
+	{
+		char tmp[MAX_SIZE];
+		// Add because it does not exist
+		ToStr(tmp, post_size);
+		AddHttpValue(header, NewHttpValue("Content-Length", tmp));
+	}
+
+	// Convert the header to string
+	header_str = HttpHeaderToStr(header);
+	if (header_str == NULL)
+	{
+		return false;
+	}
+	b = NewBuf();
+	WriteBuf(b, header_str, StrLen(header_str));
+	Free(header_str);
+
+	// Append the data
+	WriteBuf(b, post_data, post_size);
+
+	// Send
+	ret = SendAll(s, b->Buf, b->Size, s->SecureMode);
+
+	FreeBuf(b);
+
+	return ret;
+}
+
+// Convert an HTTP header to a string
+char *HttpHeaderToStr(HTTP_HEADER *header)
+{
+	BUF *b;
+	char *tmp;
+	UINT i;
+	char *s;
+	// Validate arguments
+	if (header == NULL)
+	{
+		return NULL;
+	}
+
+	tmp = Malloc(HTTP_HEADER_LINE_MAX_SIZE);
+	b = NewBuf();
+
+	// Header
+	Format(tmp, HTTP_HEADER_LINE_MAX_SIZE,
+		"%s %s %s\r\n", header->Method, header->Target, header->Version);
+	WriteBuf(b, tmp, StrLen(tmp));
+
+	// Value
+	for (i = 0;i < LIST_NUM(header->ValueList);i++)
+	{
+		HTTP_VALUE *v = (HTTP_VALUE *)LIST_DATA(header->ValueList, i);
+		Format(tmp, HTTP_HEADER_LINE_MAX_SIZE,
+			"%s: %s\r\n", v->Name, v->Data);
+		WriteBuf(b, tmp, StrLen(tmp));
+	}
+
+	// Trailing newline
+	WriteBuf(b, "\r\n", 2);
+	s = Malloc(b->Size + 1);
+	Copy(s, b->Buf, b->Size);
+	s[b->Size] = 0;
+
+	FreeBuf(b);
+	Free(tmp);
+
+	return s;
+}
+
+// Send the HTTP header
+bool SendHttpHeader(SOCK *s, HTTP_HEADER *header)
+{
+	char *str;
+	bool ret;
+	// Validate arguments
+	if (s == NULL || header == NULL)
+	{
+		return false;
+	}
+
+	// Convert to string
+	str = HttpHeaderToStr(header);
+
+	// Transmission
+	ret = SendAll(s, str, StrLen(str), s->SecureMode);
+
+	Free(str);
+
+	return ret;
+}
+
+// Receive an HTTP header
+HTTP_HEADER *RecvHttpHeader(SOCK *s)
+{
+	TOKEN_LIST *token = NULL;
+	char *str = NULL;
+	HTTP_HEADER *header = NULL;
+	// Validate arguments
+	if (s == NULL)
+	{
+		return NULL;
+	}
+
+	// Get the first line
+	str = RecvLine(s, HTTP_HEADER_LINE_MAX_SIZE);
+	if (str == NULL)
+	{
+		return NULL;
+	}
+
+	// Split into tokens
+	token = ParseToken(str, " ");
+
+	FreeSafe(PTR_TO_PTR(str));
+
+	if (token->NumTokens < 3)
+	{
+		FreeToken(token);
+		return NULL;
+	}
+
+	// Creating a header object
+	header = NewHttpHeader(token->Token[0], token->Token[1], token->Token[2]);
+	FreeToken(token);
+
+	if (StrCmpi(header->Version, "HTTP/0.9") == 0)
+	{
+		// The header ends with this line
+		return header;
+	}
+
+	// Get the subsequent lines
+	while (true)
+	{
+		str = RecvLine(s, HTTP_HEADER_LINE_MAX_SIZE);
+		Trim(str);
+		if (IsEmptyStr(str))
+		{
+			// End of header
+			FreeSafe(PTR_TO_PTR(str));
+			break;
+		}
+
+		if (AddHttpValueStr(header, str) == false)
+		{
+			FreeSafe(PTR_TO_PTR(str));
+			FreeHttpHeader(header);
+			header = NULL;
+			break;
+		}
+
+		FreeSafe(PTR_TO_PTR(str));
+	}
+
+	return header;
+}
+
+// Send a PACK to the server
+bool HttpClientSend(SOCK *s, PACK *p)
+{
+	BUF *b;
+	bool ret;
+	HTTP_HEADER *h;
+	char date_str[MAX_SIZE];
+	char ip_str[MAX_SIZE];
+
+	// Validate arguments
+	if (s == NULL || p == NULL)
+	{
+		return false;
+	}
+
+	IPToStr(ip_str, sizeof(ip_str), &s->RemoteIP);
+
+	CreateDummyValue(p);
+
+	b = PackToBuf(p);
+	if (b == NULL)
+	{
+		return false;
+	}
+
+	h = NewHttpHeader("POST", HTTP_VPN_TARGET, "HTTP/1.1");
+
+	GetHttpDateStr(date_str, sizeof(date_str), SystemTime64());
+	AddHttpValue(h, NewHttpValue("Date", date_str));
+	AddHttpValue(h, NewHttpValue("Host", ip_str));
+	AddHttpValue(h, NewHttpValue("Keep-Alive", HTTP_KEEP_ALIVE));
+	AddHttpValue(h, NewHttpValue("Connection", "Keep-Alive"));
+	AddHttpValue(h, NewHttpValue("Content-Type", HTTP_CONTENT_TYPE2));
+
+	ret = PostHttp(s, h, b->Buf, b->Size);
+
+	FreeHttpHeader(h);
+	FreeBuf(b);
+
+	return ret;
+}
+
+// Receive a PACK from the server
+PACK *HttpClientRecv(SOCK *s)
+{
+	BUF *b;
+	PACK *p;
+	HTTP_HEADER *h;
+	UINT size;
+	UCHAR *tmp;
+	HTTP_VALUE *v;
+	// Validate arguments
+	if (s == NULL)
+	{
+		return NULL;
+	}
+
+	h = RecvHttpHeader(s);
+	if (h == NULL)
+	{
+		return NULL;
+	}
+
+	if (StrCmpi(h->Method, "HTTP/1.1") != 0 ||
+		StrCmpi(h->Target, "200") != 0)
+	{
+		FreeHttpHeader(h);
+		return NULL;
+	}
+
+	v = GetHttpValue(h, "Content-Type");
+	if (v == NULL || StrCmpi(v->Data, HTTP_CONTENT_TYPE2) != 0)
+	{
+		FreeHttpHeader(h);
+		return NULL;
+	}
+
+	size = GetContentLength(h);
+	if (size == 0 || size > MAX_PACK_SIZE)
+	{
+		FreeHttpHeader(h);
+		return NULL;
+	}
+
+	tmp = MallocEx(size, true);
+	if (RecvAll(s, tmp, size, s->SecureMode) == false)
+	{
+		Free(tmp);
+		FreeHttpHeader(h);
+		return NULL;
+	}
+
+	b = NewBuf();
+	WriteBuf(b, tmp, size);
+	Free(tmp);
+	FreeHttpHeader(h);
+
+	SeekBuf(b, 0, 0);
+	p = BufToPack(b);
+	FreeBuf(b);
+
+	return p;
+}
+
+// Send a PACK to the client
+bool HttpServerSend(SOCK *s, PACK *p)
+{
+	BUF *b;
+	bool ret;
+	HTTP_HEADER *h;
+	char date_str[MAX_SIZE];
+	// Validate arguments
+	if (s == NULL || p == NULL)
+	{
+		return false;
+	}
+
+	CreateDummyValue(p);
+
+	b = PackToBuf(p);
+	if (b == NULL)
+	{
+		return false;
+	}
+
+	h = NewHttpHeader("HTTP/1.1", "200", "OK");
+
+	GetHttpDateStr(date_str, sizeof(date_str), SystemTime64());
+	AddHttpValue(h, NewHttpValue("Date", date_str));
+	AddHttpValue(h, NewHttpValue("Keep-Alive", HTTP_KEEP_ALIVE));
+	AddHttpValue(h, NewHttpValue("Connection", "Keep-Alive"));
+	AddHttpValue(h, NewHttpValue("Content-Type", HTTP_CONTENT_TYPE2));
+
+	ret = PostHttp(s, h, b->Buf, b->Size);
+
+	FreeHttpHeader(h);
+	FreeBuf(b);
+
+	return ret;
+}
+
+// Receive a PACK from the client
+PACK *HttpServerRecv(SOCK *s)
+{
+	return HttpServerRecvEx(s, 0);
+}
+PACK *HttpServerRecvEx(SOCK *s, UINT max_data_size)
+{
+	BUF *b;
+	PACK *p;
+	HTTP_HEADER *h;
+	UINT size;
+	UCHAR *tmp;
+	HTTP_VALUE *v;
+	UINT num_noop = 0;
+	if (max_data_size == 0) max_data_size = HTTP_PACK_MAX_SIZE;
+	// Validate arguments
+	if (s == NULL)
+	{
+		return NULL;
+	}
+
+START:
+	h = RecvHttpHeader(s);
+	if (h == NULL)
+	{
+		goto BAD_REQUEST;
+	}
+
+	if (StrCmpi(h->Method, "POST") != 0 ||
+		StrCmpi(h->Target, HTTP_VPN_TARGET) != 0 ||
+		StrCmpi(h->Version, "HTTP/1.1") != 0)
+	{
+		FreeHttpHeader(h);
+		goto BAD_REQUEST;
+	}
+
+	v = GetHttpValue(h, "Content-Type");
+	if (v == NULL || StrCmpi(v->Data, HTTP_CONTENT_TYPE2) != 0)
+	{
+		FreeHttpHeader(h);
+		goto BAD_REQUEST;
+	}
+
+	size = GetContentLength(h);
+	if (size == 0 || (size > max_data_size))
+	{
+		FreeHttpHeader(h);
+		goto BAD_REQUEST;
+	}
+
+	tmp = MallocEx(size, true);
+	if (RecvAll(s, tmp, size, s->SecureMode) == false)
+	{
+		Free(tmp);
+		FreeHttpHeader(h);
+		return NULL;
+	}
+
+	b = NewBuf();
+	WriteBuf(b, tmp, size);
+	Free(tmp);
+	FreeHttpHeader(h);
+
+	SeekBuf(b, 0, 0);
+	p = BufToPack(b);
+	FreeBuf(b);
+
+	// Determine whether it's a NOOP
+	if (PackGetInt(p, "noop") != 0)
+	{
+		Debug("recv: noop\n");
+		FreePack(p);
+
+		p = PackError(0);
+		PackAddInt(p, "noop", 1);
+		if (HttpServerSend(s, p) == false)
+		{
+			FreePack(p);
+			return NULL;
+		}
+
+		FreePack(p);
+
+		num_noop++;
+
+		if (num_noop > MAX_NOOP_PER_SESSION)
+		{
+			return NULL;
+		}
+
+		goto START;
+	}
+
+	return p;
+
+BAD_REQUEST:
+	// Return an error
+	return NULL;
+}
+
+// Send "403 Forbidden" error
+bool HttpSendForbidden(SOCK *s, char *target, char *server_id)
+{
+	HTTP_HEADER *h;
+	char date_str[MAX_SIZE];
+	char *str;
+	UINT str_size;
+	char port_str[MAX_SIZE];
+	bool ret;
+	char host[MAX_SIZE];
+	UINT port;
+	// Validate arguments
+	if (s == NULL || target == NULL)
+	{
+		return false;
+	}
+
+	// Get the host name
+	//GetMachineName(host, MAX_SIZE);
+	Zero(host, sizeof(host));
+	IPToStr(host, sizeof(host), &s->LocalIP);
+	// Get the port number
+	port = s->LocalPort;
+
+	// Creating a header
+	GetHttpDateStr(date_str, sizeof(date_str), SystemTime64());
+
+	h = NewHttpHeader("HTTP/1.1", "403", "Forbidden");
+
+	AddHttpValue(h, NewHttpValue("Date", date_str));
+	AddHttpValue(h, NewHttpValue("Keep-Alive", HTTP_KEEP_ALIVE));
+	AddHttpValue(h, NewHttpValue("Connection", "Keep-Alive"));
+	AddHttpValue(h, NewHttpValue("Content-Type", HTTP_CONTENT_TYPE));
+
+	// Creating a Data
+	str_size = sizeof(http_403_str) * 2 + StrLen(target) + StrLen(host);
+	str = Malloc(str_size);
+	StrCpy(str, str_size, http_403_str);
+
+	// TARGET
+	ReplaceUnsafeCharInHttpTarget(target);
+	ReplaceStri(str, str_size, str, "$TARGET$", target);
+
+	// HOST
+	ReplaceStri(str, str_size, str, "$HOST$", host);
+
+	// PORT
+	ToStr(port_str, port);
+	ReplaceStri(str, str_size, str, "$PORT$", port_str);
+
+	// Transmission
+	ret = PostHttp(s, h, str, StrLen(str));
+
+	FreeHttpHeader(h);
+	Free(str);
+
+	return ret;
+}
+
+// Send "404 Not Found" error
+bool HttpSendNotFound(SOCK *s, char *target)
+{
+	HTTP_HEADER *h;
+	char date_str[MAX_SIZE];
+	char *str;
+	UINT str_size;
+	char port_str[MAX_SIZE];
+	bool ret;
+	char host[MAX_SIZE];
+	UINT port;
+	// Validate arguments
+	if (s == NULL || target == NULL)
+	{
+		return false;
+	}
+
+	// Get the host name
+	//GetMachineName(host, MAX_SIZE);
+	Zero(host, sizeof(host));
+	IPToStr(host, sizeof(host), &s->LocalIP);
+	// Get the port number
+	port = s->LocalPort;
+
+	// Creating a header
+	GetHttpDateStr(date_str, sizeof(date_str), SystemTime64());
+
+	h = NewHttpHeader("HTTP/1.1", "404", "Not Found");
+
+	AddHttpValue(h, NewHttpValue("Date", date_str));
+	AddHttpValue(h, NewHttpValue("Keep-Alive", HTTP_KEEP_ALIVE));
+	AddHttpValue(h, NewHttpValue("Connection", "Keep-Alive"));
+	AddHttpValue(h, NewHttpValue("Content-Type", HTTP_CONTENT_TYPE));
+
+	// Creating a Data
+	str_size = sizeof(http_404_str) * 2 + StrLen(target) + StrLen(host);
+	str = Malloc(str_size);
+	StrCpy(str, str_size, http_404_str);
+
+	// TARGET
+	ReplaceUnsafeCharInHttpTarget(target);
+	ReplaceStri(str, str_size, str, "$TARGET$", target);
+
+	// HOST
+	ReplaceStri(str, str_size, str, "$HOST$", host);
+
+	// PORT
+	ToStr(port_str, port);
+	ReplaceStri(str, str_size, str, "$PORT$", port_str);
+
+	// Transmission
+	ret = PostHttp(s, h, str, StrLen(str));
+
+	FreeHttpHeader(h);
+	Free(str);
+
+	return ret;
+}
+
+// Send "501 Not Implemented" error
+bool HttpSendNotImplemented(SOCK *s, char *method, char *target, char *version)
+{
+	HTTP_HEADER *h;
+	char date_str[MAX_SIZE];
+	char *str;
+	UINT str_size;
+	char port_str[MAX_SIZE];
+	bool ret;
+	char host[MAX_SIZE];
+	UINT port;
+	// Validate arguments
+	if (s == NULL || target == NULL)
+	{
+		return false;
+	}
+
+	// Get the host name
+	//GetMachineName(host, MAX_SIZE);
+	Zero(host, sizeof(host));
+	IPToStr(host, sizeof(host), &s->LocalIP);
+	// Get the port number
+	port = s->LocalPort;
+
+	// Creating a header
+	GetHttpDateStr(date_str, sizeof(date_str), SystemTime64());
+
+	h = NewHttpHeader("HTTP/1.1", "501", "Method Not Implemented");
+
+	AddHttpValue(h, NewHttpValue("Date", date_str));
+	AddHttpValue(h, NewHttpValue("Keep-Alive", HTTP_KEEP_ALIVE));
+	AddHttpValue(h, NewHttpValue("Connection", "Keep-Alive"));
+	AddHttpValue(h, NewHttpValue("Content-Type", HTTP_CONTENT_TYPE));
+
+	// Creating a Data
+	str_size = sizeof(http_501_str) * 2 + StrLen(target) + StrLen(host) + StrLen(method) + StrLen(version);
+	str = Malloc(str_size);
+	StrCpy(str, str_size, http_501_str);
+
+	// TARGET
+	ReplaceUnsafeCharInHttpTarget(target);
+	ReplaceStri(str, str_size, str, "$TARGET$", target);
+
+	// HOST
+	ReplaceStri(str, str_size, str, "$HOST$", host);
+
+	// PORT
+	ToStr(port_str, port);
+	ReplaceStri(str, str_size, str, "$PORT$", port_str);
+
+	// METHOD
+	ReplaceStri(str, str_size, str, "$METHOD$", method);
+
+	// VERSION
+	ReplaceStri(str, str_size, str, "$VERSION$", version);
+
+	// Transmission
+	ret = PostHttp(s, h, str, StrLen(str));
+
+	FreeHttpHeader(h);
+	Free(str);
+
+	return ret;
+}
diff --git a/src/Mayaqua/HTTP.h b/src/Mayaqua/HTTP.h
index f5f3b149..84814a8d 100644
--- a/src/Mayaqua/HTTP.h
+++ b/src/Mayaqua/HTTP.h
@@ -1,6 +1,47 @@
 #ifndef HTTP_H
 #define HTTP_H
 
+#define	DEFAULT_USER_AGENT	"Mozilla/5.0 (Windows NT 6.3; WOW64; rv:29.0) Gecko/20100101 Firefox/29.0"
+#define	DEFAULT_ACCEPT		"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/msword, application/vnd.ms-powerpoint, application/vnd.ms-excel, */*"
+#define	DEFAULT_ENCODING	"gzip, deflate"
+#define	HTTP_CONTENT_TYPE	"text/html; charset=iso-8859-1"
+#define	HTTP_CONTENT_TYPE2	"application/octet-stream"
+#define	HTTP_CONTENT_TYPE3	"image/jpeg"
+#define	HTTP_CONTENT_TYPE4	"text/html"
+#define	HTTP_CONTENT_TYPE5	"message/rfc822"
+#define	HTTP_KEEP_ALIVE		"timeout=15; max=19"
+#define	HTTP_VPN_TARGET		"/vpnsvc/vpn.cgi"
+#define	HTTP_VPN_TARGET2	"/vpnsvc/connect.cgi"
+#define HTTP_VPN_TARGET_POSTDATA	"VPNCONNECT"
+#define	HTTP_SAITAMA		"/saitama.jpg"
+#define	HTTP_PICTURES		"/picture"
+// Maximum size of the custom HTTP header
+#define	HTTP_CUSTOM_HEADER_MAX_SIZE	1024
+// Maximum size of a single line in the HTTP header
+#define	HTTP_HEADER_LINE_MAX_SIZE	4096
+// Maximum number of lines in the HTTP header
+#define	HTTP_HEADER_MAX_LINES		128
+// Maximum size of the random number to be included in the PACK
+#define	HTTP_PACK_RAND_SIZE_MAX		1000
+// Maximum PACK size in the HTTP
+#define	HTTP_PACK_MAX_SIZE			65536
+
+// HTTP value
+struct HTTP_VALUE
+{
+	char *Name;						// Name
+	char *Data;						// Data
+};
+
+// HTTP header
+struct HTTP_HEADER
+{
+	char *Method;					// Method
+	char *Target;					// Target
+	char *Version;					// Version
+	LIST *ValueList;				// Value list
+};
+
 // MIME type
 struct HTTP_MIME_TYPE
 {
@@ -9,5 +50,29 @@ struct HTTP_MIME_TYPE
 };
 
 char *GetMimeTypeFromFileName(char *filename);
+void GetHttpDateStr(char *str, UINT size, UINT64 t);
+void ReplaceUnsafeCharInHttpTarget(char *target);
+HTTP_HEADER *NewHttpHeader(char *method, char *target, char *version);
+HTTP_HEADER *NewHttpHeaderEx(char *method, char *target, char *version, bool no_sort);
+void FreeHttpHeader(HTTP_HEADER *header);
+HTTP_VALUE *NewHttpValue(char *name, char *data);
+void FreeHttpValue(HTTP_VALUE *value);
+int CompareHttpValue(void *p1, void *p2);
+HTTP_VALUE *GetHttpValue(HTTP_HEADER *header, char *name);
+void AddHttpValue(HTTP_HEADER *header, HTTP_VALUE *value);
+bool AddHttpValueStr(HTTP_HEADER* header, char *string);
+UINT GetContentLength(HTTP_HEADER *header);
+bool PostHttp(SOCK *s, HTTP_HEADER *header, void *post_data, UINT post_size);
+char *HttpHeaderToStr(HTTP_HEADER *header);
+bool SendHttpHeader(SOCK *s, HTTP_HEADER *header);
+HTTP_HEADER *RecvHttpHeader(SOCK *s);
+bool HttpClientSend(SOCK *s, PACK *p);
+PACK *HttpClientRecv(SOCK *s);
+bool HttpServerSend(SOCK *s, PACK *p);
+PACK *HttpServerRecv(SOCK *s);
+PACK *HttpServerRecvEx(SOCK *s, UINT max_data_size);
+bool HttpSendForbidden(SOCK *s, char *target, char *server_id);
+bool HttpSendNotFound(SOCK *s, char *target);
+bool HttpSendNotImplemented(SOCK *s, char *method, char *target, char *version);
 
 #endif
diff --git a/src/Mayaqua/Network.c b/src/Mayaqua/Network.c
index 1bb2f6d1..ce9cf798 100644
--- a/src/Mayaqua/Network.c
+++ b/src/Mayaqua/Network.c
@@ -76,13 +76,7 @@ struct ROUTE_CHANGE_DATA
 #endif	// IPV6_V6ONLY
 #endif	// UNIX_SOLARIS
 
-
-
 // HTTP constant
-static char http_404_str[] = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n<HTML><HEAD>\r\n<TITLE>404 Not Found</TITLE>\r\n</HEAD><BODY>\r\n<H1>Not Found</H1>\r\nThe requested URL $TARGET$ was not found on this server.<P>\r\n<HR>\r\n<ADDRESS>HTTP Server at $HOST$ Port $PORT$</ADDRESS>\r\n</BODY></HTML>\r\n";
-static char http_403_str[] = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n<HTML><HEAD>\r\n<TITLE>403 Forbidden</TITLE>\r\n</HEAD><BODY>\r\n<H1>Forbidden</H1>\r\nYou don't have permission to access $TARGET$\r\non this server.<P>\r\n<HR>\r\n<ADDRESS>HTTP Server at $HOST$ Port $PORT$</ADDRESS>\r\n</BODY></HTML>\r\n";
-static char http_500_str[] = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n<HTML><HEAD>\r\n<TITLE>500 Server Error</TITLE>\r\n</HEAD><BODY>\r\n<H1>Server Error</H1>\r\nServer Error<P>\r\n<HR>\r\n<ADDRESS>HTTP Server at $HOST$ Port $PORT$</ADDRESS>\r\n</BODY></HTML>\r\n";
-static char http_501_str[] = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n<HTML><HEAD>\r\n<TITLE>501 Method Not Implemented</TITLE>\r\n</HEAD><BODY>\r\n<H1>Method Not Implemented</H1>\r\n$METHOD$ to $TARGET$ not supported.<P>\r\nInvalid method in request $METHOD$ $TARGET$ $VERSION$<P>\r\n<HR>\r\n<ADDRESS>HTTP Server at $HOST$ Port $PORT$</ADDRESS>\r\n</BODY></HTML>\r\n";
 static char http_detect_server_startwith[] = "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\r\n<HTML><HEAD>\r\n<TITLE>403 Forbidden</TITLE>\r\n</HEAD><BODY>\r\n<H1>Forbidden</H1>\r\nYou don't have permission to access ";
 static char http_detect_server_tag_future[] = "9C37197CA7C2428388C2E6E59B829B30";
 
@@ -19945,109 +19939,6 @@ void FlushTubeFlushList(TUBE_FLUSH_LIST *f)
 	DeleteAll(f->List);
 }
 
-// The server receives a PACK from the client
-PACK *HttpServerRecv(SOCK *s)
-{
-	return HttpServerRecvEx(s, 0);
-}
-PACK *HttpServerRecvEx(SOCK *s, UINT max_data_size)
-{
-	BUF *b;
-	PACK *p;
-	HTTP_HEADER *h;
-	UINT size;
-	UCHAR *tmp;
-	HTTP_VALUE *v;
-	UINT num_noop = 0;
-	if (max_data_size == 0) max_data_size = HTTP_PACK_MAX_SIZE;
-	// Validate arguments
-	if (s == NULL)
-	{
-		return NULL;
-	}
-
-START:
-
-	h = RecvHttpHeader(s);
-	if (h == NULL)
-	{
-		goto BAD_REQUEST;
-	}
-
-	if (StrCmpi(h->Method, "POST") != 0 ||
-		StrCmpi(h->Target, HTTP_VPN_TARGET) != 0 ||
-		StrCmpi(h->Version, "HTTP/1.1") != 0)
-	{
-		FreeHttpHeader(h);
-		goto BAD_REQUEST;
-	}
-
-	v = GetHttpValue(h, "Content-Type");
-	if (v == NULL || StrCmpi(v->Data, HTTP_CONTENT_TYPE2) != 0)
-	{
-		FreeHttpHeader(h);
-		goto BAD_REQUEST;
-	}
-
-	size = GetContentLength(h);
-	if (size == 0 || (size > max_data_size))
-	{
-		FreeHttpHeader(h);
-		goto BAD_REQUEST;
-	}
-
-	tmp = MallocEx(size, true);
-	if (RecvAll(s, tmp, size, s->SecureMode) == false)
-	{
-		Free(tmp);
-		FreeHttpHeader(h);
-		return NULL;
-	}
-
-	b = NewBuf();
-	WriteBuf(b, tmp, size);
-	Free(tmp);
-	FreeHttpHeader(h);
-
-	SeekBuf(b, 0, 0);
-	p = BufToPack(b);
-	FreeBuf(b);
-
-	// Determine whether it's a NOOP
-	if (PackGetInt(p, "noop") != 0)
-	{
-		Debug("recv: noop\n");
-		FreePack(p);
-
-		p = PackError(0);
-		PackAddInt(p, "noop", 1);
-		if (HttpServerSend(s, p) == false)
-		{
-			FreePack(p);
-			return NULL;
-		}
-
-		FreePack(p);
-
-		num_noop++;
-
-		if (num_noop > MAX_NOOP_PER_SESSION)
-		{
-			return NULL;
-		}
-
-		goto START;
-	}
-
-	return p;
-
-BAD_REQUEST:
-	// Return an error
-
-
-	return NULL;
-}
-
 // Store the error value into PACK
 PACK *PackError(UINT error)
 {
@@ -20071,68 +19962,6 @@ UINT GetErrorFromPack(PACK *p)
 	return PackGetInt(p, "error");
 }
 
-// Client receives a PACK from the server
-PACK *HttpClientRecv(SOCK *s)
-{
-	BUF *b;
-	PACK *p;
-	HTTP_HEADER *h;
-	UINT size;
-	UCHAR *tmp;
-	HTTP_VALUE *v;
-	// Validate arguments
-	if (s == NULL)
-	{
-		return NULL;
-	}
-
-	h = RecvHttpHeader(s);
-	if (h == NULL)
-	{
-		return NULL;
-	}
-
-	if (StrCmpi(h->Method, "HTTP/1.1") != 0 ||
-		StrCmpi(h->Target, "200") != 0)
-	{
-		FreeHttpHeader(h);
-		return NULL;
-	}
-
-	v = GetHttpValue(h, "Content-Type");
-	if (v == NULL || StrCmpi(v->Data, HTTP_CONTENT_TYPE2) != 0)
-	{
-		FreeHttpHeader(h);
-		return NULL;
-	}
-
-	size = GetContentLength(h);
-	if (size == 0 || size > MAX_PACK_SIZE)
-	{
-		FreeHttpHeader(h);
-		return NULL;
-	}
-
-	tmp = MallocEx(size, true);
-	if (RecvAll(s, tmp, size, s->SecureMode) == false)
-	{
-		Free(tmp);
-		FreeHttpHeader(h);
-		return NULL;
-	}
-
-	b = NewBuf();
-	WriteBuf(b, tmp, size);
-	Free(tmp);
-	FreeHttpHeader(h);
-
-	SeekBuf(b, 0, 0);
-	p = BufToPack(b);
-	FreeBuf(b);
-
-	return p;
-}
-
 // Create an entry to PACK for the dummy
 void CreateDummyValue(PACK *p)
 {
@@ -20153,497 +19982,6 @@ void CreateDummyValue(PACK *p)
 	Free(buf);
 }
 
-// Client sends a PACK to the server
-bool HttpClientSend(SOCK *s, PACK *p)
-{
-	BUF *b;
-	bool ret;
-	HTTP_HEADER *h;
-	char date_str[MAX_SIZE];
-	char ip_str[MAX_SIZE];
-
-	// Validate arguments
-	if (s == NULL || p == NULL)
-	{
-		return false;
-	}
-
-	IPToStr(ip_str, sizeof(ip_str), &s->RemoteIP);
-
-	CreateDummyValue(p);
-
-	b = PackToBuf(p);
-	if (b == NULL)
-	{
-		return false;
-	}
-
-	h = NewHttpHeader("POST", HTTP_VPN_TARGET, "HTTP/1.1");
-
-	GetHttpDateStr(date_str, sizeof(date_str), SystemTime64());
-	AddHttpValue(h, NewHttpValue("Date", date_str));
-	AddHttpValue(h, NewHttpValue("Host", ip_str));
-	AddHttpValue(h, NewHttpValue("Keep-Alive", HTTP_KEEP_ALIVE));
-	AddHttpValue(h, NewHttpValue("Connection", "Keep-Alive"));
-	AddHttpValue(h, NewHttpValue("Content-Type", HTTP_CONTENT_TYPE2));
-
-	ret = PostHttp(s, h, b->Buf, b->Size);
-
-	FreeHttpHeader(h);
-	FreeBuf(b);
-
-	return ret;
-}
-
-// Server sends a PACK to the client
-bool HttpServerSend(SOCK *s, PACK *p)
-{
-	BUF *b;
-	bool ret;
-	HTTP_HEADER *h;
-	char date_str[MAX_SIZE];
-	// Validate arguments
-	if (s == NULL || p == NULL)
-	{
-		return false;
-	}
-
-	CreateDummyValue(p);
-
-	b = PackToBuf(p);
-	if (b == NULL)
-	{
-		return false;
-	}
-
-	h = NewHttpHeader("HTTP/1.1", "200", "OK");
-
-	GetHttpDateStr(date_str, sizeof(date_str), SystemTime64());
-	AddHttpValue(h, NewHttpValue("Date", date_str));
-	AddHttpValue(h, NewHttpValue("Keep-Alive", HTTP_KEEP_ALIVE));
-	AddHttpValue(h, NewHttpValue("Connection", "Keep-Alive"));
-	AddHttpValue(h, NewHttpValue("Content-Type", HTTP_CONTENT_TYPE2));
-
-	ret = PostHttp(s, h, b->Buf, b->Size);
-
-	FreeHttpHeader(h);
-	FreeBuf(b);
-
-	return ret;
-}
-
-// Replace unsafe characters in target
-void ReplaceUnsafeCharInTarget(char *target){
-	UINT i;
-	for(i = 0; target[i] ; i++) {
-		if(target[i] == '<')
-			target[i] = '(';
-		else if(target[i] == '>')
-			target[i] = ')';
-	}
-}
-
-// Sending the 501 Not Implemented error
-bool HttpSendNotImplemented(SOCK *s, char *method, char *target, char *version)
-{
-	HTTP_HEADER *h;
-	char date_str[MAX_SIZE];
-	char *str;
-	UINT str_size;
-	char port_str[MAX_SIZE];
-	bool ret;
-	char host[MAX_SIZE];
-	UINT port;
-	// Validate arguments
-	if (s == NULL || target == NULL)
-	{
-		return false;
-	}
-
-	// Get the host name
-	//GetMachineName(host, MAX_SIZE);
-	Zero(host, sizeof(host));
-	IPToStr(host, sizeof(host), &s->LocalIP);
-	// Get the port number
-	port = s->LocalPort;
-
-	// Creating a header
-	GetHttpDateStr(date_str, sizeof(date_str), SystemTime64());
-
-	h = NewHttpHeader("HTTP/1.1", "501", "Method Not Implemented");
-
-	AddHttpValue(h, NewHttpValue("Date", date_str));
-	AddHttpValue(h, NewHttpValue("Keep-Alive", HTTP_KEEP_ALIVE));
-	AddHttpValue(h, NewHttpValue("Connection", "Keep-Alive"));
-	AddHttpValue(h, NewHttpValue("Content-Type", HTTP_CONTENT_TYPE));
-
-	// Creating a Data
-	str_size = sizeof(http_501_str) * 2 + StrLen(target) + StrLen(host) + StrLen(method) + StrLen(version);
-	str = Malloc(str_size);
-	StrCpy(str, str_size, http_501_str);
-
-	// TARGET
-	ReplaceUnsafeCharInTarget(target);
-	ReplaceStri(str, str_size, str, "$TARGET$", target);
-
-	// HOST
-	ReplaceStri(str, str_size, str, "$HOST$", host);
-
-	// PORT
-	ToStr(port_str, port);
-	ReplaceStri(str, str_size, str, "$PORT$", port_str);
-
-	// METHOD
-	ReplaceStri(str, str_size, str, "$METHOD$", method);
-
-	// VERSION
-	ReplaceStri(str, str_size, str, "$VERSION$", version);
-
-	// Transmission
-	ret = PostHttp(s, h, str, StrLen(str));
-
-	FreeHttpHeader(h);
-	Free(str);
-
-	return ret;
-}
-
-// Sending a 404 Not Found error
-bool HttpSendNotFound(SOCK *s, char *target)
-{
-	HTTP_HEADER *h;
-	char date_str[MAX_SIZE];
-	char *str;
-	UINT str_size;
-	char port_str[MAX_SIZE];
-	bool ret;
-	char host[MAX_SIZE];
-	UINT port;
-	// Validate arguments
-	if (s == NULL || target == NULL)
-	{
-		return false;
-	}
-
-	// Get the host name
-	//GetMachineName(host, MAX_SIZE);
-	Zero(host, sizeof(host));
-	IPToStr(host, sizeof(host), &s->LocalIP);
-	// Get the port number
-	port = s->LocalPort;
-
-	// Creating a header
-	GetHttpDateStr(date_str, sizeof(date_str), SystemTime64());
-
-	h = NewHttpHeader("HTTP/1.1", "404", "Not Found");
-
-	AddHttpValue(h, NewHttpValue("Date", date_str));
-	AddHttpValue(h, NewHttpValue("Keep-Alive", HTTP_KEEP_ALIVE));
-	AddHttpValue(h, NewHttpValue("Connection", "Keep-Alive"));
-	AddHttpValue(h, NewHttpValue("Content-Type", HTTP_CONTENT_TYPE));
-
-	// Creating a Data
-	str_size = sizeof(http_404_str) * 2 + StrLen(target) + StrLen(host);
-	str = Malloc(str_size);
-	StrCpy(str, str_size, http_404_str);
-
-	// TARGET
-	ReplaceUnsafeCharInTarget(target);
-	ReplaceStri(str, str_size, str, "$TARGET$", target);
-
-	// HOST
-	ReplaceStri(str, str_size, str, "$HOST$", host);
-
-	// PORT
-	ToStr(port_str, port);
-	ReplaceStri(str, str_size, str, "$PORT$", port_str);
-
-	// Transmission
-	ret = PostHttp(s, h, str, StrLen(str));
-
-	FreeHttpHeader(h);
-	Free(str);
-
-	return ret;
-}
-
-// Sending a 403 Forbidden error
-bool HttpSendForbidden(SOCK *s, char *target, char *server_id)
-{
-	HTTP_HEADER *h;
-	char date_str[MAX_SIZE];
-	char *str;
-	UINT str_size;
-	char port_str[MAX_SIZE];
-	bool ret;
-	char host[MAX_SIZE];
-	UINT port;
-	// Validate arguments
-	if (s == NULL || target == NULL)
-	{
-		return false;
-	}
-
-	// Get the host name
-	//GetMachineName(host, MAX_SIZE);
-	Zero(host, sizeof(host));
-	IPToStr(host, sizeof(host), &s->LocalIP);
-	// Get the port number
-	port = s->LocalPort;
-
-	// Creating a header
-	GetHttpDateStr(date_str, sizeof(date_str), SystemTime64());
-
-	h = NewHttpHeader("HTTP/1.1", "403", "Forbidden");
-
-	AddHttpValue(h, NewHttpValue("Date", date_str));
-	AddHttpValue(h, NewHttpValue("Keep-Alive", HTTP_KEEP_ALIVE));
-	AddHttpValue(h, NewHttpValue("Connection", "Keep-Alive"));
-	AddHttpValue(h, NewHttpValue("Content-Type", HTTP_CONTENT_TYPE));
-
-	// Creating a Data
-	str_size = sizeof(http_403_str) * 2 + StrLen(target) + StrLen(host);
-	str = Malloc(str_size);
-	StrCpy(str, str_size, http_403_str);
-
-	// TARGET
-	ReplaceUnsafeCharInTarget(target);
-	ReplaceStri(str, str_size, str, "$TARGET$", target);
-
-	// HOST
-	ReplaceStri(str, str_size, str, "$HOST$", host);
-
-	// PORT
-	ToStr(port_str, port);
-	ReplaceStri(str, str_size, str, "$PORT$", port_str);
-
-	// Transmission
-	ret = PostHttp(s, h, str, StrLen(str));
-
-	FreeHttpHeader(h);
-	Free(str);
-
-	return ret;
-}
-
-// Get the date and time string for the HTTP header
-void GetHttpDateStr(char *str, UINT size, UINT64 t)
-{
-	SYSTEMTIME s;
-	static char *wday[] =
-	{
-		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
-	};
-	static char *month[] =
-	{
-		"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
-		"Nov", "Dec",
-	};
-	// Validate arguments
-	if (str == NULL)
-	{
-		return;
-	}
-	UINT64ToSystem(&s, t);
-
-	Format(str, size, "%s, %02u %s %04u %02u:%02u:%02u GMT",
-		wday[s.wDayOfWeek], s.wDay, month[s.wMonth - 1], s.wYear,
-		s.wHour, s.wMinute, s.wSecond);
-}
-
-// Get the Content-Length from the HTTP header
-UINT GetContentLength(HTTP_HEADER *header)
-{
-	UINT ret;
-	HTTP_VALUE *v;
-	// Validate arguments
-	if (header == NULL)
-	{
-		return 0;
-	}
-
-	v = GetHttpValue(header, "Content-Length");
-	if (v == NULL)
-	{
-		return 0;
-	}
-
-	ret = ToInt(v->Data);
-
-	return ret;
-}
-
-// Send the data in the HTTP
-bool PostHttp(SOCK *s, HTTP_HEADER *header, void *post_data, UINT post_size)
-{
-	char *header_str;
-	BUF *b;
-	bool ret;
-	// Validate arguments
-	if (s == NULL || header == NULL || (post_size != 0 && post_data == NULL))
-	{
-		return false;
-	}
-
-	// Check whether the Content-Length exists?
-	if (GetHttpValue(header, "Content-Length") == NULL)
-	{
-		char tmp[MAX_SIZE];
-		// Add because it does not exist
-		ToStr(tmp, post_size);
-		AddHttpValue(header, NewHttpValue("Content-Length", tmp));
-	}
-
-	// Convert the header to string
-	header_str = HttpHeaderToStr(header);
-	if (header_str == NULL)
-	{
-		return false;
-	}
-	b = NewBuf();
-	WriteBuf(b, header_str, StrLen(header_str));
-	Free(header_str);
-
-	// Append the data
-	WriteBuf(b, post_data, post_size);
-
-	// Send
-	ret = SendAll(s, b->Buf, b->Size, s->SecureMode);
-
-	FreeBuf(b);
-
-	return ret;
-}
-
-// Convert a HTTP header to a string
-char *HttpHeaderToStr(HTTP_HEADER *header)
-{
-	BUF *b;
-	char *tmp;
-	UINT i;
-	char *s;
-	// Validate arguments
-	if (header == NULL)
-	{
-		return NULL;
-	}
-
-	tmp = Malloc(HTTP_HEADER_LINE_MAX_SIZE);
-	b = NewBuf();
-
-	// Header
-	Format(tmp, HTTP_HEADER_LINE_MAX_SIZE,
-		"%s %s %s\r\n", header->Method, header->Target, header->Version);
-	WriteBuf(b, tmp, StrLen(tmp));
-
-	// Value
-	for (i = 0;i < LIST_NUM(header->ValueList);i++)
-	{
-		HTTP_VALUE *v = (HTTP_VALUE *)LIST_DATA(header->ValueList, i);
-		Format(tmp, HTTP_HEADER_LINE_MAX_SIZE,
-			"%s: %s\r\n", v->Name, v->Data);
-		WriteBuf(b, tmp, StrLen(tmp));
-	}
-
-	// Trailing newline
-	WriteBuf(b, "\r\n", 2);
-	s = Malloc(b->Size + 1);
-	Copy(s, b->Buf, b->Size);
-	s[b->Size] = 0;
-
-	FreeBuf(b);
-	Free(tmp);
-
-	return s;
-}
-
-// Send the HTTP header
-bool SendHttpHeader(SOCK *s, HTTP_HEADER *header)
-{
-	char *str;
-	bool ret;
-	// Validate arguments
-	if (s == NULL || header == NULL)
-	{
-		return false;
-	}
-
-	// Convert to string
-	str = HttpHeaderToStr(header);
-
-	// Transmission
-	ret = SendAll(s, str, StrLen(str), s->SecureMode);
-
-	Free(str);
-
-	return ret;
-}
-
-// Receive an HTTP header
-HTTP_HEADER *RecvHttpHeader(SOCK *s)
-{
-	TOKEN_LIST *token = NULL;
-	char *str = NULL;
-	HTTP_HEADER *header = NULL;
-	// Validate arguments
-	if (s == NULL)
-	{
-		return NULL;
-	}
-
-	// Get the first line
-	str = RecvLine(s, HTTP_HEADER_LINE_MAX_SIZE);
-	if (str == NULL)
-	{
-		return NULL;
-	}
-
-	// Split into tokens
-	token = ParseToken(str, " ");
-
-	FreeSafe(PTR_TO_PTR(str));
-
-	if (token->NumTokens < 3)
-	{
-		FreeToken(token);
-		return NULL;
-	}
-
-	// Creating a header object
-	header = NewHttpHeader(token->Token[0], token->Token[1], token->Token[2]);
-	FreeToken(token);
-
-	if (StrCmpi(header->Version, "HTTP/0.9") == 0)
-	{
-		// The header ends with this line
-		return header;
-	}
-
-	// Get the subsequent lines
-	while (true)
-	{
-		str = RecvLine(s, HTTP_HEADER_LINE_MAX_SIZE);
-		Trim(str);
-		if (IsEmptyStr(str))
-		{
-			// End of header
-			FreeSafe(PTR_TO_PTR(str));
-			break;
-		}
-
-		if (AddHttpValueStr(header, str) == false)
-		{
-			FreeSafe(PTR_TO_PTR(str));
-			FreeHttpHeaderSafe(&header);
-			break;
-		}
-
-		FreeSafe(PTR_TO_PTR(str));
-	}
-
-	return header;
-}
-
 // Receive a line
 char *RecvLine(SOCK *s, UINT max_size)
 {
@@ -20695,207 +20033,6 @@ char *RecvLine(SOCK *s, UINT max_size)
 	}
 }
 
-// Creating a new HTTP value
-HTTP_VALUE *NewHttpValue(char *name, char *data)
-{
-	HTTP_VALUE *v;
-	// Validate arguments
-	if (name == NULL || data == NULL)
-	{
-		return NULL;
-	}
-
-	v = ZeroMalloc(sizeof(HTTP_VALUE));
-
-	v->Name = CopyStr(name);
-	v->Data = CopyStr(data);
-
-	Trim(v->Name);
-	Trim(v->Data);
-
-	return v;
-}
-
-// Look for the HTTP value from the HTTP header
-HTTP_VALUE *GetHttpValue(HTTP_HEADER *header, char *name)
-{
-	HTTP_VALUE *v, t;
-	// Validate arguments
-	if (header == NULL || name == NULL)
-	{
-		return NULL;
-	}
-
-	t.Name = name;
-	v = Search(header->ValueList, &t);
-	if (v == NULL)
-	{
-		return NULL;
-	}
-
-	return v;
-}
-
-// Add a HTTP value to the HTTP header
-void AddHttpValue(HTTP_HEADER *header, HTTP_VALUE *value)
-{
-	// Validate arguments
-	if (header == NULL || value == NULL)
-	{
-		return;
-	}
-
-	if (LIST_NUM(header->ValueList) < HTTP_HEADER_MAX_LINES)
-	{
-		Insert(header->ValueList, value);
-	}
-	else
-	{
-		FreeHttpValue(value);
-	}
-}
-
-// Adds the HTTP value contained in the string to the HTTP header
-bool AddHttpValueStr(HTTP_HEADER* header, char *string)
-{
-	HTTP_VALUE *value = NULL;
-	UINT pos = 0;
-	char *value_name = NULL;
-	char *value_data = NULL;
-
-	// Validate arguments
-	if (header == NULL || IsEmptyStr(string))
-	{
-		return false;
-	}
-
-	// Sanitize string
-	EnSafeHttpHeaderValueStr(string, ' ');
-
-	// Get the position of the colon
-	pos = SearchStr(string, ":", 0);
-	if (pos == INFINITE)
-	{
-		// The colon does not exist
-		return false;
-	}
-
-	if ((pos + 1) >= StrLen(string))
-	{
-		// There is no data
-		return false;
-	}
-
-	// Divide into the name and the data
-	value_name = Malloc(pos + 1);
-	Copy(value_name, string, pos);
-	value_name[pos] = 0;
-	value_data = &string[pos + 1];
-
-	value = NewHttpValue(value_name, value_data);
-	if (value == NULL)
-	{
-		Free(value_name);
-		return false;
-	}
-
-	Free(value_name);
-
-	AddHttpValue(header, value);
-
-	return true;
-}
-
-// Create an HTTP header
-HTTP_HEADER *NewHttpHeader(char *method, char *target, char *version)
-{
-	return NewHttpHeaderEx(method, target, version, false);
-}
-HTTP_HEADER *NewHttpHeaderEx(char *method, char *target, char *version, bool no_sort)
-{
-	HTTP_HEADER *header;
-	// Validate arguments
-	if (method == NULL || target == NULL || version == NULL)
-	{
-		return NULL;
-	}
-
-	header = ZeroMalloc(sizeof(HTTP_HEADER));
-
-	header->Method = CopyStr(method);
-	header->Target = CopyStr(target);
-	header->Version = CopyStr(version);
-	header->ValueList = NewListFast(no_sort ? NULL : CompareHttpValue);
-
-	return header;
-}
-
-// Comparison function of the HTTP value
-int CompareHttpValue(void *p1, void *p2)
-{
-	HTTP_VALUE *v1, *v2;
-	if (p1 == NULL || p2 == NULL)
-	{
-		return 0;
-	}
-	v1 = *(HTTP_VALUE **)p1;
-	v2 = *(HTTP_VALUE **)p2;
-	if (v1 == NULL || v2 == NULL)
-	{
-		return 0;
-	}
-	return StrCmpi(v1->Name, v2->Name);
-}
-
-// Release the HTTP value
-void FreeHttpValue(HTTP_VALUE *value)
-{
-	// Validate arguments
-	if (value == NULL)
-	{
-		return;
-	}
-
-	Free(value->Data);
-	Free(value->Name);
-
-	Free(value);
-}
-
-// Release the HTTP header
-void FreeHttpHeader(HTTP_HEADER *header)
-{
-	UINT i;
-	HTTP_VALUE **values;
-	// Validate arguments
-	if (header == NULL)
-	{
-		return;
-	}
-
-	Free(header->Method);
-	Free(header->Target);
-	Free(header->Version);
-
-	values = ToArray(header->ValueList);
-	for (i = 0;i < LIST_NUM(header->ValueList);i++)
-	{
-		FreeHttpValue(values[i]);
-	}
-	Free(values);
-
-	ReleaseList(header->ValueList);
-
-	Free(header);
-}
-
-// Release the HTTP header and set pointer's value to NULL
-void FreeHttpHeaderSafe(HTTP_HEADER **header)
-{
-	FreeHttpHeader(*header);
-	*header = NULL;
-}
-
 // Receive a PACK
 PACK *RecvPack(SOCK *s)
 {
diff --git a/src/Mayaqua/Network.h b/src/Mayaqua/Network.h
index 5689a8ee..06dbc6fd 100644
--- a/src/Mayaqua/Network.h
+++ b/src/Mayaqua/Network.h
@@ -874,53 +874,6 @@ struct NIC_ENTRY
 	UCHAR MacAddress[6];
 };
 
-
-// HTTP value
-struct HTTP_VALUE
-{
-	char *Name;						// Name
-	char *Data;						// Data
-};
-
-// HTTP header
-struct HTTP_HEADER
-{
-	char *Method;					// Method
-	char *Target;					// Target
-	char *Version;					// Version
-	LIST *ValueList;				// Value list
-};
-
-// HTTPS server / client related string constant
-#define	DEFAULT_USER_AGENT	"Mozilla/5.0 (Windows NT 6.3; WOW64; rv:29.0) Gecko/20100101 Firefox/29.0"
-#define	DEFAULT_ACCEPT		"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/msword, application/vnd.ms-powerpoint, application/vnd.ms-excel, */*"
-#define	DEFAULT_ENCODING	"gzip, deflate"
-#define	HTTP_CONTENT_TYPE	"text/html; charset=iso-8859-1"
-#define	HTTP_CONTENT_TYPE2	"application/octet-stream"
-#define	HTTP_CONTENT_TYPE3	"image/jpeg"
-#define	HTTP_CONTENT_TYPE4	"text/html"
-#define	HTTP_CONTENT_TYPE5	"message/rfc822"
-#define	HTTP_KEEP_ALIVE		"timeout=15; max=19"
-#define	HTTP_VPN_TARGET		"/vpnsvc/vpn.cgi"
-#define	HTTP_VPN_TARGET2	"/vpnsvc/connect.cgi"
-#define HTTP_VPN_TARGET_POSTDATA	"VPNCONNECT"
-#define	HTTP_SAITAMA		"/saitama.jpg"
-#define	HTTP_PICTURES		"/picture"
-// Maximum size of the custom HTTP header
-#define	HTTP_CUSTOM_HEADER_MAX_SIZE	1024
-// Maximum size of a single line in the HTTP header
-#define	HTTP_HEADER_LINE_MAX_SIZE	4096
-// Maximum number of lines in the HTTP header
-#define	HTTP_HEADER_MAX_LINES		128
-// Maximum size of the random number to be included in the PACK
-#define	HTTP_PACK_RAND_SIZE_MAX		1000
-// Maximum PACK size in the HTTP
-#define	HTTP_PACK_MAX_SIZE			65536
-
-
-
-
-
 int GetCurrentTimezone();
 
 bool GetSniNameFromSslPacket(UCHAR *packet_buf, UINT packet_size, char *sni, UINT sni_size);
@@ -934,16 +887,6 @@ bool IsUseAlternativeHostname();
 int GetCurrentTimezoneWin32();
 #endif	// OS_WIN32
 
-HTTP_VALUE *GetHttpValue(HTTP_HEADER *header, char *name);
-void AddHttpValue(HTTP_HEADER *header, HTTP_VALUE *value);
-bool AddHttpValueStr(HTTP_HEADER* header, char *string);
-HTTP_HEADER *NewHttpHeader(char *method, char *target, char *version);
-HTTP_HEADER *NewHttpHeaderEx(char *method, char *target, char *version, bool no_sort);
-int CompareHttpValue(void *p1, void *p2);
-void FreeHttpValue(HTTP_VALUE *value);
-void FreeHttpHeader(HTTP_HEADER *header);
-void FreeHttpHeaderSafe(HTTP_HEADER **header);
-
 bool SendPack(SOCK *s, PACK *p);
 PACK *RecvPack(SOCK *s);
 PACK *RecvPackWithHash(SOCK *s);
@@ -954,23 +897,7 @@ PACK *PackError(UINT error);
 
 void CreateDummyValue(PACK *p);
 
-HTTP_VALUE *NewHttpValue(char *name, char *data);
 char *RecvLine(SOCK *s, UINT max_size);
-HTTP_HEADER *RecvHttpHeader(SOCK *s);
-bool SendHttpHeader(SOCK *s, HTTP_HEADER *header);
-char *HttpHeaderToStr(HTTP_HEADER *header);
-bool PostHttp(SOCK *s, HTTP_HEADER *header, void *post_data, UINT post_size);
-UINT GetContentLength(HTTP_HEADER *header);
-void GetHttpDateStr(char *str, UINT size, UINT64 t);
-bool HttpSendForbidden(SOCK *s, char *target, char *server_id);
-bool HttpSendNotFound(SOCK *s, char *target);
-bool HttpSendBody(SOCK *s, void *data, UINT size, char *contents_type);
-bool HttpSendNotImplemented(SOCK *s, char *method, char *target, char *version);
-bool HttpServerSend(SOCK *s, PACK *p);
-bool HttpClientSend(SOCK *s, PACK *p);
-PACK *HttpServerRecv(SOCK *s);
-PACK *HttpServerRecvEx(SOCK *s, UINT max_data_size);
-PACK *HttpClientRecv(SOCK *s);
 
 bool GetIPViaDnsProxyForJapanFlets(IP *ip_ret, char *hostname, bool ipv6, UINT timeout, bool *cancel, char *dns_proxy_hostname);
 bool GetDnsProxyIPAddressForJapanBFlets(IP *ip_ret, UINT timeout, bool *cancel);