date:20121014

[Zope-Checkins] SVN: Zope/branches/2.13/ Revert r127986 - tempstorage is an actual dependency of Products.TemporaryStorage

2012-10-14 Thread Hano Schlichting

Log message for revision 127987:
  Revert r127986 - tempstorage is an actual dependency of 
Products.TemporaryStorage
  

Changed:
  U   Zope/branches/2.13/buildout.cfg
  U   Zope/branches/2.13/setup.py

-=-
Modified: Zope/branches/2.13/buildout.cfg
===
--- Zope/branches/2.13/buildout.cfg 2012-10-13 19:45:24 UTC (rev 127986)
+++ Zope/branches/2.13/buildout.cfg 2012-10-14 09:19:32 UTC (rev 127987)
@@ -30,7 +30,7 @@
 import sys
 import warnings
 if sys.version_info = (2, 7): warnings.simplefilter('default')
-eggs = Zope2 [test]
+eggs = Zope2
 
 
 [scripts]

Modified: Zope/branches/2.13/setup.py
===
--- Zope/branches/2.13/setup.py 2012-10-13 19:45:24 UTC (rev 127986)
+++ Zope/branches/2.13/setup.py 2012-10-14 09:19:32 UTC (rev 127987)
@@ -65,6 +65,7 @@
   'initgroups',
   'pytz',
   'setuptools',
+  'tempstorage',
   'transaction',
   'zdaemon',
   'zExceptions',
@@ -112,9 +113,7 @@
   'Products.PythonScripts',
   'Products.StandardCacheManagers',
 ] + additional_install_requires,
-extras_require={
-  'test': ['tempstorage'],
-},
+
 include_package_data=True,
 zip_safe=False,
 entry_points={

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/ Revert r127985 - tempstorage is an actual dependency of Products.TemporaryFolder

2012-10-14 Thread Hano Schlichting

Log message for revision 127988:
  Revert r127985 - tempstorage is an actual dependency of 
Products.TemporaryFolder
  

Changed:
  U   Zope/trunk/buildout.cfg
  U   Zope/trunk/setup.py

-=-
Modified: Zope/trunk/buildout.cfg
===
--- Zope/trunk/buildout.cfg 2012-10-14 09:19:32 UTC (rev 127987)
+++ Zope/trunk/buildout.cfg 2012-10-14 09:21:40 UTC (rev 127988)
@@ -31,7 +31,7 @@
 import sys
 import warnings
 if sys.version_info = (2, 7): warnings.simplefilter('default')
-eggs = Zope2 [test]
+eggs = Zope2
 
 
 [scripts]

Modified: Zope/trunk/setup.py
===
--- Zope/trunk/setup.py 2012-10-14 09:19:32 UTC (rev 127987)
+++ Zope/trunk/setup.py 2012-10-14 09:21:40 UTC (rev 127988)
@@ -65,6 +65,7 @@
   'initgroups',
   'pytz',
   'setuptools',
+  'tempstorage',
   'transaction',
   'zdaemon',
   'zExceptions',
@@ -105,9 +106,7 @@
   'zope.traversing',
   'zope.viewlet',
 ] + additional_install_requires,
