Differential D18 Diff 2473 files/0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch

Changeset View

Standalone View

files/0002-tests-souphttpsrc-Make-ssl_cert-key_file-static.patch

This file was added.

				From e0ac30bc06da0ffd78334621c9ee42fa8f92f195 Mon Sep 17 00:00:00 2001
				From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
				Date: Tue, 20 Jun 2017 16:34:41 +0200
				Subject: [PATCH 2/4] tests: souphttpsrc: Make ssl_cert/key_file static

				Just a bit of cleanup.

				https://bugzilla.gnome.org/show_bug.cgi?id=784005
				---
				tests/check/elements/souphttpsrc.c \| 7 ++++---
				1 file changed, 4 insertions(+), 3 deletions(-)

				diff --git a/tests/check/elements/souphttpsrc.c b/tests/check/elements/souphttpsrc.c
				index a6231fab85eeb9e2..6dedae50a64a3dc0 100644
				--- a/tests/check/elements/souphttpsrc.c
				+++ b/tests/check/elements/souphttpsrc.c
				@@ -52,6 +52,9 @@ static const char *realm = "SOUPHTTPSRC_REALM";
				static const char *basic_auth_path = "/basic_auth";
				static const char *digest_auth_path = "/digest_auth";

				+static const char *ssl_cert_file = GST_TEST_FILES_PATH "/test-cert.pem";
				+static const char *ssl_key_file = GST_TEST_FILES_PATH "/test-key.pem";
				+
				static guint get_port_from_server (SoupServer * server);
				static SoupServer *run_server (gboolean use_https);

				@@ -123,7 +126,7 @@ run_test (gboolean use_https, const gchar * path, gint expected)
				g_free (url);

				g_object_set (src, "automatic-redirect", redirect, NULL);
				- g_object_set (src, "ssl-ca-file", GST_TEST_FILES_PATH "/test-cert.pem", NULL);
				+ g_object_set (src, "ssl-ca-file", ssl_cert_file, NULL);
				if (cookies != NULL)
				g_object_set (src, "cookies", cookies, NULL);
				g_object_set (sink, "signal-handoffs", TRUE, NULL);
				@@ -572,8 +575,6 @@ run_server (gboolean use_https)


				if (use_https) {
				- const char *ssl_cert_file = GST_TEST_FILES_PATH "/test-cert.pem";
				- const char *ssl_key_file = GST_TEST_FILES_PATH "/test-key.pem";
				GTlsBackend *backend = g_tls_backend_get_default ();

				if (backend == NULL \|\| !g_tls_backend_supports_tls (backend)) {
				--
				2.13.1