diff options
Diffstat (limited to 'src/backend/taler-merchant-httpd_private-post-orders.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-orders.c | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c b/src/backend/taler-merchant-httpd_private-post-orders.c index e0cba6a1..efaaf5a7 100644 --- a/src/backend/taler-merchant-httpd_private-post-orders.c +++ b/src/backend/taler-merchant-httpd_private-post-orders.c @@ -116,39 +116,19 @@ make_merchant_base_url (struct MHD_Connection *connection, { const char *host; const char *forwarded_host; - const char *forwarded_proto; - bool proxy_says_https; const char *uri_path; struct GNUNET_Buffer buf = { 0 }; + if (GNUNET_YES == TALER_mhd_is_https (connection)) + GNUNET_buffer_write_str (&buf, "https://"); + else + GNUNET_buffer_write_str (&buf, "http://"); host = MHD_lookup_connection_value (connection, MHD_HEADER_KIND, MHD_HTTP_HEADER_HOST); forwarded_host = MHD_lookup_connection_value (connection, MHD_HEADER_KIND, "X-Forwarded-Host"); - forwarded_proto = MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, - "X-Forwarded-Proto"); - proxy_says_https = ( (NULL != forwarded_proto) && - (0 == strcmp ("https", - forwarded_proto))) - - uri_path = MHD_lookup_connection_value (connection, - MHD_HEADER_KIND, - "X-Forwarded-Prefix"); - - if (GNUNET_NO == TALER_mhd_is_https (connection) && - ! proxy_says_https) - { - GNUNET_buffer_write_str (&buf, - "http://"); - } - else - { - GNUNET_buffer_write_str (&buf, - "https://"); - } if (NULL != forwarded_host) { GNUNET_buffer_write_str (&buf, @@ -160,6 +140,9 @@ make_merchant_base_url (struct MHD_Connection *connection, GNUNET_buffer_write_str (&buf, host); } + uri_path = MHD_lookup_connection_value (connection, + MHD_HEADER_KIND, + "X-Forwarded-Prefix"); if (NULL != uri_path) GNUNET_buffer_write_path (&buf, uri_path); |