9855926059
- Update to version 0.9.53: * See provided Changelog for details - Refresh patch: * libmicrohttpd_test_data.patch OBS-URL: https://build.opensuse.org/request/show/487866 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmicrohttpd?expand=0&rev=73
90 lines
3.0 KiB
Diff
90 lines
3.0 KiB
Diff
Index: src/testcurl/https/test_https_sni.c
|
|
===================================================================
|
|
--- src/testcurl/https/test_https_sni.c.orig
|
|
+++ src/testcurl/https/test_https_sni.c
|
|
@@ -186,7 +186,7 @@ do_get (const char *url)
|
|
size_t len;
|
|
struct curl_slist *dns_info;
|
|
|
|
- len = strlen (test_data);
|
|
+ len = strlen (microhttpd_test_data);
|
|
if (NULL == (cbc.buf = malloc (sizeof (char) * len)))
|
|
{
|
|
fprintf (stderr, MHD_E_MEM);
|
|
@@ -231,7 +231,7 @@ do_get (const char *url)
|
|
|
|
curl_easy_cleanup (c);
|
|
curl_slist_free_all (dns_info);
|
|
- if (memcmp (cbc.buf, test_data, len) != 0)
|
|
+ if (memcmp (cbc.buf, microhttpd_test_data, len) != 0)
|
|
{
|
|
fprintf (stderr, "Error: local file & received file differ.\n");
|
|
free (cbc.buf);
|
|
Index: src/testcurl/https/tls_test_common.c
|
|
===================================================================
|
|
--- src/testcurl/https/tls_test_common.c.orig
|
|
+++ src/testcurl/https/tls_test_common.c
|
|
@@ -74,7 +74,7 @@ test_daemon_get (void *cls,
|
|
char url[255];
|
|
size_t len;
|
|
|
|
- len = strlen (test_data);
|
|
+ len = strlen (microhttpd_test_data);
|
|
if (NULL == (cbc.buf = malloc (sizeof (char) * len)))
|
|
{
|
|
fprintf (stderr, MHD_E_MEM);
|
|
@@ -124,7 +124,7 @@ test_daemon_get (void *cls,
|
|
|
|
curl_easy_cleanup (c);
|
|
|
|
- if (memcmp (cbc.buf, test_data, len) != 0)
|
|
+ if (memcmp (cbc.buf, microhttpd_test_data, len) != 0)
|
|
{
|
|
fprintf (stderr, "Error: local file & received file differ.\n");
|
|
free (cbc.buf);
|
|
@@ -180,8 +180,8 @@ http_ahc (void *cls, struct MHD_Connecti
|
|
return MHD_YES;
|
|
}
|
|
*ptr = NULL; /* reset when done */
|
|
- response = MHD_create_response_from_buffer (strlen (test_data),
|
|
- (void *) test_data,
|
|
+ response = MHD_create_response_from_buffer (strlen (microhttpd_test_data),
|
|
+ (void *) microhttpd_test_data,
|
|
MHD_RESPMEM_PERSISTENT);
|
|
ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
|
|
MHD_destroy_response (response);
|
|
@@ -321,7 +321,7 @@ test_https_transfer (void *cls, const ch
|
|
struct CBC cbc;
|
|
char url[255];
|
|
|
|
- len = strlen (test_data);
|
|
+ len = strlen (microhttpd_test_data);
|
|
if (NULL == (cbc.buf = malloc (sizeof (char) * len)))
|
|
{
|
|
fprintf (stderr, MHD_E_MEM);
|
|
@@ -343,9 +343,9 @@ test_https_transfer (void *cls, const ch
|
|
}
|
|
|
|
/* compare test file & daemon responce */
|
|
- if ( (len != strlen (test_data)) ||
|
|
+ if ( (len != strlen (microhttpd_test_data)) ||
|
|
(memcmp (cbc.buf,
|
|
- test_data,
|
|
+ microhttpd_test_data,
|
|
len) != 0) )
|
|
{
|
|
fprintf (stderr, "Error: local file & received file differ.\n");
|
|
Index: src/testcurl/https/tls_test_common.h
|
|
===================================================================
|
|
--- src/testcurl/https/tls_test_common.h.orig
|
|
+++ src/testcurl/https/tls_test_common.h
|
|
@@ -34,7 +34,7 @@
|
|
|
|
#define DEAMON_TEST_PORT 4233
|
|
|
|
-#define test_data "Hello World\n"
|
|
+#define microhttpd_test_data "Hello World\n"
|
|
#define ca_cert_file_name "tmp_ca_cert.pem"
|
|
|
|
#define EMPTY_PAGE "<html><head><title>Empty page</title></head><body>Empty page</body></html>"
|