Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit xsp
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 31 Aug 2007 15:31:04 +0200
  • Message-id: <20070831133105.12CBC678180@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package xsp
checked in at Fri Aug 31 15:31:04 CEST 2007.

--------
--- xsp/xsp.changes     2007-08-17 17:41:15.000000000 +0200
+++ /mounts/work_src_done/NOARCH/xsp/xsp.changes        2007-08-31 05:43:49.516064000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 31 05:42:49 CEST 2007 - wberrier@xxxxxxx
+
+- xsp_1.2.5_p5_final.patch: Fix for regression in the request
+  broker
+
+-------------------------------------------------------------------

New:
----
  xsp_1.2.5_p5_final.patch

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

Other differences:
------------------
++++++ xsp.spec ++++++
--- /var/tmp/diff_new_pack.ZM4590/_old  2007-08-31 15:30:42.000000000 +0200
+++ /var/tmp/diff_new_pack.ZM4590/_new  2007-08-31 15:30:42.000000000 +0200
@@ -16,10 +16,11 @@
 Group:          Productivity/Networking/Web/Servers
 Autoreqprov:    on
 Version:        1.2.5
-Release:        6
+Release:        11
 Summary:        Small Web Server Hosting ASP.NET
 Source:         %{name}-%{version}.tar.bz2
 Patch0:         xsp_1.2.5_p4.patch.bz2
+Patch1:         xsp_1.2.5_p5_final.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch: noarch
 BuildRequires:  mono-devel mono-web pkgconfig
@@ -47,6 +48,7 @@
 %prep
 %setup -q
 %patch0
+%patch1 -p1
 
 %build
 %{?env_options}
@@ -99,6 +101,9 @@
 %endif
 
 %changelog
+* Fri Aug 31 2007 - wberrier@xxxxxxx
+- xsp_1.2.5_p5_final.patch: Fix for regression in the request
+  broker
 * Fri Aug 17 2007 - wberrier@xxxxxxx
 - xsp_1.2.5_p4.patch.bz2: Bugfixes found in 1.2.5
  -bugs: 81699, 81906, 82379, 82057

++++++ xsp_1.2.5_p5_final.patch ++++++
diff -ru p4/xsp-1.2.5/ChangeLog xsp-1.2.5/ChangeLog
--- p4/xsp-1.2.5/ChangeLog      2007-08-16 14:31:23.000000000 -0600
+++ xsp-1.2.5/ChangeLog 2007-08-22 10:21:31.000000000 -0600
@@ -1,3 +1,9 @@
+2007-08-18  Josh Tauberer <jit@xxxxxxxxxxx>
+
+       * src/Mono.WebServer/BaseRequestBroker.cs: Correct a mistake
+       in my previous patch: checking for wrap-around on requests_served
+       counter, since we bitmask it 0x7FFF, wrap-around occurs at 0x8000.
+
 2007-08-16  Wade Berrier  <wberrier@xxxxxxxxxx>
 
        * configure.in: version bump -> 1.2.5
diff -ru p4/xsp-1.2.5/src/Mono.WebServer/BaseRequestBroker.cs xsp-1.2.5/src/Mono.WebServer/BaseRequestBroker.cs
--- p4/xsp-1.2.5/src/Mono.WebServer/BaseRequestBroker.cs        2007-08-16 14:31:23.000000000 -0600
+++ xsp-1.2.5/src/Mono.WebServer/BaseRequestBroker.cs   2007-08-22 10:21:31.000000000 -0600
@@ -183,8 +183,8 @@
                        
                        requests_served++; // increment to 1 before putting into request_ids
                                           // so that the 0 id is reserved for slot not used
-                       if (requests_served == 0) // and check for wrap-around for the above
-                               requests_served++; // condition
+                       if (requests_served == 0x8000) // and check for wrap-around for the above
+                               requests_served = 1; // making sure we don't exceed 0x7FFF or go negative
 
                        requests_count++;
                        if (requests_count >= reqlen)

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



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread