Fixes unmerged changes from trunk@307 to tags/release-1.6.4. This has happened

due to improper handling of ISO-8859-1/UTF-8 by some software in the middle of the process. My fault. git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/tags/release-1.6.4@315 119443c7-1b9e-41f8-b6fc-b9c35fce742c
Creation of the tag for release-1.6.4.
2008-02-03 02:25:36 +00:00 · 2008-01-27 02:20:39 +00:00 · 2008-01-27 02:13:08 +00:00
18 changed files with 182 additions and 118 deletions
--- a/100
+++ b/100
@@ -1,3 +1,41 @@
+*******************************************************************************
+Version 1.6.4
+*******************************************************************************
+
+2008-01-23 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Workaround for a problem with the new automake AM_CONDITIONAL macro
+	from autotools-1.10. Thanks to Ingo Hofmann for helping with debugging
+	this one.
+
+2008-01-22 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Added quoting to macros AC_CONFIG_AUX_DIR, AC_CONFIG_MACRO_DIR and
+	AC_CONFIG_SRCDIR in configure.ac. Also changed the name of the
+	auxiliary directory in AC_CONFIG_AUX_DIR to build-aux.
+
+2008-01-22 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Fix for setsockopt() in Threadpool.c to allow more than one process
+	to join the multicast-group on OSX. Thanks to Ingo Hofmann.
+
+2008-01-22 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Using defined(__OSX__) || defined(__APPLE__) instead of just
+	defined(__OSX__) in the code. Thanks to Ingo Hofmann and Chris
+	Pickel.
+
+2008-01-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Fix for isFileInVirtualDir. Thanks to Peter Hartley for the patch.
+
+2008-01-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Putting back a "defined(__OSX__)" that has been removed in the
+	previous *BSD patch. Thanks to Chris Pickel for pointing it out.
+
+2008-01-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* SF Patches Tracker [ 1865812 ] typo in docs comment
+	Submitted By: Hartmut Holzgraefe - hholzgra
+	typo in docs comment ACCAPTED instead of ACCEPTED in
+	@name UPNP_E_UNSUBSCRIBE_UNACCAPTED [-302]
+	Also, the documentation file name was mispelled and was corrected in
+	the Makefile.am.
+
 *******************************************************************************
 Version 1.6.3
 *******************************************************************************
@@ -108,7 +146,7 @@ Version 1.6.1
 	handle accordingly.

 2007-08-05 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
-	* Merge of Mac OS X patch from St<53>phane Corth<74>sy (davelopper),
+	* Merge of Mac OS X patch from St<53>phane Corth<74>sy (davelopper),
 	SF Bug Tracker [ 1686420 ] Modifications for MacOSX.
 	Some of the proposed changes were already done by Rene Hexel's patch.

@@ -532,14 +570,14 @@ Version 1.4.0
 FORK FROM DEAD libupnp
 *******************************************************************************

