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

ChangeLog

@@ -146,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.
 
@@ -570,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 
@@ -588,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
@@ -612,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
 
@@ -638,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
@@ -650,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
@@ -659,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
 
@@ -667,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"
@@ -688,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"
@@ -700,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
 
@@ -725,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
@@ -782,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)
@@ -803,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, 
@@ -811,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 : 

configure.ac

@@ -4,7 +4,7 @@
 #
 # 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)

m4/rt_bool_arg_enable.m4

@@ -12,7 +12,7 @@ dnl $2 = default value, shall be m4 constant, either [yes] or [no]
 dnl $3 = help string (default value is appended) e.g. [compile debugging code]
 dnl
 dnl @version $Id: rt_bool_arg_enable.m4,v 1.2 2006/02/18 14:35:09 r3mi Exp $
-dnl @author R<>mi Turboult <r3mi@users.sourceforge.net>
+dnl @author R<>mi Turboult <r3mi@users.sourceforge.net>
 dnl @license GPLWithACException
 dnl
 dnl This file is free software, distributed under the terms of the GNU

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

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

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 

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