Gwibber

Merge lp:~bobbo/gwibber/bug552227 into lp:gwibber

  1. bug552227
  2. Merge into trunk
Proposed by David Futcher
Status: Merged
Merge reported by: Ken VanDine
Merged at revision: not available
Proposed branch: lp:~bobbo/gwibber/bug552227
Merge into: lp:gwibber
Diff against target: 29 lines (+4/-4)
2 files modified
gwibber/microblog/network.py (+2/-2)
gwibber/microblog/util/facelib.py (+2/-2)
To merge this branch: bzr merge lp:~bobbo/gwibber/bug552227
Reviewer Review Type Date Requested Status
gwibber-committers Pending
Review via email: mp+27024@code.launchpad.net

Description of the change

Fix for bug #552227. Increases timeouts which has reportedly fixed this bug for every subsequent commenter in the bug report.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

This has been fixed in trunk, thanks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gwibber/microblog/network.py'
2--- gwibber/microblog/network.py 2010-03-12 04:32:35 +0000
3+++ gwibber/microblog/network.py 2010-06-08 08:57:30 +0000
4@@ -22,8 +22,8 @@
5
6 self.curl.setopt(pycurl.FOLLOWLOCATION, 1)
7 self.curl.setopt(pycurl.MAXREDIRS, 5)
8- self.curl.setopt(pycurl.TIMEOUT, 15)
9- self.curl.setopt(pycurl.CONNECTTIMEOUT, 8)
10+ self.curl.setopt(pycurl.TIMEOUT, 60)
11+ self.curl.setopt(pycurl.CONNECTTIMEOUT, 30)
12 self.curl.setopt(pycurl.HTTP_VERSION, pycurl.CURL_HTTP_VERSION_1_0)
13
14 self.content = StringIO.StringIO()
15
16=== modified file 'gwibber/microblog/util/facelib.py'
17--- gwibber/microblog/util/facelib.py 2009-10-19 14:04:24 +0000
18+++ gwibber/microblog/util/facelib.py 2010-06-08 08:57:30 +0000
19@@ -840,8 +840,8 @@
20 c.setopt(pycurl.WRITEFUNCTION, b.write)
21 c.setopt(pycurl.FOLLOWLOCATION, 1)
22 c.setopt(pycurl.MAXREDIRS, 5)
23- c.setopt(pycurl.TIMEOUT, 15)
24- c.setopt(pycurl.CONNECTTIMEOUT, 8)
25+ c.setopt(pycurl.TIMEOUT, 60)
26+ c.setopt(pycurl.CONNECTTIMEOUT, 30)
27 c.perform()
28
29 response = b.getvalue()