Update override comment with a full explanation of what it does

elpaso · elpaso · commit cd763bccf2dc · 2019-01-10T10:58:27.000+01:00
Also checks for original url emptiness before returning it.
diff --git a/python/server/auto_generated/qgsfcgiserverrequest.sip.in b/python/server/auto_generated/qgsfcgiserverrequest.sip.in
@@ -38,9 +38,11 @@ Returns true if an error occurred during initialization
 
 :return: the request url
 
-Subclasses may override in case the original URL needs to be
-returned instead of the rewritten one (i.e. from a web server
-rewrite module).
+Overrides base implementation because FCGI is typically behind
+a proxy server and QGIS Server will see a rewritten QUERY_STRING.
+FCGI implementation stores the REQUEST_URI (which is the URL seen
+by the proxy before it gets rewritten) and returns it instead of
+the rewritten one.
 %End
 
 
diff --git a/src/server/qgsfcgiserverrequest.cpp b/src/server/qgsfcgiserverrequest.cpp
@@ -135,7 +135,7 @@ QByteArray QgsFcgiServerRequest::data() const
 
 QUrl QgsFcgiServerRequest::url() const
 {
-  return mOriginalUrl;
+  return mOriginalUrl.isEmpty() ? QgsServerRequest::url() : mOriginalUrl;
 }
 
 // Read post put data
diff --git a/src/server/qgsfcgiserverrequest.h b/src/server/qgsfcgiserverrequest.h
@@ -45,9 +45,11 @@ class SERVER_EXPORT QgsFcgiServerRequest: public QgsServerRequest
     /**
      * \returns  the request url
      *
-     * Subclasses may override in case the original URL needs to be
-     * returned instead of the rewritten one (i.e. from a web server
-     * rewrite module).
+     * Overrides base implementation because FCGI is typically behind
+     * a proxy server and QGIS Server will see a rewritten QUERY_STRING.
+     * FCGI implementation stores the REQUEST_URI (which is the URL seen
+     * by the proxy before it gets rewritten) and returns it instead of
+     * the rewritten one.
      */
     QUrl url() const override;
 

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ QByteArray QgsFcgiServerRequest::data() const`
`135`	`135`
`136`	`136`	`QUrl QgsFcgiServerRequest::url() const`
`137`	`137`	`{`
`138`		`- return mOriginalUrl;`
	`138`	`+ return mOriginalUrl.isEmpty() ? QgsServerRequest::url() : mOriginalUrl;`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`// Read post put data`