| author | Yiteng Zhang <yiteng.zhang@oracle.com> |
| Fri, 22 Jan 2016 17:04:51 -0800 | |
| branch | s11u3-sru |
| changeset 5315 | cbd548550bd1 |
| parent 4103 | 0a3f0d2f2c86 |
| permissions | -rw-r--r-- |
|
4103
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
1 |
Adjust the Python http_pipe.py script to work with our default version of |
|
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
2 |
Python. |
|
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
3 |
|
|
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
4 |
This change will be sent back up stream for consideration. |
|
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
5 |
|
|
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
6 |
--- tests/http_pipe.py.orig 2014-09-10 15:59:26.498743943 -0700 |
|
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
7 |
+++ tests/http_pipe.py 2014-09-10 15:58:59.502589711 -0700 |
|
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
8 |
@@ -435,7 +435,7 @@ |
|
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
9 |
if args.pidfile: |
|
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
10 |
pid = os.getpid() |
|
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
11 |
f = open(args.pidfile, 'w') |
|
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
12 |
- f.write('{}'.format(pid))
|
|
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
13 |
+ f.write('{0}'.format(pid))
|
|
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
14 |
f.close() |
|
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
15 |
|
|
0a3f0d2f2c86
20419429 Upgrade curl to version 7.40.0
Yiteng Zhang <yiteng.zhang@oracle.com>
parents:
diff
changeset
|
16 |
server = PipelineServer(('0.0.0.0', args.port), PipelineRequestHandler)
|