Merge lp://qastaging/~cmiller/desktopcouch/incredibly-pedantic-hackery-suspend-resume-bug-workaround-damnit into lp://qastaging/desktopcouch
Proposed by
Chad Miller
| Status: | Merged |
|---|---|
| Approved by: | Elliot Murphy |
| Approved revision: | 154 |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~cmiller/desktopcouch/incredibly-pedantic-hackery-suspend-resume-bug-workaround-damnit |
| Merge into: | lp://qastaging/desktopcouch |
| Diff against target: |
205 lines (+58/-25) 1 file modified
desktopcouch/records/server_base.py (+58/-25) |
| To merge this branch: | bzr merge lp://qastaging/~cmiller/desktopcouch/incredibly-pedantic-hackery-suspend-resume-bug-workaround-damnit |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Elliot Murphy (community) | Approve | ||
| Ken VanDine | Approve | ||
|
Review via email:
|
|||
Commit message
A speculative bug fix, where a TCP socket may time out. If it does and HTTPLIB isn't smart enough to reconnect, then abandon the socket and make a new one.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Tested this with both suspend and hibernate, worked great fixing both bug 539674 and bug 522538 in gwibber. Thanks
Approved!