-2006-04-29  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-04-29  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* THANKS: new file with list of contributors

 	* upnp/src/gena/gena_device.c (respond_ok): add 'Content-Length: 0'
 	  in subscription response. Patch by Chaos (Bug # 1455367).

-2006-04-08  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-04-08  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* upnp/doc/UPnP_Programming_Guide.pdf: replace this document with 
 	  the one in libupnp-doc-1.2.1 because current CVS version 
@@ -550,20 +588,20 @@ FORK FROM DEAD libupnp
 	* changes applied to several files to work under Sparc Solaris, temporarily
 	  requiring a define SPARC_SOLARIS

-2006-04-03  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-04-03  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* upnp/Makefile.am: install upnp samples in $(docdir)/examples

-2006-03-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* configure.ac: add --with-docdir option to choose where documentation
 	  is installed (or -without-docdir to not install the documentation)

-2006-03-27  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-27  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* ixml/test: add simple test suite for xml parser

-2006-03-26  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-26  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* ixml/src/ixmlparser.c (Parser_processCDSect): fix bug which prevents
 	  CDATA sections which contain a 0 (zero) to be parsed (instead the
@@ -574,18 +612,18 @@ FORK FROM DEAD libupnp
 	  option, and move samples compilation from check_PROGRAMS to
 	  noinst_PROGRAMS

-2006-03-25  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-25  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* upnp/src/genlib/miniserver/miniserver.c (get_miniserver_sockets): 
 	  fix bug if new socket created has fd 0 (can only occur when stdin
 	  has been closed). Patch by Oskar Liljeblad 2004-07-02 :
 	  http://sourceforge.net/mailarchive/message.php?msg_id=8870528
 	
-2006-03-21  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-21  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* upnp/test/test_init.c: add some version checks and exit if failure

-2006-03-05  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-05  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* libupnp version 1.3.1

@@ -600,11 +638,11 @@ FORK FROM DEAD libupnp
 	  dependencies between upnp and ixml / threadutil, so that programs 
 	  linking against upnp only still work.

-2006-03-04  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-04  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* libupnp version 1.3.0

-2006-03-03  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-03-03  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* upnp/src/genlib/net/http/httpreadwrite.c (get_sdk_info): use
 	  package version string from configure to set sdk info
@@ -612,7 +650,7 @@ FORK FROM DEAD libupnp
 	* upnp/Makefile.am: add sample/tvdevice/web/ files in EXTRA_DIST
 	  + do not distribute generated upnpconfig.h file.

-2006-02-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* upnp/src/inc/config.h, configure.ac: use only new defines
 	  UPNP_HAVE_xx instead of INCLUDE_yyy_APIS and INTERNAL_WEB_SERVER
@@ -621,7 +659,7 @@ FORK FROM DEAD libupnp
 	  the librarie LDFLAGS in order to export only the symbols defined 
 	  in the API

-2006-02-27  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-27  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* configure.ac: add libtool versions for the 3 libraries

@@ -629,7 +667,7 @@ FORK FROM DEAD libupnp

 	* threadutil/src/ThreadPool.c (SetSeed): add missing 'static' 

-2006-02-26  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-26  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* threadutil/inc/iasnprintf.h: add gcc __printf__ format attribute
 	  to "iasnprintf"
@@ -650,11 +688,11 @@ FORK FROM DEAD libupnp
 	  the configuration of the installed libraries (generates installed
 	  file <upnp/upnpconfig.h>)

-2006-02-22  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-22  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* upnp/ : add missing include of config.h in some .c files

-2006-02-21  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-02-21  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* upnp/inc/upnp.h: move some definitions which should not be
 	  exported into "upnp/src/inc/util.h"
@@ -662,12 +700,12 @@ FORK FROM DEAD libupnp
 	* import all modifications below from libupnp in djmount 0.51
 	  into official libupnp
 	
-2006-01-17  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-17  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* threadutil/Makefile.am (libthreadutil_la_SOURCES): remove extraneous
 	  file

-2006-01-15  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-15  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* configure.ac: add checks for large-file support

@@ -687,53 +725,53 @@ FORK FROM DEAD libupnp
 	* ixml/src/node.c (ixmlNode_getNodeType): fix compilation warning
 	  on const return type

-2006-01-12  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-12  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* upnp/src/inc/readwrite.h : suppress unused C++ header file

-2006-01-11  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2006-01-11  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* upnp/inc/config.h, upnp/src/inc/upnpapi.h, 
 	  upnp/src/inc/httpreadwrite.h: remove internal configuration variable 
 	  MINIMUM_DELAY (no clear purpose)

-2005-12-05  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-12-05  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* upnp/inc/upnp.h: re-declare obsolete method UpnpSetContentLength,
 	  for binary compatibility with previous libupnp version.

 	* upnp/src/api/upnpapi.c: correct type of g_maxContentLength to size_t

-2005-11-01  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-11-01  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* autoconfiscate library : replace all makefiles by Makefile.am
 	  for automake support, + preliminary autoconf support
 	  (generated config.h not yet used in source files)

-2005-10-18  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-10-18  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* upnp/src/makefile: fix location of DEBUG STATIC libupnp library
 	
 	* upnp/sample/tvctrlpt/linux/Makefile, 
 	  upnp/sample/tvdevice/linux/Makefile: fix STATIC library support

-2005-10-16  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-10-16  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* threadutil/src/Makefile (clean): remove built library

-2005-08-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-08-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* ixml/src/ixml.h, ixml/src/ixml.c (ixmlRelaxParser) : new function

 	* ixml/src/ixmlparser.h, ixml/src/ixmlparser.c (Parser_setErrorChar) :
 	  new function

-2005-08-02  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-08-02  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* ixml/src/Makefile: correct bug for static library being incorrectly 
 	  stripped when building non-debug

-2005-06-09  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-06-09  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* ixml/src/element.c (ixmlElement_removeAttributeNode): 
 	  remove some compilation warning
@@ -744,7 +782,7 @@ FORK FROM DEAD libupnp
 	* upnp/inc/upnptools.h, upnp/src/api/upnptools.c : 
 	  add missing const's in public API

-2005-05-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-05-28  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* upnp/inc/config.h: suppress HTTP_READ_BYTES (unused)
 	  and replace by DEFAULT_SOAP_CONTENT_LENGTH (previously in upnpapi.h)
@@ -765,7 +803,7 @@ FORK FROM DEAD libupnp
 	* upnp/src/genlib/net/http/httpreadwrite.c : corrected an incorrect
 	  sprintf format
 	
-2005-05-27  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-05-27  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* upnp/makefile, upnp/src/makefile, 
 	  ixml/Makefile, ixml/src/Makefile, 
@@ -773,7 +811,7 @@ FORK FROM DEAD libupnp
 	  implement STATIC library support (from patch at 
 	  http://sourceforge.net/tracker/?group_id=7189&atid=307189 )

-2005-05-26  R<>mi Turboult  <r3mi(at)users.sourceforge.net>
+2005-05-26  R<>mi Turboult  <r3mi(at)users.sourceforge.net>

 	* upnp/src/api/upnpapi.c, upnp/src/soap/soap_device.c,
 	  upnp/src/soap/makefile : 
--- a/4
+++ b/4
@@ -10,6 +10,7 @@ exempt of errors.
 - Arno Willig
 - Bob Ciora
 - Chaos
+- Chris Pickel
 - Craig Nelson
 - David Maass
 - Emil Ljungdahl
@@ -20,6 +21,8 @@ exempt of errors.
 - Fabrice Fontaine
 - Fredrik Svensson
 - Glen Masgai
+- Hartmut Holzgraefe - hholzgra
+- Ingo Hofmann
 - Jiri Zouhar
 - John Dennis
 - Jonathan Casiot (no_dice)
@@ -34,6 +37,7 @@ exempt of errors.
 - Oskar Liljeblad
 - Michael (oxygenic)
 - Paul Vixie
+- Peter Hartley
 - Rene Hexel
 - Robert Gingher (robsbox)
 - Siva Chandran
--- a/configure.ac
+++ b/configure.ac
@@ -4,12 +4,12 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# (C) Copyright 2005-2007 R<>mi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005-2007 R<>mi Turboult <r3mi@users.sourceforge.net>
 #

 AC_PREREQ(2.60)

-AC_INIT([libupnp], [1.6.3], [mroberto@users.sourceforge.net])
+AC_INIT([libupnp], [1.6.4], [mroberto@users.sourceforge.net])
 dnl ############################################################################
 dnl # *Independently* of the above libupnp package version, the libtool version
 dnl # of the 3 libraries need to be updated whenever there is a change released:
@@ -107,9 +107,22 @@ dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:1:2])
 dnl #AC_SUBST([LT_VERSION_UPNP],       [3:2:0])
 dnl #
 dnl ############################################################################
+dnl # Release 1.6.4:
+dnl # "current:revision:age"
+dnl #
+dnl # - Code has changed in threadutil
+dnl #	revision: 1 -> 2
+dnl # - Code has changed in upnp
+dnl #	revision: 2 -> 3
+dnl #
+dnl #AC_SUBST([LT_VERSION_IXML],       [2:4:0])
+dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:2:2])
+dnl #AC_SUBST([LT_VERSION_UPNP],       [3:3:0])
+dnl #
+dnl ############################################################################
 AC_SUBST([LT_VERSION_IXML],       [2:4:0])
