Changeset 1509 in ntrip for trunk

Timestamp:

Jan 19, 2009, 7:25:27 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bncnetqueryv2.cpp (modified) (2 diffs)

trunk/BNC/bncnetqueryv2.cpp

@@ -90 +90 @@
   // Default scheme and path
   // -----------------------
-  QUrl urlLoc(url);
-  if (urlLoc.scheme().isEmpty()) {
-    urlLoc.setScheme("http");
+  _url = url;
+  if (_url.scheme().isEmpty()) {
+    _url.setScheme("http");
   }
-  if (urlLoc.path().isEmpty()) {
-    urlLoc.setPath("/");
+  if (_url.path().isEmpty()) {
+    _url.setPath("/");
   }
 
@@ -112 +112 @@
   // ---------------
   QNetworkRequest request;
-  request.setUrl(urlLoc);
-  request.setRawHeader("Host"         , urlLoc.host().toAscii());
+  request.setUrl(_url);
+  request.setRawHeader("Host"         , _url.host().toAscii());
   request.setRawHeader("Ntrip-Version", "Ntrip/2.0");
   request.setRawHeader("User-Agent"   , "NTRIP BNC/1.7");
-  if (!urlLoc.userName().isEmpty()) {
+  if (!_url.userName().isEmpty()) {
+    QString uName = QUrl::fromPercentEncoding(_url.userName().toAscii());
+    QString passW = QUrl::fromPercentEncoding(_url.password().toAscii());
     request.setRawHeader("Authorization", "Basic " + 
-           (urlLoc.userName() + ":" + urlLoc.password()).toAscii().toBase64());
+                         (uName + ":" + passW).toAscii().toBase64());
   } 
   if (!gga.isEmpty()) {