##// END OF EJS Templates
merge with stable
Augie Fackler -
r40972:e06719b7 merge default
parent child Browse files
Show More
@@ -1307,6 +1307,9 b" coreconfigitem('web', 'archivesubrepos',"
1307 coreconfigitem('web', 'cache',
1307 coreconfigitem('web', 'cache',
1308 default=True,
1308 default=True,
1309 )
1309 )
1310 coreconfigitem('web', 'comparisoncontext',
1311 default=5,
1312 )
1310 coreconfigitem('web', 'contact',
1313 coreconfigitem('web', 'contact',
1311 default=None,
1314 default=None,
1312 )
1315 )
@@ -858,7 +858,7 b' def comparison(web):'
858 if 'context' in web.req.qsparams:
858 if 'context' in web.req.qsparams:
859 context = parsecontext(web.req.qsparams['context'])
859 context = parsecontext(web.req.qsparams['context'])
860 else:
860 else:
861 context = parsecontext(web.config('web', 'comparisoncontext', '5'))
861 context = parsecontext(web.config('web', 'comparisoncontext'))
862
862
863 def filelines(f):
863 def filelines(f):
864 if f.isbinary():
864 if f.isbinary():
@@ -72,7 +72,7 b' Failure to read all bytes in initial HTT'
72 $ cat hg.pid > $DAEMON_PIDS
72 $ cat hg.pid > $DAEMON_PIDS
73
73
74 $ hg clone http://localhost:$HGPORT/ clone
74 $ hg clone http://localhost:$HGPORT/ clone
75 abort: error: bad HTTP status line: ''
75 abort: error: bad HTTP status line: * (glob)
76 [255]
76 [255]
77
77
78 $ killdaemons.py $DAEMON_PIDS
78 $ killdaemons.py $DAEMON_PIDS
@@ -88,7 +88,7 b' Same failure, but server reads full HTTP'
88 $ hg serve --config badserver.closeafterrecvbytes=40 -p $HGPORT -d --pid-file=hg.pid -E error.log
88 $ hg serve --config badserver.closeafterrecvbytes=40 -p $HGPORT -d --pid-file=hg.pid -E error.log
89 $ cat hg.pid > $DAEMON_PIDS
89 $ cat hg.pid > $DAEMON_PIDS
90 $ hg clone http://localhost:$HGPORT/ clone
90 $ hg clone http://localhost:$HGPORT/ clone
91 abort: error: bad HTTP status line: ''
91 abort: error: bad HTTP status line: * (glob)
92 [255]
92 [255]
93
93
94 $ killdaemons.py $DAEMON_PIDS
94 $ killdaemons.py $DAEMON_PIDS
@@ -105,7 +105,7 b' Failure on subsequent HTTP request on th'
105 $ hg serve --config badserver.closeafterrecvbytes=210,223 -p $HGPORT -d --pid-file=hg.pid -E error.log
105 $ hg serve --config badserver.closeafterrecvbytes=210,223 -p $HGPORT -d --pid-file=hg.pid -E error.log
106 $ cat hg.pid > $DAEMON_PIDS
106 $ cat hg.pid > $DAEMON_PIDS
107 $ hg clone http://localhost:$HGPORT/ clone
107 $ hg clone http://localhost:$HGPORT/ clone
108 abort: error: bad HTTP status line: ''
108 abort: error: bad HTTP status line: * (glob)
109 [255]
109 [255]
110
110
111 $ killdaemons.py $DAEMON_PIDS
111 $ killdaemons.py $DAEMON_PIDS
@@ -144,7 +144,7 b' Failure to read getbundle HTTP request'
144 $ cat hg.pid > $DAEMON_PIDS
144 $ cat hg.pid > $DAEMON_PIDS
145 $ hg clone http://localhost:$HGPORT/ clone
145 $ hg clone http://localhost:$HGPORT/ clone
146 requesting all changes
146 requesting all changes
147 abort: error: bad HTTP status line: ''
147 abort: error: bad HTTP status line: * (glob)
148 [255]
148 [255]
149
149
150 $ killdaemons.py $DAEMON_PIDS
150 $ killdaemons.py $DAEMON_PIDS
@@ -203,7 +203,7 b' Now do a variation using POST to send ar'
203 $ cat hg.pid > $DAEMON_PIDS
203 $ cat hg.pid > $DAEMON_PIDS
204
204
205 $ hg clone http://localhost:$HGPORT/ clone
205 $ hg clone http://localhost:$HGPORT/ clone
206 abort: error: bad HTTP status line: ''
206 abort: error: bad HTTP status line: * (glob)
207 [255]
207 [255]
208
208
209 $ killdaemons.py $DAEMON_PIDS
209 $ killdaemons.py $DAEMON_PIDS
General Comments 0
You need to be logged in to leave comments. Login now