add Url type alias and use it everywhere, as preparation to migrate away from QUrl

src/core/core.pri

@@ -1,6 +1,7 @@
 HEADERS += \
 	$$PWD/cowbytearray.h \
 	$$PWD/cowstring.h \
+	$$PWD/url.h \
 	$$PWD/variant.h
 
 HEADERS += \

src/core/httprequest.h

@@ -24,7 +24,7 @@
 #ifndef HTTPREQUEST_H
 #define HTTPREQUEST_H
 
-#include <QUrl>
+#include "url.h"
 #include <QHostAddress>
 #include "httpheaders.h"
 #include <boost/signals2.hpp>
@@ -61,7 +61,7 @@ class HttpRequest
 	virtual void setTimeout(int msecs) = 0;
 	virtual void setClientCert(const QString &cert, const QString &key) = 0;
 
-	virtual void start(const QString &method, const QUrl &uri, const HttpHeaders &headers) = 0;
+	virtual void start(const QString &method, const Url &uri, const HttpHeaders &headers) = 0;
 	virtual void beginResponse(int code, const QByteArray &reason, const HttpHeaders &headers) = 0;
 
 	// May call this multiple times
@@ -78,7 +78,7 @@ class HttpRequest
 	virtual ErrorCondition errorCondition() const = 0;
 
 	virtual QString requestMethod() const = 0;
-	virtual QUrl requestUri() const = 0;
+	virtual Url requestUri() const = 0;
 	virtual HttpHeaders requestHeaders() const = 0;
 
 	virtual int responseCode() const = 0;

src/core/logutil.cpp