-AC_SUBST([LT_VERSION_THREADUTIL], [4:1:2])
-AC_SUBST([LT_VERSION_UPNP],       [3:2:0])
+AC_SUBST([LT_VERSION_THREADUTIL], [4:2:2])
+AC_SUBST([LT_VERSION_UPNP],       [3:3:0])
 dnl ############################################################################
 dnl # Repeating the algorithm to place it closer to the modificatin place:
 dnl # 	- library code modified:		revision++
@@ -120,9 +133,9 @@ dnl # *please update only once, before a formal release, not for each change*
 dnl ############################################################################


-AC_CONFIG_AUX_DIR(config.aux)
-AC_CONFIG_MACRO_DIR(m4)
-AC_CONFIG_SRCDIR(upnp/inc/upnp.h)
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_SRCDIR([upnp/inc/upnp.h])


 AM_INIT_AUTOMAKE([1.8 -Wall foreign subdir-objects dist-bzip2])
--- a/docs/dist/Makefile.am
+++ b/docs/dist/Makefile.am
@@ -39,7 +39,7 @@ EXTRA_DIST = \
    ./html/upnp/UPNP_E_SOCKET_ERROR-208.html \
    ./html/upnp/UPNP_E_CANCELED-210.html \
    ./html/upnp/UPNP_E_SUBSCRIBE_UNACCEPTED-301.html \