-extras_require={
-  'test': ['tempstorage'],
-},
+
 include_package_data=True,
 zip_safe=False,
 entry_points={

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/versions.cfg tempstorage = 2.12.2

2012-10-14 Thread Hano Schlichting

Log message for revision 127995:
  tempstorage = 2.12.2
  

Changed:
  U   Zope/trunk/versions.cfg

-=-
Modified: Zope/trunk/versions.cfg
===
--- Zope/trunk/versions.cfg 2012-10-14 12:01:46 UTC (rev 127994)
+++ Zope/trunk/versions.cfg 2012-10-14 12:02:49 UTC (rev 127995)
@@ -19,7 +19,7 @@
 Products.ZCatalog = 3.0a2
 Products.ZCTextIndex = 2.13.3
 Record = 2.13.0
-tempstorage = 2.12.1
+tempstorage = 2.12.2
 zExceptions = 2.13.0
 zLOG = 2.12.0
 ZopeUndo = 2.12.0

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.12/ LP #930812: Scrub headers a bit more.

2012-10-14 Thread Hano Schlichting

Log message for revision 127996:
  LP #930812: Scrub headers a bit more.
  

Changed:
  U   Zope/branches/2.12/doc/CHANGES.rst
  U   Zope/branches/2.12/src/ZPublisher/HTTPResponse.py
  U   Zope/branches/2.12/src/ZPublisher/tests/testHTTPResponse.py

-=-
Modified: Zope/branches/2.12/doc/CHANGES.rst
===
--- Zope/branches/2.12/doc/CHANGES.rst  2012-10-14 12:02:49 UTC (rev 127995)
+++ Zope/branches/2.12/doc/CHANGES.rst  2012-10-14 12:38:50 UTC (rev 127996)
@@ -8,6 +8,7 @@
 2.12.26 (unreleased)
 
 
+- LP #930812: Scrub headers a bit more.
 
 2.12.25 (2012-09-18)
 
@@ -15,7 +16,6 @@
 - Explicitly declared ZTUtils APIs as public (repairs breakages in apps
   following fix for LP #1047318).
 
-
 2.12.24 (2012-09-09)
 
 

Modified: Zope/branches/2.12/src/ZPublisher/HTTPResponse.py
===
--- Zope/branches/2.12/src/ZPublisher/HTTPResponse.py   2012-10-14 12:02:49 UTC 
(rev 127995)
+++ Zope/branches/2.12/src/ZPublisher/HTTPResponse.py   2012-10-14 12:38:50 UTC 
(rev 127996)
@@ -125,7 +125,7 @@
 if otherTypes:
 uncompressableMimeMajorTypes += tuple(otherTypes.split(','))
 
-_CRLF = re.compile(r'\r[\n]?')
+_CRLF = re.compile(r'[\r\n]')
 
 def _scrubHeader(name, value):
 return ''.join(_CRLF.split(str(name))), ''.join(_CRLF.split(str(value)))

Modified: Zope/branches/2.12/src/ZPublisher/tests/testHTTPResponse.py
===
--- Zope/branches/2.12/src/ZPublisher/tests/testHTTPResponse.py 2012-10-14 
12:02:49 UTC (rev 127995)
+++ Zope/branches/2.12/src/ZPublisher/tests/testHTTPResponse.py 2012-10-14 
12:38:50 UTC (rev 127996)
@@ -303,6 +303,15 @@
 'Set-Cookie: '
 'violation=http://www.ietf.org/rfc/rfc2616.txt\r\n')
 
+def test_setHeader_drops_LF(self):
+# Some browsers accept \n in place of \n\r to separate headers,
+# so we scrub it too.
+response = self._makeOne()
+response.setHeader('Location',
+   'http://www.ietf.org/rfc/\nrfc2616.txt')
+self.assertEqual(response.headers['location'],
+ 'http://www.ietf.org/rfc/rfc2616.txt')
+
 def test_setBody_compression_vary(self):
 # Vary header should be added here
 response = self._makeOne()

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.13/ LP #930812: Scrub headers a bit more.

2012-10-14 Thread Hano Schlichting

Log message for revision 127997:
  LP #930812: Scrub headers a bit more.
  

Changed:
  U   Zope/branches/2.13/doc/CHANGES.rst
  U   Zope/branches/2.13/src/ZPublisher/HTTPResponse.py
  U   Zope/branches/2.13/src/ZPublisher/tests/testHTTPResponse.py

-=-
Modified: Zope/branches/2.13/doc/CHANGES.rst
===
--- Zope/branches/2.13/doc/CHANGES.rst  2012-10-14 12:38:50 UTC (rev 127996)
+++ Zope/branches/2.13/doc/CHANGES.rst  2012-10-14 12:43:43 UTC (rev 127997)
@@ -8,6 +8,8 @@
 2.13.19 (unreleased)
 
 
+- LP #930812: Scrub headers a bit more.
+
 - Updated distributions:
 
   - tempstorage = 2.12.2

Modified: Zope/branches/2.13/src/ZPublisher/HTTPResponse.py
===
--- Zope/branches/2.13/src/ZPublisher/HTTPResponse.py   2012-10-14 12:38:50 UTC 
(rev 127996)
+++ Zope/branches/2.13/src/ZPublisher/HTTPResponse.py   2012-10-14 12:43:43 UTC 
(rev 127997)
@@ -128,7 +128,7 @@
 if otherTypes:
 uncompressableMimeMajorTypes += tuple(otherTypes.split(','))
 
-_CRLF = re.compile(r'\r[\n]?')
+_CRLF = re.compile(r'[\r\n]')
 
 def _scrubHeader(name, value):
 return ''.join(_CRLF.split(str(name))), ''.join(_CRLF.split(str(value)))

Modified: Zope/branches/2.13/src/ZPublisher/tests/testHTTPResponse.py
===
--- Zope/branches/2.13/src/ZPublisher/tests/testHTTPResponse.py 2012-10-14 
12:38:50 UTC (rev 127996)
+++ Zope/branches/2.13/src/ZPublisher/tests/testHTTPResponse.py 2012-10-14 
12:43:43 UTC (rev 127997)
@@ -431,6 +431,15 @@
  ('Set-Cookie',
   'violation=http://www.ietf.org/rfc/rfc2616.txt;')])
 