@@ -145,7 +145,7 @@ void logVariantWithContent(int level, const Variant &data, const QString &conten
 
 void logRequest(int level, const RequestData &data, const Config &config)
 {
-	QString msg = QString("%1 %2").arg(data.requestData.method, data.requestData.uri.toString(QUrl::FullyEncoded));
+	QString msg = QString("%1 %2").arg(data.requestData.method, data.requestData.uri.toString(Url::FullyEncoded));
 
 	if(!data.targetStr.isEmpty())
 		msg += QString(" -> %1").arg(data.targetStr);
@@ -156,9 +156,9 @@ void logRequest(int level, const RequestData &data, const Config &config)
 	if(config.fromAddress && !data.fromAddress.isNull())
 		msg += QString(" from=%1").arg(data.fromAddress.toString());
 
-	QUrl ref = QUrl(QString::fromUtf8(data.requestData.headers.get("Referer").asQByteArray()));
+	Url ref = Url(QString::fromUtf8(data.requestData.headers.get("Referer").asQByteArray()));
 	if(!ref.isEmpty())
-		msg += QString(" ref=%1").arg(ref.toString(QUrl::FullyEncoded));
+		msg += QString(" ref=%1").arg(ref.toString(Url::FullyEncoded));
 
 	if(!data.routeId.isEmpty())
 		msg += QString(" route=%1").arg(data.routeId);

src/core/packet/httprequestdata.h

@@ -24,13 +24,13 @@
 #define HTTPREQUESTDATA_H
 
 #include "../httpheaders.h"
-#include <QUrl>
+#include "url.h"
 
 class HttpRequestData
 {
 public:
 	QString method;
-	QUrl uri;
+	Url uri;
 	HttpHeaders headers;
 	QByteArray body;
 };

src/core/packet/retryrequestpacket.cpp

@@ -275,7 +275,7 @@ bool RetryRequestPacket::fromVariant(const Variant &in)
 
 	if(!vrequestData.contains("uri") || typeId(vrequestData["uri"]) != VariantType::ByteArray)
 		return false;
-	requestData.uri = QUrl::fromEncoded(vrequestData["uri"].toByteArray(), QUrl::StrictMode);
+	requestData.uri = Url::fromEncoded(vrequestData["uri"].toByteArray(), Url::StrictMode);
 
 	requestData.headers.clear();
 	if(vrequestData.contains("headers"))

src/core/packet/wscontrolpacket.cpp

@@ -110,7 +110,7 @@
 				return WsControlPacket();
 			}
 
-			msg.uri = QUrl::fromEncoded(getString(vitem, pn, "uri", false, &ok_, errorMessage).toUtf8(), QUrl::StrictMode);
+			msg.uri = Url::fromEncoded(getString(vitem, pn, "uri", false, &ok_, errorMessage).toUtf8(), Url::StrictMode);
 			if(!ok_)
 			{
 				if(ok)
@@ -321,7 +321,7 @@ bool WsControlPacket::fromVariant(const Variant &in)
 			if(typeId(vitem["uri"]) != VariantType::ByteArray)
 				return false;
 
-			item.uri = QUrl::fromEncoded(vitem["uri"].toByteArray(), QUrl::StrictMode);
+			item.uri = Url::fromEncoded(vitem["uri"].toByteArray(), Url::StrictMode);
 		}
 
 		if(vitem.contains("content-type"))

src/core/packet/wscontrolpacket.h

@@ -27,7 +27,7 @@
 #include <QByteArray>
 #include <QList>
 #include "variant.h"
-#include <QUrl>
+#include "url.h"
 
 class WsControlPacket
 {
@@ -55,7 +55,7 @@ class WsControlPacket
 		QByteArray cid;
 		Type type;
 		QByteArray requestId;
-		QUrl uri;
+		Url uri;
 		QByteArray contentType;
 		QByteArray message;
 		bool queue;

src/core/url.h

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2026 Fastly, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef URL_H
+#define URL_H
+
+#include <QUrl>
+
+// Type alias for URL handling - this will be replaced with a custom implementation later
+using Url = QUrl;
+
+#endif // URL_H

src/core/websocket.h

@@ -24,7 +24,7 @@
 #ifndef WEBSOCKET_H
 #define WEBSOCKET_H
 
-#include <QUrl>
+#include "url.h"
 #include <QHostAddress>
 #include "httpheaders.h"
 #include <boost/signals2.hpp>
@@ -89,13 +89,13 @@ class WebSocket
 	virtual void setIgnoreTlsErrors(bool on) = 0;
 	virtual void setClientCert(const QString &cert, const QString &key) = 0;
 
-	virtual void start(const QUrl &uri, const HttpHeaders &headers) = 0;
+	virtual void start(const Url &uri, const HttpHeaders &headers) = 0;
 
 	virtual void respondSuccess(const QByteArray &reason, const HttpHeaders &headers) = 0;
 	virtual void respondError(int code, const QByteArray &reason, const HttpHeaders &headers, const QByteArray &body) = 0;
 
 	virtual State state() const = 0;
-	virtual QUrl requestUri() const = 0;
+	virtual Url requestUri() const = 0;
 	virtual HttpHeaders requestHeaders() const = 0;
 	virtual int responseCode() const = 0;
 	virtual QByteArray responseReason() const = 0;

src/core/zhttpmanager.cpp

@@ -1285,14 +1285,14 @@ void ZhttpManager::unregisterKeepAlive(ZWebSocket *sock)
 	d->unregisterKeepAlive(sock);
 }
 
-int ZhttpManager::estimateRequestHeaderBytes(const QString &method, const QUrl &uri, const HttpHeaders &headers)
+int ZhttpManager::estimateRequestHeaderBytes(const QString &method, const Url &uri, const HttpHeaders &headers)
 {
 	int total = method.toUtf8().length();
 
-	total += uri.path(QUrl::FullyEncoded).length();
+	total += uri.path(Url::FullyEncoded).length();
 
 	if(uri.hasQuery())
-		total += uri.query(QUrl::FullyEncoded).length() + 1; // +1 for question mark
+		total += uri.query(Url::FullyEncoded).length() + 1; // +1 for question mark
 
 	foreach(const HttpHeader &h, headers)
 	{

src/core/zhttpmanager.h

@@ -27,6 +27,7 @@
 #include "zhttprequest.h"
 #include "zwebsocket.h"
 #include <boost/signals2.hpp>
+#include "url.h"
 
 using Signal = boost::signals2::signal<void()>;
 
@@ -69,7 +70,7 @@ class ZhttpManager
 	// For server mode, jump directly to responding state
 	ZhttpRequest *createRequestFromState(const ZhttpRequest::ServerState &state);
 
-	static int estimateRequestHeaderBytes(const QString &method, const QUrl &uri, const HttpHeaders &headers);
+	static int estimateRequestHeaderBytes(const QString &method, const Url &uri, const HttpHeaders &headers);
 	static int estimateResponseHeaderBytes(int code, const QByteArray &reason, const HttpHeaders &headers);
 
 	Signal requestReady;

src/core/zhttprequest.cpp

@@ -78,7 +78,7 @@ class ZhttpRequest::Private
 	bool sendBodyAfterAck;
 	Variant passthrough;
 	QString requestMethod;
-	QUrl requestUri;
+	Url requestUri;
 	HttpHeaders requestHeaders;
 	BufferList requestBodyBuf;
 	int inSeq;
@@ -1266,7 +1266,7 @@ void ZhttpRequest::setQuiet(bool on)
 	d->quiet = on;
 }
 
-void ZhttpRequest::start(const QString &method, const QUrl &uri, const HttpHeaders &headers)
+void ZhttpRequest::start(const QString &method, const Url &uri, const HttpHeaders &headers)
 {
 	assert(!d->server);
 
@@ -1380,7 +1380,7 @@ QString ZhttpRequest::requestMethod() const
 	return d->requestMethod;
 }
 
-QUrl ZhttpRequest::requestUri() const
+Url ZhttpRequest::requestUri() const
 {
 	return d->requestUri;
 }

src/core/zhttprequest.h

@@ -27,6 +27,7 @@
 #include "variant.h"
 #include "httprequest.h"
 #include <boost/signals2.hpp>
+#include "url.h"
 
 #define TIMERS_PER_ZHTTPREQUEST 3
 
@@ -48,7 +49,7 @@ class ZhttpRequest : public HttpRequest
 		Rid rid;
 		QHostAddress peerAddress;
 		QString requestMethod;
-		QUrl requestUri;
+		Url requestUri;
 		HttpHeaders requestHeaders;
 		QByteArray requestBody;
 		int responseCode;
@@ -94,7 +95,7 @@ class ZhttpRequest : public HttpRequest
 	virtual void setTimeout(int msecs);
 	virtual void setClientCert(const QString &cert, const QString &key);
 
-	virtual void start(const QString &method, const QUrl &uri, const HttpHeaders &headers);
+	virtual void start(const QString &method, const Url &uri, const HttpHeaders &headers);
 	virtual void beginResponse(int code, const QByteArray &reason, const HttpHeaders &headers);
 
 	virtual void writeBody(const QByteArray &body);
@@ -110,7 +111,7 @@ class ZhttpRequest : public HttpRequest
 	virtual ErrorCondition errorCondition() const;
 
 	virtual QString requestMethod() const;
-	virtual QUrl requestUri() const;
+	virtual Url requestUri() const;
 	virtual HttpHeaders requestHeaders() const;
 
 	virtual int responseCode() const;

src/core/zhttprequestpacket.cpp

@@ -361,7 +361,7 @@ bool ZhttpRequestPacket::fromVariant(const Variant &in)
 		if(typeId(obj["uri"]) != VariantType::ByteArray)
 			return false;
 
-		uri = QUrl::fromEncoded(obj["uri"].toByteArray(), QUrl::StrictMode);
+		uri = Url::fromEncoded(obj["uri"].toByteArray(), Url::StrictMode);
 	}
 
 	headers.clear();

src/core/zhttprequestpacket.h

@@ -22,7 +22,7 @@
 #ifndef ZHTTPREQUESTPACKET_H
 #define ZHTTPREQUESTPACKET_H
 
-#include <QUrl>
+#include "url.h"
 #include <QHostAddress>
 #include "cowstring.h"
 #include "cowbytearray.h"
@@ -78,7 +78,7 @@ class ZhttpRequestPacket
 	int timeout;
 
 	CowString method;
-	QUrl uri;
+	Url uri;
 	HttpHeaders headers;
 	CowByteArray body;
 

src/core/zwebsocket.cpp

@@ -64,7 +64,7 @@ class ZWebSocket::Private
 	bool ignoreTlsErrors;
 	QString clientCert;
 	QString clientKey;
-	QUrl requestUri;
+	Url requestUri;
 	HttpHeaders requestHeaders;
 	int inSeq;
 	int outSeq;
@@ -1134,7 +1134,7 @@ void ZWebSocket::setClientCert(const QString &cert, const QString &key)
 	d->clientKey = key;
 }
 