-    ./html/upnp/UPNP_E_UNSUBSCRIBE_UNACCAPTED-302.html \
+    ./html/upnp/UPNP_E_UNSUBSCRIBE_UNACCEPTED-302.html \
    ./html/upnp/UPNP_E_NOTIFY_UNACCEPTED-303.html \
    ./html/upnp/UPNP_E_INVALID_ARGUMENT-501.html \
    ./html/upnp/UPNP_E_FILE_NOT_FOUND-502.html \
@@ -295,7 +295,7 @@ if WITH_DOCUMENTATION
        ./html/upnp/UPNP_E_SOCKET_ERROR-208.html \
        ./html/upnp/UPNP_E_CANCELED-210.html \
        ./html/upnp/UPNP_E_SUBSCRIBE_UNACCEPTED-301.html \
-        ./html/upnp/UPNP_E_UNSUBSCRIBE_UNACCAPTED-302.html \
+        ./html/upnp/UPNP_E_UNSUBSCRIBE_UNACCEPTED-302.html \
        ./html/upnp/UPNP_E_NOTIFY_UNACCEPTED-303.html \
        ./html/upnp/UPNP_E_INVALID_ARGUMENT-501.html \
        ./html/upnp/UPNP_E_FILE_NOT_FOUND-502.html \
--- a/docs/dist/html/upnp/UPNP_E_UNSUBSCRIBE_UNACCEPTED-302.html
+++ b/docs/dist/html/upnp/UPNP_E_UNSUBSCRIBE_UNACCEPTED-302.html
--- a/libupnp.spec
+++ b/libupnp.spec
@@ -1,4 +1,4 @@
-Version: 1.6.2
+Version: 1.6.4
 Summary: Universal Plug and Play (UPnP) SDK
 Name: libupnp
 Release: 1%{?dist}
--- a/m4/rt_bool_arg_enable.m4
+++ b/m4/rt_bool_arg_enable.m4
@@ -41,7 +41,7 @@ AC_DEFUN([RT_BOOL_ARG_ENABLE],[
 		               )])
 	test "x$enable_[$1]" != [x]m4_if([$2],[yes],[no],[yes]) dnl
 		&& enable_[]Name=[$2]
-	AC_MSG_RESULT($enable_[]Name)dnl
+	AC_MSG_RESULT($enable_[]Name)
 	AM_CONDITIONAL([ENABLE_]NAME, test x"$enable_[]Name" = xyes)
 	dnl
 	m4_popdef([NAME])dnl
--- a/threadutil/Makefile.am
+++ b/threadutil/Makefile.am
@@ -2,7 +2,7 @@
 #
 # "Makefile.am" for "libupnp/threadutil"
 #
-# (C) Copyright 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
+# (C) Copyright 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
 #

 AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc
