From dd7603048c93060b4e7fbf2e4fb469cfce2ba536 Mon Sep 17 00:00:00 2001
From: Apin <apin.klas@gmail.com>
Date: Sat, 21 Dec 2019 05:00:25 +0700
Subject: [PATCH] fix singlebin and use new qt

---
 .../pillow/pillowcore/HttpClient.cpp          |  6 ++--
 .../pillow/pillowcore/HttpHandlerProxy.cpp    |  6 ++--
 .../pillowcore/HttpHandlerSimpleRouter.cpp    |  2 +-
 .../pillow/pillowcore/pillowcore_src.pri      | 33 +++++++++++++++++++
 sultan/sultan.pro                             |  2 +-
 5 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 external_library/pillow/pillowcore/pillowcore_src.pri

diff --git a/external_library/pillow/pillowcore/HttpClient.cpp b/external_library/pillow/pillowcore/HttpClient.cpp
index 921fe23f..a0a0a85a 100644
--- a/external_library/pillow/pillowcore/HttpClient.cpp
+++ b/external_library/pillow/pillowcore/HttpClient.cpp
@@ -645,7 +645,7 @@ void Pillow::HttpClient::sendRequest()
 
 	if (_hostHeaderValue.isEmpty())
 	{
-        _hostHeaderValue = _request.url.encodedHost();
+        _hostHeaderValue = _request.url.toAce(_request.url.host());
 		if (_request.url.port(80) != 80)
 		{
 			_hostHeaderValue.append(':');
@@ -653,8 +653,8 @@ void Pillow::HttpClient::sendRequest()
 		}
 	}
 
-	QByteArray uri = _request.url.encodedPath();
-	const QByteArray query = _request.url.encodedQuery();
+    QByteArray uri = _request.url.path().toUtf8();
+    const QByteArray query = _request.url.toEncoded();
 	if (!query.isEmpty()) uri.append('?').append(query);
 
 	Pillow::HttpHeaderCollection headers;
diff --git a/external_library/pillow/pillowcore/HttpHandlerProxy.cpp b/external_library/pillow/pillowcore/HttpHandlerProxy.cpp
index 7ed6b73a..7d811688 100644
--- a/external_library/pillow/pillowcore/HttpHandlerProxy.cpp
+++ b/external_library/pillow/pillowcore/HttpHandlerProxy.cpp
@@ -31,9 +31,9 @@ bool Pillow::HttpHandlerProxy::handleRequest(Pillow::HttpConnection *request)
 	if (_proxiedUrl.isEmpty()) return false;
 
 	QUrl targetUrl = _proxiedUrl;
-	targetUrl.setEncodedPath(request->requestPath());
-	if (!request->requestQueryString().isEmpty()) targetUrl.setEncodedQuery(request->requestQueryString());
-	if (!request->requestFragment().isEmpty()) targetUrl.setEncodedFragment(request->requestFragment());
+    targetUrl.setPath(request->requestPath());
+    if (!request->requestQueryString().isEmpty()) targetUrl.setQuery(request->requestQueryString());
+    if (!request->requestFragment().isEmpty()) targetUrl.setFragment(request->requestFragment());
 
 	QNetworkRequest proxiedRequest(targetUrl);
 	foreach (const Pillow::HttpHeader& header, request->requestHeaders())
diff --git a/external_library/pillow/pillowcore/HttpHandlerSimpleRouter.cpp b/external_library/pillow/pillowcore/HttpHandlerSimpleRouter.cpp
index 6a7363c6..625c6fe1 100644
--- a/external_library/pillow/pillowcore/HttpHandlerSimpleRouter.cpp
+++ b/external_library/pillow/pillowcore/HttpHandlerSimpleRouter.cpp
@@ -235,7 +235,7 @@ bool HttpHandlerSimpleRouter::handleRequest(Pillow::HttpConnection *request)
 	{
 		QString methodParam = request->requestParamValue(methodToken);
 		if (!methodParam.isEmpty())
-			requestMethod = methodParam.toAscii();
+            requestMethod = methodParam.toUtf8();
 	}
 
 	QString requestPath = QUrl::fromPercentEncoding(request->requestPath());
diff --git a/external_library/pillow/pillowcore/pillowcore_src.pri b/external_library/pillow/pillowcore/pillowcore_src.pri
new file mode 100644
index 00000000..91069cf7
--- /dev/null
+++ b/external_library/pillow/pillowcore/pillowcore_src.pri
@@ -0,0 +1,33 @@
+INCLUDEPATH += $$PWD
+
+SOURCES += \
+	$$PWD/parser/parser.c \
+	$$PWD/parser/http_parser.c \
+	$$PWD/HttpServer.cpp \
+	$$PWD/HttpHandler.cpp \
+        #$$PWD/HttpHandlerQtScript.cpp \
+	$$PWD/HttpHelpers.cpp \
+	$$PWD/HttpsServer.cpp \
+	$$PWD/HttpHandlerSimpleRouter.cpp \
+	$$PWD/HttpConnection.cpp \
+	$$PWD/HttpHandlerProxy.cpp \
+	$$PWD/HttpClient.cpp \
+	$$PWD/HttpHeader.cpp
+
+HEADERS += \
+	$$PWD/parser/parser.h \
+	$$PWD/parser/http_parser.h \
+	$$PWD/HttpServer.h \
+	$$PWD/HttpHandler.h \
+        #$$PWD/HttpHandlerQtScript.h \
+	$$PWD/HttpHelpers.h \
+	$$PWD/HttpsServer.h \
+	$$PWD/HttpHandlerSimpleRouter.h \
+	$$PWD/HttpConnection.h \
+	$$PWD/HttpHandlerProxy.h \
+	$$PWD/ByteArrayHelpers.h \
+	$$PWD/private/ByteArray.h \
+	$$PWD/HttpClient.h \
+	$$PWD/pch.h \
+	$$PWD/HttpHeader.h \
+	$$PWD/PillowCore.h
diff --git a/sultan/sultan.pro b/sultan/sultan.pro
index 8817a296..f4372194 100644
--- a/sultan/sultan.pro
+++ b/sultan/sultan.pro
@@ -17,7 +17,7 @@ CONFIG += c++11
 
 contains(CONFIG, SINGLEBIN) {
     include(../external_library/o2/src/src.pri)
-    include(../external_library/pillow/pillowcore/pillowcore.pri)
+    include(../external_library/pillow/pillowcore/pillowcore_src.pri)
     include(../libglobal/libglobal_src.pri)
     include(../libprint/libprint_src.pri)
     include(../libdb/libdb_src.pri)