-void ZWebSocket::start(const QUrl &uri, const HttpHeaders &headers)
+void ZWebSocket::start(const Url &uri, const HttpHeaders &headers)
 {
 	assert(!d->server);
 
@@ -1189,7 +1189,7 @@ WebSocket::State ZWebSocket::state() const
 	}
 }
 
-QUrl ZWebSocket::requestUri() const
+Url ZWebSocket::requestUri() const
 {
 	return d->requestUri;
 }

src/core/zwebsocket.h

@@ -26,6 +26,7 @@
 
 #include "websocket.h"
 #include <boost/signals2.hpp>
+#include "url.h"
 
 using Connection = boost::signals2::scoped_connection;
 
@@ -55,13 +56,13 @@ class ZWebSocket : public WebSocket
 	virtual void setIgnoreTlsErrors(bool on);
 	virtual void setClientCert(const QString &cert, const QString &key);
 
-	virtual void start(const QUrl &uri, const HttpHeaders &headers);
+	virtual void start(const Url &uri, const HttpHeaders &headers);
 
 	virtual void respondSuccess(const QByteArray &reason, const HttpHeaders &headers);
 	virtual void respondError(int code, const QByteArray &reason, const HttpHeaders &headers, const QByteArray &body);
 
 	virtual State state() const;
