diff --git a/openvas-gsa-libmicrohttpd.patch b/openvas-gsa-libmicrohttpd.patch index 44481e7..b53bfc3 100644 --- a/openvas-gsa-libmicrohttpd.patch +++ b/openvas-gsa-libmicrohttpd.patch @@ -1,6 +1,5 @@ -diff -ru greenbone-security-assistant-6.0.9.orig/src/gsad.c greenbone-security-assistant-6.0.9.new/src/gsad.c ---- greenbone-security-assistant-6.0.9.orig/src/gsad.c 2016-02-25 17:17:40.466917939 +0100 -+++ greenbone-security-assistant-6.0.9.new/src/gsad.c 2016-02-25 18:49:14.899566534 +0100 +--- greenbone-security-assistant-6.0.11.libmicrohttpd/src/gsad.c 2016-09-05 23:17:14.795923529 +0200 ++++ greenbone-security-assistant-6.0.11/src/gsad.c 2016-09-05 23:33:14.846076112 +0200 @@ -170,6 +170,15 @@ " frame-ancestors *" @@ -17,7 +16,7 @@ diff -ru greenbone-security-assistant-6.0.9.orig/src/gsad.c greenbone-security-a * @brief Add content security headers to a MHD response. */ #define ADD_CONTENT_SECURITY_HEADERS(response) \ -@@ -3197,8 +3206,8 @@ +@@ -3210,8 +3219,8 @@ size_t size = (content_length ? content_length : strlen (content)); int ret; @@ -28,7 +27,7 @@ diff -ru greenbone-security-assistant-6.0.9.orig/src/gsad.c greenbone-security-a gsad_add_content_type_header (response, &content_type); if (content_disposition) -@@ -3254,8 +3263,7 @@ +@@ -3267,8 +3276,7 @@ body = g_strdup_printf ("Code 303 - Redirecting to" " %s\n", uri, uri); @@ -38,7 +37,7 @@ diff -ru greenbone-security-assistant-6.0.9.orig/src/gsad.c greenbone-security-a g_free (body); if (!response) -@@ -3367,7 +3375,7 @@ +@@ -3388,7 +3396,7 @@ /* Only accept GET and POST methods and send ERROR_PAGE in other cases. */ if (strcmp (method, "GET") && strcmp (method, "POST")) { @@ -47,10 +46,10 @@ diff -ru greenbone-security-assistant-6.0.9.orig/src/gsad.c greenbone-security-a NULL, GSAD_CONTENT_TYPE_TEXT_HTML, NULL, 0); return MHD_YES; } -@@ -3478,8 +3486,8 @@ - guest_username ? guest_username : ""); - g_free (language); - res = xsl_transform (xml); +@@ -3518,8 +3526,8 @@ + g_free (language); + res = xsl_transform (xml); + } - response = MHD_create_response_from_data (strlen (res), res, - MHD_NO, MHD_YES); + response = MHD_create_response_from_buffer (strlen (res), res, @@ -58,7 +57,7 @@ diff -ru greenbone-security-assistant-6.0.9.orig/src/gsad.c greenbone-security-a g_free (path); g_free (xml); g_free (res); -@@ -3494,10 +3502,9 @@ +@@ -3534,10 +3542,9 @@ tracef ("File %s failed, ", path); g_free (path); @@ -71,7 +70,7 @@ diff -ru greenbone-security-assistant-6.0.9.orig/src/gsad.c greenbone-security-a } /* Guess content type. */ -@@ -3534,8 +3541,8 @@ +@@ -3574,8 +3581,8 @@ NULL); g_free (path); fclose (file); @@ -82,7 +81,7 @@ diff -ru greenbone-security-assistant-6.0.9.orig/src/gsad.c greenbone-security-a g_free (res); return ret; } -@@ -3739,7 +3746,7 @@ +@@ -3785,7 +3792,7 @@ /* Only accept GET and POST methods and send ERROR_PAGE in other cases. */ if (strcmp (method, "GET") && strcmp (method, "POST")) { @@ -91,7 +90,7 @@ diff -ru greenbone-security-assistant-6.0.9.orig/src/gsad.c greenbone-security-a NULL, GSAD_CONTENT_TYPE_TEXT_HTML, NULL, 0); return MHD_YES; } -@@ -3905,8 +3912,8 @@ +@@ -3958,8 +3965,8 @@ res = xsl_transform (xml); g_free (xml); } @@ -102,7 +101,7 @@ diff -ru greenbone-security-assistant-6.0.9.orig/src/gsad.c greenbone-security-a g_free (res); ADD_CONTENT_SECURITY_HEADERS (response); return handler_send_response (connection, -@@ -3975,8 +3982,8 @@ +@@ -4046,8 +4053,8 @@ g_free (full_url); res = xsl_transform (xml); g_free (xml); @@ -113,7 +112,7 @@ diff -ru greenbone-security-assistant-6.0.9.orig/src/gsad.c greenbone-security-a g_free (res); ADD_CONTENT_SECURITY_HEADERS (response); return handler_send_response (connection, -@@ -4023,8 +4030,8 @@ +@@ -4103,8 +4110,8 @@ g_free (language); res = xsl_transform (xml); g_free (xml); @@ -124,7 +123,7 @@ diff -ru greenbone-security-assistant-6.0.9.orig/src/gsad.c greenbone-security-a g_free (res); ADD_CONTENT_SECURITY_HEADERS (response); return handler_send_response (connection, -@@ -4084,9 +4091,9 @@ +@@ -4179,9 +4186,9 @@ content_type = GSAD_CONTENT_TYPE_APP_XML; } @@ -136,7 +135,7 @@ diff -ru greenbone-security-assistant-6.0.9.orig/src/gsad.c greenbone-security-a if (content_type_string) { MHD_add_response_header (response, MHD_HTTP_HEADER_CONTENT_TYPE, -@@ -4132,8 +4139,8 @@ +@@ -4227,8 +4234,8 @@ credentials_free (credentials); return MHD_NO; } @@ -147,7 +146,7 @@ diff -ru greenbone-security-assistant-6.0.9.orig/src/gsad.c greenbone-security-a g_free (res); } else if (!strncmp (&url[0], "/help/", -@@ -4232,8 +4239,8 @@ +@@ -4327,8 +4334,8 @@ "Invalid request", __FUNCTION__, __LINE__, "Error generating help page.", "/help/contents.html"); @@ -158,5 +157,3 @@ diff -ru greenbone-security-assistant-6.0.9.orig/src/gsad.c greenbone-security-a g_free (res); } else -Only in greenbone-security-assistant-6.0.9.new/src: gsad.c.orig -Only in greenbone-security-assistant-6.0.9.new/src: gsad.c.rej