Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package python-nbxmpp for openSUSE:Factory 
checked in at 2023-03-27 18:15:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-nbxmpp (Old)
 and      /work/SRC/openSUSE:Factory/.python-nbxmpp.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-nbxmpp"

Mon Mar 27 18:15:40 2023 rev:41 rq:1074496 version:4.2.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-nbxmpp/python-nbxmpp.changes      
2023-02-07 18:49:35.807296687 +0100
+++ /work/SRC/openSUSE:Factory/.python-nbxmpp.new.31432/python-nbxmpp.changes   
2023-03-27 18:15:40.878916975 +0200
@@ -1,0 +2,12 @@
+Sun Mar 26 19:06:15 UTC 2023 - Dirk Müller <[email protected]>
+
+- update to 4.2.2:
+  * HTTP: Reset attributes on redirect
+
+-------------------------------------------------------------------
+Thu Mar 23 15:00:22 UTC 2023 - Alexei Sorokin <[email protected]>
+
+- Update to version 4.2.1:
+  * HTTP: Make sure streams are closed only once.
+
+-------------------------------------------------------------------

Old:
----
  python-nbxmpp-4.2.0.tar.bz2

New:
----
  python-nbxmpp-4.2.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-nbxmpp.spec ++++++
--- /var/tmp/diff_new_pack.5XbT6k/_old  2023-03-27 18:15:41.434919908 +0200
+++ /var/tmp/diff_new_pack.5XbT6k/_new  2023-03-27 18:15:41.442919951 +0200
@@ -24,7 +24,7 @@
 %endif
 %define _name   nbxmpp
 Name:           python-nbxmpp
-Version:        4.2.0
+Version:        4.2.2
 Release:        0
 Summary:        XMPP library by Gajim team
 License:        GPL-3.0-or-later

++++++ python-nbxmpp-4.2.0.tar.bz2 -> python-nbxmpp-4.2.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-nbxmpp-4.2.0/ChangeLog 
new/python-nbxmpp-4.2.2/ChangeLog
--- old/python-nbxmpp-4.2.0/ChangeLog   2023-02-05 17:23:56.000000000 +0100
+++ new/python-nbxmpp-4.2.2/ChangeLog   2023-03-25 17:33:26.000000000 +0100
@@ -1,3 +1,15 @@
+nbxmpp 4.2.2 (25 Mar 2023)
+
+  Bug Fixes
+
+  * HTTP: Reset attributes on redirect (#141)
+
+nbxmpp 4.2.1 (18 Mar 2023)
+
+  Bug Fixes
+
+  * HTTP: Make sure streams are closed only once (#139)
+
 nbxmpp 4.2.0 (05 Feb 2023)
 
   New
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-nbxmpp-4.2.0/nbxmpp/__init__.py 
new/python-nbxmpp-4.2.2/nbxmpp/__init__.py
--- old/python-nbxmpp-4.2.0/nbxmpp/__init__.py  2023-02-05 17:23:56.000000000 
+0100
+++ new/python-nbxmpp-4.2.2/nbxmpp/__init__.py  2023-03-25 17:33:26.000000000 
+0100
@@ -3,4 +3,4 @@
 
 from .protocol import *  # pylint: disable=wrong-import-position
 
-__version__: str = '4.2.0'
+__version__: str = '4.2.2'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/python-nbxmpp-4.2.0/nbxmpp/http.py 
new/python-nbxmpp-4.2.2/nbxmpp/http.py
--- old/python-nbxmpp-4.2.0/nbxmpp/http.py      2023-02-05 17:23:56.000000000 
+0100
+++ new/python-nbxmpp-4.2.2/nbxmpp/http.py      2023-03-25 17:33:26.000000000 
+0100
@@ -276,6 +276,7 @@
 
         self._message.connect('content-sniffed', self._on_content_sniffed)
         self._message.connect('got-body', self._on_got_body)
+        self._message.connect('restarted', self._on_restarted)
         self._message.connect('finished', self._on_finished)
 
         soup_session = self._session.get_soup_session()
@@ -431,6 +432,12 @@
         self._log.info('Body received')
         self._body_received = True
 
+    def _on_restarted(self, _message: Soup.Message) -> None:
+        self._log.info('Restarted')
+        self._body_received = False
+        self._response_content_type = ''
+        self._response_content_length = 0
+
     def _on_finished(self, _message: Soup.Message) -> None:
         self._log.info('Message finished')
         if not self._body_received:
@@ -483,13 +490,24 @@
         self._cleanup()
 
     def _close_all_streams(self) -> None:
-        if self._input_stream is not None:
-            if not self._input_stream.is_closed():
-                self._input_stream.close(None)
-
-        if self._output_stream is not None:
-            if not self._output_stream.is_closed():
-                self._output_stream.close(None)
+        # stream.close() will invoke signals on the Message object
+        # which in turn can lead to this method called again in the
+        # same Mainloop iteration. This means is_closed() will not
+        # return True and we get an GLib.IOError.PENDING error.
+
+        input_stream = self._input_stream
+        output_stream = self._output_stream
+
+        self._input_stream = None
+        self._output_stream = None
+
+        if input_stream is not None:
+            if not input_stream.is_closed():
+                input_stream.close(None)
+
+        if output_stream is not None:
+            if not output_stream.is_closed():
+                output_stream.close(None)
 
     def _cleanup(self) -> None:
         self._log.info('Run cleanup')
@@ -501,9 +519,6 @@
         del self._session
         del self._user_data
 
-        self._input_stream = None
-        self._output_stream = None
-
         if self._timeout_id is not None:
             GLib.source_remove(self._timeout_id)
             self._timeout_id = None

Reply via email to