[Checkins] SVN: zope.publisher/tags/3.4.6.1/ XMLPRC was broken for paste.httpserver

[Michael Haubenwallner]

Log message for revision 100285:
  XMLPRC was broken for paste.httpserver

Changed:
  U   zope.publisher/tags/3.4.6.1/CHANGES.txt
  U   zope.publisher/tags/3.4.6.1/src/zope/publisher/xmlrpc.py

-=-
Modified: zope.publisher/tags/3.4.6.1/CHANGES.txt
===================================================================
--- zope.publisher/tags/3.4.6.1/CHANGES.txt	2009-05-23 09:54:39 UTC (rev 100284)
+++ zope.publisher/tags/3.4.6.1/CHANGES.txt	2009-05-23 10:01:19 UTC (rev 100285)
@@ -1,6 +1,13 @@
 Changes
 =======
 
+3.4.6.1 (unreleased)
+--------------------
+
+* XMLPRC was broken for paste.httpserver
+  https://bugs.launchpad.net/bugs/332063
+  https://bugs.launchpad.net/bugs/283089
+
 3.4.6 (2008-09-04)
 ------------------
 

Modified: zope.publisher/tags/3.4.6.1/src/zope/publisher/xmlrpc.py
===================================================================
--- zope.publisher/tags/3.4.6.1/src/zope/publisher/xmlrpc.py	2009-05-23 09:54:39 UTC (rev 100284)
+++ zope.publisher/tags/3.4.6.1/src/zope/publisher/xmlrpc.py	2009-05-23 10:01:19 UTC (rev 100285)
@@ -46,10 +46,14 @@
         'See IPublisherRequest'
         # Parse the request XML structure
 
-        # XXX using readlines() instead of lines()
-        # as twisted's BufferedStream sends back
-        # an empty stream here for read() (bug)
-        lines = ''.join(self._body_instream.readlines())
+        # XXX using readline() instead of readlines()
+        # as readlines() is not working with 
+        # paster.httpserver
+        line = 1
+        lines = ''
+        while line != '':
+            line = self._body_instream.readline()
+            lines += line
         self._args, function = xmlrpclib.loads(lines)
 
         # Translate '.' to '/' in function to represent object traversal.