-	virtual QUrl requestUri() const;
+	virtual Url requestUri() const;
 	virtual HttpHeaders requestHeaders() const;
 	virtual int responseCode() const;
 	virtual QByteArray responseReason() const;

src/handler/filter.cpp

@@ -350,7 +350,7 @@ class HttpFilterInner
 public:
 	HttpFilter::Mode mode;
 	std::unique_ptr<ZhttpRequest> req;
-	QUrl uri;
+	Url uri;
 	HttpHeaders headers;
 	QByteArray origContent;
 	bool haveResponseHeader;
@@ -366,7 +366,7 @@ class HttpFilterInner
 	{
 	}
 
-	void setup(ZhttpManager *zhttpOut, const QUrl &_uri, const HttpHeaders &_headers, const Variant &passthroughData, const QByteArray &content, int _responseSizeMax)
+	void setup(ZhttpManager *zhttpOut, const Url &_uri, const HttpHeaders &_headers, const Variant &passthroughData, const QByteArray &content, int _responseSizeMax)
 	{
 		uri = _uri;
 		headers = _headers;
@@ -528,7 +528,7 @@ HttpFilter::HttpFilter(Mode mode)
 
 void HttpFilter::start(const Filter::Context &context, const QByteArray &content)
 {
-	QUrl url = QUrl(context.subscriptionMeta.value("url"), QUrl::StrictMode);
+	Url url = Url(context.subscriptionMeta.value("url"), Url::StrictMode);
 	if(!url.isValid())
 	{
 		Result r;
@@ -537,13 +537,13 @@ void HttpFilter::start(const Filter::Context &context, const QByteArray &content
 		return;
 	}
 
-	QUrl currentUri = context.currentUri;
+	Url currentUri = context.currentUri;
 	if(currentUri.scheme() == "wss")
 		currentUri.setScheme("https");
 	else if(currentUri.scheme() == "ws")
 		currentUri.setScheme("http");
 
-	QUrl destUri = currentUri.resolved(url);
+	Url destUri = currentUri.resolved(url);
 
 	int currentPort = currentUri.port(currentUri.scheme() == "https" ? 443 : 80);
 	int destPort = destUri.port(destUri.scheme() == "https" ? 443 : 80);