--- a/threadutil/src/LinkedList.c
+++ b/threadutil/src/LinkedList.c
@@ -31,7 +31,7 @@

 #include "LinkedList.h"
 #include <sys/param.h>
-#if (defined(BSD) && BSD >= 199306) || defined(__OSX__)
+#if (defined(BSD) && BSD >= 199306) || defined(__OSX__) || defined(__APPLE__)
 #include <stdlib.h>
 #else
 #include <malloc.h>
--- a/threadutil/src/ThreadPool.c
+++ b/threadutil/src/ThreadPool.c
@@ -229,7 +229,7 @@ static int SetPolicyType( PolicyType in )
 #ifdef __CYGWIN__
 	/* TODO not currently working... */
 	return 0;
-#elif defined(__OSX__)
+#elif defined(__OSX__) || defined(__APPLE__)
 	setpriority( PRIO_PROCESS, 0, 0 );
 	return 0;
 #elif defined(WIN32)
@@ -389,7 +389,7 @@ static void SetSeed()
 	gettimeofday(&t, NULL);
 #if defined(WIN32)
 	srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id().p );
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__)
 	srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id() );
 #elif defined(__linux__)
 	srand( ( unsigned int )t.tv_usec + ithread_get_current_thread_id() );
--- a/upnp/Makefile.am
+++ b/upnp/Makefile.am
@@ -1,7 +1,7 @@
 #
 # "Makefile.am" for "libupnp/upnp"
 #
-# Copyright (C) 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
+# Copyright (C) 2005 R<>mi Turboult <r3mi@users.sourceforge.net>
 #

 SUBDIRS = doc . sample
--- a/upnp/inc/upnp.h
+++ b/upnp/inc/upnp.h
@@ -413,7 +413,7 @@
 #define UPNP_E_SUBSCRIBE_UNACCEPTED   -301
 /*! @} */

-/** @name UPNP_E_UNSUBSCRIBE_UNACCAPTED [-302]
+/** @name UPNP_E_UNSUBSCRIBE_UNACCEPTED [-302]
 *  {\tt UPNP_E_UNSUBSCRIBE_UNACCEPTED} signifies that an unsubscribe
 *  request was rejected from the remote side.
 */
--- a/upnp/inc/upnpdebug.h
+++ b/upnp/inc/upnpdebug.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 *
 * Copyright (c) 2000-2003 Intel Corporation 
- * Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
+ * Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
 * All rights reserved. 
 *
 * Redistribution and use in source and binary forms, with or without 
--- a/upnp/src/genlib/net/http/webserver.c
+++ b/upnp/src/genlib/net/http/webserver.c
@@ -745,7 +745,7 @@ isFileInVirtualDir( IN char *filePath )
                return TRUE;
        } else {
            if( ( strncmp( pCurVirtualDir->dirName, filePath, webDirLen )
-                  == 0 ) && ( filePath[webDirLen] == '/' ) )
+                  == 0 ) && ( filePath[webDirLen] == '/' || filePath[webDirLen] == '\0' || filePath[webDirLen] == '?' ) )
                return TRUE;
        }

