|
1 Adjust the Python http_pipe.py script to work with our default version of |
|
2 Python. |
|
3 |
|
4 This change will be sent back up stream for consideration. |
|
5 |
|
6 --- tests/http_pipe.py.orig 2014-09-10 15:59:26.498743943 -0700 |
|
7 +++ tests/http_pipe.py 2014-09-10 15:58:59.502589711 -0700 |
|
8 @@ -435,7 +435,7 @@ |
|
9 if args.pidfile: |
|
10 pid = os.getpid() |
|
11 f = open(args.pidfile, 'w') |
|
12 - f.write('{}'.format(pid)) |
|
13 + f.write('{0}'.format(pid)) |
|
14 f.close() |
|
15 |
|
16 server = PipelineServer(('0.0.0.0', args.port), PipelineRequestHandler) |
|
17 |
|
18 |
|
19 # ---------------------------------------------------------------------------- |
|
20 Tests #530 and #584 fail with curl version 7.40.0. This is discussed at: |
|
21 |
|
22 http://curl.haxx.se/mail/lib-2014-08/0161.html |
|
23 |
|
24 with the patch at: |
|
25 |
|
26 http://curl.haxx.se/mail/lib-2014-06/att-0139/0001-Delay-Curl_addHandleToPipeline-by-a-milisecond.patch |
|
27 |
|
28 addressing the problem. |
|
29 |
|
30 Upstream is already aware of this issue. |
|
31 |
|
32 --- lib/url.c.orig 2015-01-26 13:49:21.041657976 -0800 |
|
33 +++ lib//url.c 2015-01-26 13:50:45.391515086 -0800 |
|
34 @@ -2748,6 +2748,7 @@ |
|
35 { |
|
36 if(!Curl_llist_insert_next(pipeline, pipeline->tail, data)) |
|
37 return CURLE_OUT_OF_MEMORY; |
|
38 + Curl_wait_ms(1); |
|
39 return CURLE_OK; |
|
40 } |
|
41 |
|
42 # --------------------------------------------------------------------------- |
|
43 Tests #46 fail with curl version <= 7.43.0. This is discussed and fixed at: |
|
44 |
|
45 https://github.com/bagder/curl/commit/002d58f1e8d8e725ba6d676599838983561feff9?diff=unified |
|
46 |
|
47 Upstream has already fixed this issue in curl version 7.44.0. |
|
48 |
|
49 --- tests/data/test46.orig Wed Aug 12 12:50:02 2015 -0700 |
|
50 +++ tests/data/test46 Wed Aug 12 12:51:57 2015 -0700 |
|
51 @@ -51,8 +51,8 @@ |
|
52 |
|
53 www.fake.come FALSE / FALSE 1022144953 cookiecliente si |
|
54 www.loser.com FALSE / FALSE 1139150993 UID 99 |
|
55 -%HOSTIP FALSE / FALSE 1439150993 mooo indeed |
|
56 -#HttpOnly_%HOSTIP FALSE /want FALSE 1439150993 mooo2 indeed2 |
|
57 +%HOSTIP FALSE / FALSE 1739150993 mooo indeed |
|
58 +#HttpOnly_%HOSTIP FALSE /want FALSE 1739150993 mooo2 indeed2 |
|
59 %HOSTIP FALSE /want FALSE 0 empty |
|
60 </file> |
|
61 </client> |
|
62 @@ -76,8 +76,8 @@ |
|
63 |
|
64 www.fake.come FALSE / FALSE 1022144953 cookiecliente si |
|
65 www.loser.com FALSE / FALSE 1139150993 UID 99 |
|
66 -%HOSTIP FALSE / FALSE 1439150993 mooo indeed |
|
67 -#HttpOnly_%HOSTIP FALSE /want FALSE 1439150993 mooo2 indeed2 |
|
68 +%HOSTIP FALSE / FALSE 1739150993 mooo indeed |
|
69 +#HttpOnly_%HOSTIP FALSE /want FALSE 1739150993 mooo2 indeed2 |
|
70 %HOSTIP FALSE /want FALSE 0 empty |
|
71 %HOSTIP FALSE / FALSE 2054030187 ckyPersistent permanent |
|
72 %HOSTIP FALSE / FALSE 0 ckySession temporary |