components/curl/patches/010-fix-tests.patch
author Yiteng Zhang <yiteng.zhang@oracle.com>
Thu, 20 Aug 2015 02:21:19 -0700
branchs11u2-sru
changeset 4800 5aa28a7db635
permissions -rw-r--r--
20419429 Upgrade curl to version 7.40.0 (add missing files)

Adjust the Python http_pipe.py script to work with our default version of
Python.

This change will be sent back up stream for consideration.

--- tests/http_pipe.py.orig	2014-09-10 15:59:26.498743943 -0700
+++ tests/http_pipe.py	2014-09-10 15:58:59.502589711 -0700
@@ -435,7 +435,7 @@
 if args.pidfile:
     pid = os.getpid()
     f = open(args.pidfile, 'w')
-    f.write('{}'.format(pid))
+    f.write('{0}'.format(pid))
     f.close()
 
 server = PipelineServer(('0.0.0.0', args.port), PipelineRequestHandler)


# ----------------------------------------------------------------------------
Tests #530 and #584 fail with curl version 7.40.0. This is discussed at:

  http://curl.haxx.se/mail/lib-2014-08/0161.html

with the patch at:

http://curl.haxx.se/mail/lib-2014-06/att-0139/0001-Delay-Curl_addHandleToPipeline-by-a-milisecond.patch

addressing the problem.

Upstream is already aware of this issue.

--- lib/url.c.orig	2015-01-26 13:49:21.041657976 -0800
+++ lib//url.c	2015-01-26 13:50:45.391515086 -0800
@@ -2748,6 +2748,7 @@
 {
   if(!Curl_llist_insert_next(pipeline, pipeline->tail, data))
     return CURLE_OUT_OF_MEMORY;
+  Curl_wait_ms(1);
   return CURLE_OK;
 }

# ---------------------------------------------------------------------------
Tests #46 fail with curl version <= 7.43.0. This is discussed and fixed at:

  https://github.com/bagder/curl/commit/002d58f1e8d8e725ba6d676599838983561feff9?diff=unified

Upstream has already fixed this issue in curl version 7.44.0.

--- tests/data/test46.orig	Wed Aug 12 12:50:02 2015 -0700
+++ tests/data/test46	Wed Aug 12 12:51:57 2015 -0700
@@ -51,8 +51,8 @@
 
 www.fake.come	FALSE	/	FALSE	1022144953	cookiecliente	si
 www.loser.com	FALSE	/	FALSE	1139150993	UID	99
-%HOSTIP	FALSE	/	FALSE	1439150993	mooo	indeed
-#HttpOnly_%HOSTIP	FALSE	/want	FALSE	1439150993	mooo2	indeed2
+%HOSTIP	FALSE	/	FALSE	1739150993	mooo	indeed
+#HttpOnly_%HOSTIP	FALSE	/want	FALSE	1739150993	mooo2	indeed2
 %HOSTIP	FALSE	/want	FALSE	0	empty	
 </file>
 </client>
@@ -76,8 +76,8 @@
 
 www.fake.come	FALSE	/	FALSE	1022144953	cookiecliente	si
 www.loser.com	FALSE	/	FALSE	1139150993	UID	99
-%HOSTIP	FALSE	/	FALSE	1439150993	mooo	indeed
-#HttpOnly_%HOSTIP	FALSE	/want	FALSE	1439150993	mooo2	indeed2
+%HOSTIP	FALSE	/	FALSE	1739150993	mooo	indeed
+#HttpOnly_%HOSTIP	FALSE	/want	FALSE	1739150993	mooo2	indeed2
 %HOSTIP	FALSE	/want	FALSE	0	empty	
 %HOSTIP	FALSE	/	FALSE	2054030187	ckyPersistent	permanent
 %HOSTIP	FALSE	/	FALSE	0	ckySession	temporary