diff options
Diffstat (limited to 'src/backend/taler-merchant-httpd_get-tips-ID.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_get-tips-ID.c | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/src/backend/taler-merchant-httpd_get-tips-ID.c b/src/backend/taler-merchant-httpd_get-tips-ID.c index e11ff0af..f427b168 100644 --- a/src/backend/taler-merchant-httpd_get-tips-ID.c +++ b/src/backend/taler-merchant-httpd_get-tips-ID.c @@ -35,8 +35,6 @@ TMH_make_taler_tip_uri (struct MHD_Connection *con, { const char *host; const char *forwarded_host; - const char *forwarded_proto; - bool proxy_says_https; const char *uri_path; struct GNUNET_Buffer buf = { 0 }; @@ -47,14 +45,6 @@ TMH_make_taler_tip_uri (struct MHD_Connection *con, MHD_HEADER_KIND, "X-Forwarded-Host"); - forwarded_proto = MHD_lookup_connection_value (con, - MHD_HEADER_KIND, - "X-Forwarded-Proto"); - - proxy_says_https = ( (NULL != forwarded_proto) && - (0 == strcmp ("https", - forwarded_proto))) - uri_path = MHD_lookup_connection_value (con, MHD_HEADER_KIND, "X-Forwarded-Prefix"); @@ -72,13 +62,9 @@ TMH_make_taler_tip_uri (struct MHD_Connection *con, GNUNET_buffer_write_str (&buf, "taler"); - - if (GNUNET_NO == TALER_mhd_is_https (con) && - ! proxy_says_https) - { + if (GNUNET_NO == TALER_mhd_is_https (con)) GNUNET_buffer_write_str (&buf, "+http"); - } GNUNET_buffer_write_str (&buf, "://tip/"); GNUNET_buffer_write_str (&buf, @@ -111,8 +97,6 @@ TMH_make_tip_status_url (struct MHD_Connection *con, { const char *host; const char *forwarded_host; - const char *forwarded_proto; - bool proxy_says_https; const char *uri_path; struct GNUNET_Buffer buf = { 0 }; @@ -123,13 +107,6 @@ TMH_make_tip_status_url (struct MHD_Connection *con, MHD_HEADER_KIND, "X-Forwarded-Host"); - forwarded_proto = MHD_lookup_connection_value (con, - MHD_HEADER_KIND, - "X-Forwarded-Proto"); - proxy_says_https = ( (NULL != forwarded_proto) && - (0 == strcmp ("https", - forwarded_proto))) - uri_path = MHD_lookup_connection_value (con, MHD_HEADER_KIND, "X-Forwarded-Prefix"); @@ -145,17 +122,12 @@ TMH_make_tip_status_url (struct MHD_Connection *con, GNUNET_assert (NULL != instance_id); GNUNET_assert (NULL != tip_id); - if (GNUNET_NO == TALER_mhd_is_https (con) && - ! proxy_says_https) - { + if (GNUNET_NO == TALER_mhd_is_https (con)) GNUNET_buffer_write_str (&buf, "http://"); - } else - { GNUNET_buffer_write_str (&buf, "https://"); - } GNUNET_buffer_write_str (&buf, host); if (NULL != uri_path) |