--- a/upnp/src/genlib/net/uri/uri.c
+++ b/upnp/src/genlib/net/uri/uri.c
@@ -555,7 +555,7 @@ parse_hostport( const char *in,
    int begin_port;
    int hostport_size = 0;
    int host_size = 0;
-#if !defined(WIN32) && !defined(__OSX__)
+#if !defined(WIN32) && !(defined(__OSX__) || defined(__APPLE__))
    char temp_hostbyname_buff[BUFFER_SIZE];
    struct hostent h_buf;
 #endif
@@ -642,7 +642,7 @@ parse_hostport( const char *in,
        if ( h == NULL ) {
                errCode = 1;
        }
-#elif defined(__OSX__)
+#elif defined(__OSX__) || defined(__APPLE__)
        h = gethostbyname(temp_host_name);
        if ( h == NULL ) {
                errCode = 1;
--- a/upnp/src/inc/webserver.h
+++ b/upnp/src/inc/webserver.h
@@ -114,7 +114,7 @@ int web_server_set_alias( IN const char* alias_name,
 *
 * Parameters:
 *	IN const char* root_dir ; String having the root directory for the
-*								document		 						
+*                                 document
 *
 * Description: Assign the path specfied by the IN const char* root_dir
 *	parameter to the global Document root directory. Also check for
@@ -126,18 +126,18 @@ int web_server_set_alias( IN const char* alias_name,
 int web_server_set_root_dir( IN const char* root_dir );

 /************************************************************************
-* Function: web_server_callback											*
-*																		*
-* Parameters:															*
-*	IN http_parser_t *parser,											*
-*	INOUT http_message_t* req,											*
-*	IN SOCKINFO *info													*
-*																		*
-* Description: main entry point into web server;						*
-*	handles HTTP GET and HEAD requests									*
-*																		*
-* Returns:																*
-*	void																*
+* Function: web_server_callback	
+*
+* Parameters:
+*	IN http_parser_t *parser,
+*	INOUT http_message_t* req,
+*	IN SOCKINFO *info
+*
+* Description: main entry point into web server;
+*	handles HTTP GET and HEAD requests
+*
+* Returns:
+*	void
 ************************************************************************/
 void web_server_callback( IN http_parser_t *parser, IN http_message_t* req, INOUT SOCKINFO *info );

@@ -148,3 +148,4 @@ void web_server_callback( IN http_parser_t *parser, IN http_message_t* req, INOU


 #endif // GENLIB_NET_HTTP_WEBSERVER_H
+
--- a/upnp/src/ssdp/ssdp_server.c
+++ b/upnp/src/ssdp/ssdp_server.c
@@ -870,6 +870,7 @@ get_ssdp_sockets( MiniServerSockArray * out )
        UpnpPrintf( UPNP_CRITICAL,
            SSDP, __FILE__, __LINE__,
            "Error in socket operation !!!\n" );
+
            return UPNP_E_OUTOF_SOCKET;
    }
    setsockopt( ssdpReqSock, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof( ttl ) );
@@ -884,6 +885,7 @@ get_ssdp_sockets( MiniServerSockArray * out )
            "Error in socket operation !!!\n" );
        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
+
        return UPNP_E_OUTOF_SOCKET;
    }

@@ -897,10 +899,11 @@ get_ssdp_sockets( MiniServerSockArray * out )
        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
        shutdown( ssdpSock, SD_BOTH );
        UpnpCloseSocket( ssdpSock );
+
        return UPNP_E_SOCKET_ERROR;
    }
    
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__)
    if( setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEPORT,
            ( char * )&onOff, sizeof( onOff ) ) != 0 ) {
        UpnpPrintf( UPNP_CRITICAL,
@@ -910,6 +913,7 @@ get_ssdp_sockets( MiniServerSockArray * out )
        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
        shutdown( ssdpSock, SD_BOTH );
        UpnpCloseSocket( ssdpSock );
+
        return UPNP_E_SOCKET_ERROR;
    }
 #endif /* __FreeBSD__ */
@@ -928,6 +932,7 @@ get_ssdp_sockets( MiniServerSockArray * out )
        UpnpCloseSocket( ssdpSock );
        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
+
        return UPNP_E_SOCKET_BIND;
    }

@@ -943,6 +948,7 @@ get_ssdp_sockets( MiniServerSockArray * out )
        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
        UpnpCloseSocket( ssdpSock );
        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
+
        return UPNP_E_SOCKET_ERROR;
    }

@@ -968,11 +974,13 @@ get_ssdp_sockets( MiniServerSockArray * out )
        CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
        UpnpCloseSocket( ssdpSock );
        CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
+
        return UPNP_E_NETWORK_ERROR;
    }

    CLIENTONLY( out->ssdpReqSock = ssdpReqSock; )
    out->ssdpSock = ssdpSock;
+
    return UPNP_E_SUCCESS;
 }

--- a/upnp/test/test_init.c
+++ b/upnp/test/test_init.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 ///////////////////////////////////////////////////////////////////////////
 //
-// Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
+// Copyright (c) 2006 R<>mi Turboult <r3mi@users.sourceforge.net>
 // All rights reserved. 
 //
 // Redistribution and use in source and binary forms, with or without