+def test_setHeader_drops_LF(self):
+# Some browsers accept \n in place of \n\r to separate headers,
+# so we scrub it too.
+response = self._makeOne()
+response.setHeader('Location',
+   'http://www.ietf.org/rfc/\nrfc2616.txt')
+self.assertEqual(response.headers['location'],
+ 'http://www.ietf.org/rfc/rfc2616.txt')
+
 def test_appendHeader_no_existing(self):
 response = self._makeOne()
 response.appendHeader('foo', 'foo')

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/src/ZPublisher/ - LP #930812: Scrub headers a bit more.

2012-10-14 Thread Hano Schlichting

Log message for revision 127998:
  - LP #930812: Scrub headers a bit more.
  

Changed:
  U   Zope/trunk/src/ZPublisher/HTTPResponse.py
  U   Zope/trunk/src/ZPublisher/tests/testHTTPResponse.py

-=-
Modified: Zope/trunk/src/ZPublisher/HTTPResponse.py
===
--- Zope/trunk/src/ZPublisher/HTTPResponse.py   2012-10-14 12:43:43 UTC (rev 
127997)
+++ Zope/trunk/src/ZPublisher/HTTPResponse.py   2012-10-14 12:46:17 UTC (rev 
127998)
@@ -128,7 +128,7 @@
 if otherTypes:
 uncompressableMimeMajorTypes += tuple(otherTypes.split(','))
 
-_CRLF = re.compile(r'\r[\n]?')
+_CRLF = re.compile(r'[\r\n]')
 
 def _scrubHeader(name, value):
 return ''.join(_CRLF.split(str(name))), ''.join(_CRLF.split(str(value)))

Modified: Zope/trunk/src/ZPublisher/tests/testHTTPResponse.py
===
--- Zope/trunk/src/ZPublisher/tests/testHTTPResponse.py 2012-10-14 12:43:43 UTC 
(rev 127997)
+++ Zope/trunk/src/ZPublisher/tests/testHTTPResponse.py 2012-10-14 12:46:17 UTC 
(rev 127998)
@@ -409,6 +409,15 @@
 self.assertEqual(response.headers['location'],
  'http://www.ietf.org/rfc/rfc2616.txt')
 
+def test_setHeader_drops_LF(self):
+# Some browsers accept \n in place of \n\r to separate headers,
+# so we scrub it too.
+response = self._makeOne()
+response.setHeader('Location',
+   'http://www.ietf.org/rfc/\nrfc2616.txt')
+self.assertEqual(response.headers['location'],
+ 'http://www.ietf.org/rfc/rfc2616.txt')
+
 def test_appendHeader_no_existing(self):
 response = self._makeOne()
 response.appendHeader('foo', 'foo')

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.13/ Revert r127986 - tempstorage is an actual dependency of Products.TemporaryStorage

[Zope-Checkins] SVN: Zope/trunk/ Revert r127985 - tempstorage is an actual dependency of Products.TemporaryFolder

[Zope-Checkins] SVN: Zope/trunk/versions.cfg tempstorage = 2.12.2

[Zope-Checkins] SVN: Zope/branches/2.12/ LP #930812: Scrub headers a bit more.

[Zope-Checkins] SVN: Zope/branches/2.13/ LP #930812: Scrub headers a bit more.

[Zope-Checkins] SVN: Zope/trunk/src/ZPublisher/ - LP #930812: Scrub headers a bit more.

6 matches

Site Navigation

Mail list logo

Footer information