[prev in list] [next in list] [prev in thread] [next in thread]
List: opensuse-commit
Subject: commit xsp for openSUSE:Factory
From: root () hilbert ! suse ! de (h_root)
Date: 2010-04-28 22:42:25
Message-ID: 20100428224225.2D95B20200 () hilbert ! suse ! de
[Download RAW message or body]
Hello community,
here is the log from the commit of package xsp for openSUSE:Factory
checked in at Thu Apr 29 00:42:25 CEST 2010.
--------
--- xsp/xsp.changes 2010-03-16 17:32:01.000000000 +0100
+++ /mounts/work_src_done/STABLE/xsp/xsp.changes 2010-04-28 01:03:41.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 27 23:02:51 UTC 2010 - ajorgensen@novell.com
+
+- Update to 2.6.4
+ * http://www.mono-project.com/Release_Notes_Mono_2.6.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xsp-2.6.3.tar.bz2
New:
----
xsp-2.6.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xsp.spec ++++++
--- /var/tmp/diff_new_pack.5y2wVE/_old 2010-04-29 00:36:48.000000000 +0200
+++ /var/tmp/diff_new_pack.5y2wVE/_new 2010-04-29 00:36:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xsp (Version 2.6.3)
+# spec file for package xsp (Version 2.6.4)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,7 +23,7 @@
License: MIT
Group: Productivity/Networking/Web/Servers
AutoReqProv: on
-Version: 2.6.3
+Version: 2.6.4
Release: 1
Summary: Small Web Server Hosting ASP.NET
Source: %{name}-%{version}.tar.bz2
++++++ xsp-2.6.3.tar.bz2 -> xsp-2.6.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/xsp-2.6.3/ChangeLog \
new/xsp-2.6.4/ChangeLog
--- old/xsp-2.6.3/ChangeLog 2010-03-09 15:12:37.000000000 +0100
+++ new/xsp-2.6.4/ChangeLog 2010-04-13 19:46:53.000000000 +0200
@@ -1,3 +1,19 @@
+2010-04-13 Marek Habersack <mhabersack@novell.com>
+
+ * ModMonoRequest.cs: SendResponseFromMemory must advance the
+ pointer when not on Linux.
+
+2010-03-31 Marek Habersack <mhabersack@novell.com>
+
+ * man/xsp.1.in: updated documentation of the --nonstop
+ option. Fixes bug #585295
+
+ * src/Mono.WebServer.Apache/main.cs: added --pidfile argument, which
+ puts mod-mono-server's PID in the specified file.
+
+ * src/Mono.WebServer.XSP/main.cs: wrapped --pidfile option body in
+ try/catch block, as the failure to create the PID file is not critical.
+
2010-03-09 Marek Habersack <mhabersack@novell.com>
* ModMonoRequest.cs: better fix for bug #580086. Patch from Asgeir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/xsp-2.6.3/configure \
new/xsp-2.6.4/configure
--- old/xsp-2.6.3/configure 2010-03-09 17:29:28.000000000 +0100
+++ new/xsp-2.6.4/configure 2010-04-13 19:46:58.000000000 +0200
@@ -2250,7 +2250,7 @@
# Define the identity of the package.
PACKAGE=xsp
- VERSION=2.6.3
+ VERSION=2.6.4
cat >>confdefs.h <<_ACEOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/xsp-2.6.3/configure.in \
new/xsp-2.6.4/configure.in
--- old/xsp-2.6.3/configure.in 2010-03-01 20:34:00.000000000 +0100
+++ new/xsp-2.6.4/configure.in 2010-04-06 00:09:27.000000000 +0200
@@ -1,7 +1,7 @@
AC_PREREQ(2.57)
AC_INIT(src/Mono.WebServer.XSP/main.cs)
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(xsp, 2.6.3)
+AM_INIT_AUTOMAKE(xsp, 2.6.4)
AM_MAINTAINER_MODE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/xsp-2.6.3/man/xsp.1.in \
new/xsp-2.6.4/man/xsp.1.in
--- old/xsp-2.6.3/man/xsp.1.in 2009-09-25 17:26:30.000000000 +0200
+++ new/xsp-2.6.4/man/xsp.1.in 2010-04-06 00:09:27.000000000 +0200
@@ -103,7 +103,7 @@
need to provide a list of applications to start.
This applies only to mod-mono-server.exe.
.I \-\-nonstop
-This applies only to xsp.exe: by default xsp will stop processing
+By default xsp/mod-mono-server will stop processing
requests when the return key is pressed. Use this to avoid this
behavior.
.TP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/xsp-2.6.3/src/Mono.WebServer.Apache/ModMonoRequest.cs \
new/xsp-2.6.4/src/Mono.WebServer.Apache/ModMonoRequest.cs
--- old/xsp-2.6.3/src/Mono.WebServer.Apache/ModMonoRequest.cs 2010-03-09 \
17:29:23.000000000 +0100
+++ new/xsp-2.6.4/src/Mono.WebServer.Apache/ModMonoRequest.cs 2010-04-13 \
19:46:53.000000000 +0200 @@ -322,6 +322,7 @@
byte [] buf = writer_ms.GetBuffer ();
Marshal.Copy (ptr, buf, 0, size);
length -= size;
+ unsafe { ptr = (IntPtr)((byte*)ptr.ToPointer () + size); }
client.Send (buf, size, SocketFlags.None);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/xsp-2.6.3/src/Mono.WebServer.Apache/main.cs \
new/xsp-2.6.4/src/Mono.WebServer.Apache/main.cs
--- old/xsp-2.6.3/src/Mono.WebServer.Apache/main.cs 2009-09-25 17:26:30.000000000 \
+0200
+++ new/xsp-2.6.4/src/Mono.WebServer.Apache/main.cs 2010-03-31 14:15:41.000000000 \
+0200 @@ -127,6 +127,7 @@
Console.WriteLine ();
Console.WriteLine (" --version: displays version information and exits.");
Console.WriteLine (" --verbose: prints extra messages. Mainly useful for \
debugging."); + Console.WriteLine (" --pidfile file: write the process PID to \
the specified file.");
Console.WriteLine ();
}
@@ -277,6 +278,18 @@
case "--verbose":
verbose = true;
break;
+ case "--pidfile": {
+ string pidfile = args[++i];
+ if (pidfile != null && pidfile.Length > 0) {
+ try {
+ using (StreamWriter sw = File.CreateText (pidfile))
+ sw.Write (Process.GetCurrentProcess ().Id);
+ } catch (Exception ex) {
+ Console.Error.WriteLine ("Failed to write pidfile {0}: {1}", pidfile, \
ex.Message); + }
+ }
+ break;
+ }
case "--no-hidden":
MonoWorkerRequest.CheckFileAccess = false;
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/xsp-2.6.3/src/Mono.WebServer.XSP/main.cs \
new/xsp-2.6.4/src/Mono.WebServer.XSP/main.cs
--- old/xsp-2.6.3/src/Mono.WebServer.XSP/main.cs 2009-09-25 17:26:30.000000000 +0200
+++ new/xsp-2.6.4/src/Mono.WebServer.XSP/main.cs 2010-03-31 14:15:41.000000000 +0200
@@ -361,10 +361,14 @@
settings.Verbose = true;
break;
case "--pidfile": {
- string portfile = args[++i];
- if (portfile != null && portfile.Length > 0) {
- using (StreamWriter sw = File.CreateText (portfile))
- sw.Write (Process.GetCurrentProcess ().Id);
+ string pidfile = args[++i];
+ if (pidfile != null && pidfile.Length > 0) {
+ try {
+ using (StreamWriter sw = File.CreateText (pidfile))
+ sw.Write (Process.GetCurrentProcess ().Id);
+ } catch (Exception ex) {
+ Console.Error.WriteLine ("Failed to write pidfile {0}: {1}", pidfile, \
ex.Message); + }
}
break;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic