# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: v.ladeuil+lp@free.fr-20071120092749-3vgv8xos1c0k2czv
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev/
# testament_sha1: 6c44779da9fa58740252a26e3044513b85f5043c
# timestamp: 2007-11-20 10:31:52 +0100
# base_revision_id: pqm@pqm.ubuntu.com-20071119235416-b8dvkk17vngbf99s
# 
# Begin patch
=== modified file 'NEWS'
--- NEWS	2007-11-17 18:07:42 +0000
+++ NEWS	2007-11-20 09:27:49 +0000
@@ -59,6 +59,9 @@
      retrying an http request or some programming errors may be masked.
      (Vincent Ladeuil, #160012)
 
+   * Don't force cache revalidation for http requests.
+     (Vincent Ladeuil, #120697)
+
    * Fix multiple connections during checkout --lightweight.
      (Vincent Ladeuil, #159150)
 

=== modified file 'bzrlib/transport/http/_pycurl.py'
--- bzrlib/transport/http/_pycurl.py	2007-10-31 12:38:11 +0000
+++ bzrlib/transport/http/_pycurl.py	2007-11-20 09:27:49 +0000
@@ -73,8 +73,6 @@
     raise DependencyNotPresent('pycurl', e)
 
 
-
-
 def _get_pycurl_errcode(symbol, default):
     """
     Returns the numerical error code for a symbol defined by pycurl.
@@ -87,6 +85,7 @@
     """
     return pycurl.__dict__.get(symbol, default)
 
+
 CURLE_SSL_CACERT_BADFILE = _get_pycurl_errcode('E_SSL_CACERT_BADFILE', 77)
 CURLE_COULDNT_CONNECT = _get_pycurl_errcode('E_COULDNT_CONNECT', 7)
 CURLE_COULDNT_RESOLVE_HOST = _get_pycurl_errcode('E_COULDNT_RESOLVE_HOST', 6)
@@ -274,13 +273,7 @@
     def _curl_perform(self, curl, header, more_headers=[]):
         """Perform curl operation and translate exceptions."""
         try:
-            # There's no way in http/1.0 to say "must
-            # revalidate"; we don't want to force it to always
-            # retrieve.  so just turn off the default Pragma
-            # provided by Curl.
-            headers = ['Cache-control: max-age=0',
-                       'Pragma: no-cache',
-                       'Connection: Keep-Alive']
+            headers = ['Connection: Keep-Alive']
             curl.setopt(pycurl.HTTPHEADER, headers + more_headers)
             curl.perform()
         except pycurl.error, e:

=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- bzrlib/transport/http/_urllib2_wrappers.py	2007-11-05 13:21:30 +0000
+++ bzrlib/transport/http/_urllib2_wrappers.py	2007-11-20 09:27:49 +0000
@@ -316,9 +316,7 @@
     # wins).
     handler_order = 400
 
-    _default_headers = {'Pragma': 'no-cache',
-                        'Cache-control': 'max-age=0',
-                        'Connection': 'Keep-Alive',
+    _default_headers = {'Connection': 'Keep-Alive',
                         # FIXME: Spell it User-*A*gent once we
                         # know how to properly avoid bogus
                         # urllib2 using capitalize() for headers

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRRTJ6MAAvJfgGBQWf///35N
TYq////4UAXMXhyFIu7AAaRMNEnpIepN6SfqMk8oxoACYmQBoYAECUmppqejImNSekAAANAAAAAA
kSBU2o9U9km0jUHoj0gNBoAaDTQaAHGTJpphMjIGBGJowRhBo0wACCSQTRMmmmmIJhNTwjRGmmob
UDQA9T0nqITHURSikir5oVBpnq9+Iq0GHQOfKJwRhLAMnjqiCjWRaDFgcdi0cfWupWLVjSgmD3+f
ow91q9gPet5MbTba6fmlwdVNzB4cM7Ob0aq5p0bY3pc3NvqMTuu85ZHQv5jaSiv2016T8uUNSiCy
6nC2sCOSC/HLRn5td1NTR994W/dKZJG9agBBTYniAFYRHDH/bERLgxIJYz4sR8ckLxbaaTUbhico
BhGAjkXmeRpT3kT/NvfvUJuPqGlC2oWaWMZOsDAInmDN1XULrDNIQNW8uhC4DMMAcCLhE5EO4m4A
2wgUj5yCeBOtpQPAPB7lMUUDxDGMHrFMRGO0xHfWI9KbPNklWepbQxWz1I2tY1Vk6IkO2YcrE36i
MwhznIsa5YMl7roKPcRCQUIT4QyIzHdbeMjsPi9QbxTxB5OXlpvEZCINdXJn5jSAoITysuGCxQvM
Q8RaVlJoJCoOoKCgkajOI520VTVjzKMe1bzKSUYDDEgiso/REhaTRC4sLhEH4U34ioYIPU5Sbary
JRiLz2NxIRIMQZeqc0mBmCczNFpFxkXFPpbQNL1SA0wX4iUhg8YWGEeWYriBEqLLJkyo3OfPgqKo
sE4wTk1ydWWG0pMRaMWzNiUEMUjECJjNT8l44xDTEgCUXOJx14jEVjmnNZSOKTOeTD0IOLiBEpBo
qSYx8SlsRkhR0h5YWKPGPlImGtSkZQPHEKBlrsKVlRrCDSA1VaIPFrgLUTORRC0YK0iy1HlYVDhp
YXJcXV4ze3DXsKWLrEVIeFwZRRY6HvUzAcmLzpnKmaQ5zauUEOUBnTOL4Bp2StBWUSuQvEHPtJrO
DG/prN3El7idvfWVODtPg3kSt+Fa4CnMy/jXAxUUYMExk1KmKYITCbK0tgRmA6jYdCJyO04Ej4+6
YkG9+ZHpchNjMxEXw+OAYQ1tIYO+pByVRzuyeHztMgZzGZzuM0xpKiJ0XgfRfAu6/67PMPAFlKTK
IxmBAtOseZx5YWkCAUE5YWHELigpNdm5aJ0N2BR8oVnM9WKRD1UYXGn7XGIrQxFDq0Dy8iTlWMER
PcE+Td5LkYcF0DgrkJ6yGw7Kx5lPrNHRvKxiR3FrdoczQZMzipQFaju4HAKScw4IXH1HSocepMON
SZLINXLLTszwBwFPdvL12YiSSpSMSUcMbbS83m03HmomQn2ECcxmIJFgfkuS4rYxay6IX+oXbnmV
wDj02CNO3t1u2gaTY9VendlIx9n+8qOGAEu0zxBr6QHxNYXpLWgeVf8fqKr5bHRwkMzAcNQjnWQT
cZZypdwi0VC+BwSWBShjghVkBc2Wd5FZA4eQzw0/VC5Om6R5h7AOU4eeus1SjzCDxLUDiDCZ+8lw
LvzKb6VGlgELuZUPThdsRZeZiO9/iqLtom2HiOX8CLIvVgxfqQr1o0aERD3VBSG92AaPAJ+9imka
rPwFyYrIz1AW5NGTCDAmXjfMLl9PAHyQr8S5AzRywsGpXldQZmJhfLBFAJsbGuuR6Iq0TETycxvW
VOFGYMhDVEcllQWURomfG/m2UOzFTiFnuIqb2QrM0bpBS4zCrctxEobLNFnkhweBAmDcHZ0uwLUl
ssgFdhxZaA5Jeuo3HFDKC6hGP78egzr8RERFy+an35A0HkIklu69cZCdIontaZUAlc4CbPjBCz/i
7kinChICimT0YA==