| author | Rich Burridge <rich.burridge@oracle.com> |
| Tue, 03 Feb 2015 13:51:23 -0800 | |
| changeset 3726 | 1c80a90dd005 |
| parent 2151 | 8977d970976a |
| child 4660 | 0cca05cde869 |
| permissions | -rw-r--r-- |
|
2151
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Adjust the Python http_pipe.py script to work with our default version of |
|
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
Python. |
|
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
|
|
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
This change will be sent back up stream for consideration. |
|
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
|
|
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
--- tests/http_pipe.py.orig 2014-09-10 15:59:26.498743943 -0700 |
|
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
+++ tests/http_pipe.py 2014-09-10 15:58:59.502589711 -0700 |
|
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
@@ -435,7 +435,7 @@ |
|
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
if args.pidfile: |
|
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
pid = os.getpid() |
|
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
f = open(args.pidfile, 'w') |
|
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
- f.write('{}'.format(pid))
|
|
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
+ f.write('{0}'.format(pid))
|
|
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
f.close() |
|
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
|
|
8977d970976a
PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
server = PipelineServer(('0.0.0.0', args.port), PipelineRequestHandler)
|
|
3726
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
17 |
|
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
18 |
|
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
19 |
# ---------------------------------------------------------------------------- |
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
20 |
Tests #530 and #584 fail with curl version 7.40.0. This is discussed at: |
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
21 |
|
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
22 |
http://curl.haxx.se/mail/lib-2014-08/0161.html |
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
23 |
|
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
24 |
with the patch at: |
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
25 |
|
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
26 |
http://curl.haxx.se/mail/lib-2014-06/att-0139/0001-Delay-Curl_addHandleToPipeline-by-a-milisecond.patch |
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
27 |
|
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
28 |
addressing the problem. |
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
29 |
|
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
30 |
Upstream is already aware of this issue. |
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
31 |
|
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
32 |
--- lib/url.c.orig 2015-01-26 13:49:21.041657976 -0800 |
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
33 |
+++ lib//url.c 2015-01-26 13:50:45.391515086 -0800 |
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
34 |
@@ -2748,6 +2748,7 @@ |
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
35 |
{
|
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
36 |
if(!Curl_llist_insert_next(pipeline, pipeline->tail, data)) |
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
37 |
return CURLE_OUT_OF_MEMORY; |
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
38 |
+ Curl_wait_ms(1); |
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
39 |
return CURLE_OK; |
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
40 |
} |
|
1c80a90dd005
19728335 Remove the libcurl.so.2 sym link for curl 7.38.0 after transition.
Rich Burridge <rich.burridge@oracle.com>
parents:
2151
diff
changeset
|
41 |