[Pkg-mono-svn-commits] [xsp] 01/05: Imported Upstream version 3.0.11
Jo Shields
directhex at alioth.debian.org
Tue Oct 8 16:11:37 UTC 2013
This is an automated email from the git hooks/post-receive script.
directhex pushed a commit to annotated tag debian/3.0.11-1
in repository xsp.
commit cba6453dd1e22a6f7e9d5676c80fae992d301d6f
Author: Jo Shields <directhex at apebox.org>
Date: Tue Oct 8 16:23:32 2013 +0200
Imported Upstream version 3.0.11
---
configure | 30 +++++++++++-----------
configure.ac | 2 +-
src/Mono.WebServer.FastCgi/UnixSocket.cs | 41 ++++++++++++++++++++++++++++--
3 files changed, 55 insertions(+), 18 deletions(-)
diff --git a/configure b/configure
index 0402f6a..ba9c8c1 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xsp 2.11.
+# Generated by GNU Autoconf 2.69 for xsp 3.0.
#
-# Report bugs to <http://bugzilla.novell.com/>.
+# Report bugs to <http://bugzilla.xamarin.com/>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -266,7 +266,7 @@ fi
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf at gnu.org and
-$0: http://bugzilla.novell.com/ about your system,
+$0: http://bugzilla.xamarin.com/ about your system,
$0: including any error possibly output before this
$0: message. Then install a modern shell, or manually run
$0: the script under such a shell if you do have one."
@@ -579,9 +579,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xsp'
PACKAGE_TARNAME='xsp'
-PACKAGE_VERSION='2.11'
-PACKAGE_STRING='xsp 2.11'
-PACKAGE_BUGREPORT='http://bugzilla.novell.com/'
+PACKAGE_VERSION='3.0'
+PACKAGE_STRING='xsp 3.0'
+PACKAGE_BUGREPORT='http://bugzilla.xamarin.com/'
PACKAGE_URL=''
ac_subst_vars='LTLIBOBJS
@@ -1268,7 +1268,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xsp 2.11 to adapt to many kinds of systems.
+\`configure' configures xsp 3.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1339,7 +1339,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xsp 2.11:";;
+ short | recursive ) echo "Configuration of xsp 3.0:";;
esac
cat <<\_ACEOF
@@ -1373,7 +1373,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <http://bugzilla.novell.com/>.
+Report bugs to <http://bugzilla.xamarin.com/>.
_ACEOF
ac_status=$?
fi
@@ -1436,7 +1436,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xsp configure 2.11
+xsp configure 3.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1453,7 +1453,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xsp $as_me 2.11, which was
+It was created by xsp $as_me 3.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2380,7 +2380,7 @@ fi
# Define the identity of the package.
PACKAGE='xsp'
- VERSION='2.11'
+ VERSION='3.0'
cat >>confdefs.h <<_ACEOF
@@ -3951,7 +3951,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xsp $as_me 2.11, which was
+This file was extended by xsp $as_me 3.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3998,13 +3998,13 @@ Usage: $0 [OPTION]... [TAG]...
Configuration files:
$config_files
-Report bugs to <http://bugzilla.novell.com/>."
+Report bugs to <http://bugzilla.xamarin.com/>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xsp config.status 2.11
+xsp config.status 3.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 3d39174..67047ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.53])
-AC_INIT([xsp], [2.11], [http://bugzilla.novell.com/])
+AC_INIT([xsp], [3.0], [http://bugzilla.xamarin.com/])
AC_CANONICAL_SYSTEM
AC_CONFIG_MACRO_DIR([build/m4])
AM_INIT_AUTOMAKE([foreign])
diff --git a/src/Mono.WebServer.FastCgi/UnixSocket.cs b/src/Mono.WebServer.FastCgi/UnixSocket.cs
index 209a5c7..8ae1982 100644
--- a/src/Mono.WebServer.FastCgi/UnixSocket.cs
+++ b/src/Mono.WebServer.FastCgi/UnixSocket.cs
@@ -1,4 +1,35 @@
+//
+// UnixSocket.cs: Provides a wrapper around a unix domain socket file.
+//
+// Authors:
+// Brian Nickel (brian.nickel at gmail.com)
+// Andres G. Aragoneses (andres at 7digital.com)
+//
+// Copyright (C) 2007 Brian Nickel
+// Copyright (C) 2013 7digital Media Ltd (http://www.7digital.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
using System;
+using Mono.Unix;
using System.Globalization;
namespace Mono.FastCgi
@@ -6,6 +37,7 @@ namespace Mono.FastCgi
internal class UnixSocket : StandardSocket, IDisposable
{
string path = null;
+ long inode;
protected UnixSocket (Mono.Unix.UnixEndPoint localEndPoint)
: base (System.Net.Sockets.AddressFamily.Unix,
@@ -18,6 +50,7 @@ namespace Mono.FastCgi
public UnixSocket (string path) : this (CreateEndPoint (path))
{
this.path = path;
+ this.inode = new UnixFileInfo (path).Inode;
}
@@ -57,7 +90,10 @@ namespace Mono.FastCgi
if (path != null) {
string f = path;
path = null;
- System.IO.File.Delete (f);
+
+ if (System.IO.File.Exists (f) && this.inode == new UnixFileInfo (f).Inode) {
+ System.IO.File.Delete (f);
+ }
}
}
@@ -66,4 +102,5 @@ namespace Mono.FastCgi
Dispose ();
}
}
-}
\ No newline at end of file
+}
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mono/packages/xsp.git
More information about the Pkg-mono-svn-commits
mailing list