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