generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge of trunk into branch 1.6.x.

Browse Source 
git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.6.x@312 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
Marcelo Roberto Jimenez 2008-02-03 01:36:23 +00:00
parent 1eeaf99b83
commit 078f3f8faf
9 changed files with 61 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
ChangeLog
View File

@ -1,3 +1,12 @@
*******************************************************************************
Version 1.6.5
*******************************************************************************
2008-02-02 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
* Peter Hartley's fix for wrong sized variable beeing passed to
http_MakeMessage() on 64 bit architectures.
******************************************************************************* *******************************************************************************
Version 1.6.4 Version 1.6.4
******************************************************************************* *******************************************************************************
@ -146,7 +155,7 @@ Version 1.6.1
handle accordingly. handle accordingly.
2007-08-05 Marcelo Jimenez <mroberto(at)users.sourceforge.net> 2007-08-05 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
* Merge of Mac OS X patch from St<EFBFBD>phane Corth<74>sy (davelopper), * Merge of Mac OS X patch from Stéphane Corthésy (davelopper),
SF Bug Tracker [ 1686420 ] Modifications for MacOSX. SF Bug Tracker [ 1686420 ] Modifications for MacOSX.
Some of the proposed changes were already done by Rene Hexel's patch. Some of the proposed changes were already done by Rene Hexel's patch.
@ -570,14 +579,14 @@ Version 1.4.0
FORK FROM DEAD libupnp FORK FROM DEAD libupnp
******************************************************************************* *******************************************************************************
2006-04-29 R<EFBFBD>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 * THANKS: new file with list of contributors
* upnp/src/gena/gena_device.c (respond_ok): add 'Content-Length: 0' * upnp/src/gena/gena_device.c (respond_ok): add 'Content-Length: 0'
in subscription response. Patch by Chaos (Bug # 1455367). in subscription response. Patch by Chaos (Bug # 1455367).
2006-04-08 R<EFBFBD>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 * upnp/doc/UPnP_Programming_Guide.pdf: replace this document with
the one in libupnp-doc-1.2.1 because current CVS version the one in libupnp-doc-1.2.1 because current CVS version
@ -588,20 +597,20 @@ FORK FROM DEAD libupnp
* changes applied to several files to work under Sparc Solaris, temporarily * changes applied to several files to work under Sparc Solaris, temporarily
requiring a define SPARC_SOLARIS requiring a define SPARC_SOLARIS
2006-04-03 R<EFBFBD>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 * upnp/Makefile.am: install upnp samples in $(docdir)/examples
2006-03-28 R<EFBFBD>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 * configure.ac: add --with-docdir option to choose where documentation
is installed (or -without-docdir to not install the documentation) is installed (or -without-docdir to not install the documentation)
2006-03-27 R<EFBFBD>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 * ixml/test: add simple test suite for xml parser
2006-03-26 R<EFBFBD>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 * ixml/src/ixmlparser.c (Parser_processCDSect): fix bug which prevents
CDATA sections which contain a 0 (zero) to be parsed (instead the CDATA sections which contain a 0 (zero) to be parsed (instead the
@ -612,18 +621,18 @@ FORK FROM DEAD libupnp
option, and move samples compilation from check_PROGRAMS to option, and move samples compilation from check_PROGRAMS to
noinst_PROGRAMS noinst_PROGRAMS
2006-03-25 R<EFBFBD>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): * upnp/src/genlib/miniserver/miniserver.c (get_miniserver_sockets):
fix bug if new socket created has fd 0 (can only occur when stdin fix bug if new socket created has fd 0 (can only occur when stdin
has been closed). Patch by Oskar Liljeblad 2004-07-02 : has been closed). Patch by Oskar Liljeblad 2004-07-02 :
http://sourceforge.net/mailarchive/message.php?msg_id=8870528 http://sourceforge.net/mailarchive/message.php?msg_id=8870528
2006-03-21 R<EFBFBD>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 * upnp/test/test_init.c: add some version checks and exit if failure
2006-03-05 R<EFBFBD>mi Turboult <r3mi(at)users.sourceforge.net> 2006-03-05 Rémi Turboult <r3mi(at)users.sourceforge.net>
* libupnp version 1.3.1 * libupnp version 1.3.1
@ -638,11 +647,11 @@ FORK FROM DEAD libupnp
dependencies between upnp and ixml / threadutil, so that programs dependencies between upnp and ixml / threadutil, so that programs
linking against upnp only still work. linking against upnp only still work.
2006-03-04 R<EFBFBD>mi Turboult <r3mi(at)users.sourceforge.net> 2006-03-04 Rémi Turboult <r3mi(at)users.sourceforge.net>
* libupnp version 1.3.0 * libupnp version 1.3.0
2006-03-03 R<EFBFBD>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 * upnp/src/genlib/net/http/httpreadwrite.c (get_sdk_info): use
package version string from configure to set sdk info package version string from configure to set sdk info
@ -650,7 +659,7 @@ FORK FROM DEAD libupnp
* upnp/Makefile.am: add sample/tvdevice/web/ files in EXTRA_DIST * upnp/Makefile.am: add sample/tvdevice/web/ files in EXTRA_DIST
+ do not distribute generated upnpconfig.h file. + do not distribute generated upnpconfig.h file.
2006-02-28 R<EFBFBD>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/src/inc/config.h, configure.ac: use only new defines
UPNP_HAVE_xx instead of INCLUDE_yyy_APIS and INTERNAL_WEB_SERVER UPNP_HAVE_xx instead of INCLUDE_yyy_APIS and INTERNAL_WEB_SERVER
@ -659,7 +668,7 @@ FORK FROM DEAD libupnp
the librarie LDFLAGS in order to export only the symbols defined the librarie LDFLAGS in order to export only the symbols defined
in the API in the API
2006-02-27 R<EFBFBD>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 * configure.ac: add libtool versions for the 3 libraries
@ -667,7 +676,7 @@ FORK FROM DEAD libupnp
* threadutil/src/ThreadPool.c (SetSeed): add missing 'static' * threadutil/src/ThreadPool.c (SetSeed): add missing 'static'
2006-02-26 R<EFBFBD>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 * threadutil/inc/iasnprintf.h: add gcc __printf__ format attribute
to "iasnprintf" to "iasnprintf"
@ -688,11 +697,11 @@ FORK FROM DEAD libupnp
the configuration of the installed libraries (generates installed the configuration of the installed libraries (generates installed
file <upnp/upnpconfig.h>) file <upnp/upnpconfig.h>)
2006-02-22 R<EFBFBD>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 * upnp/ : add missing include of config.h in some .c files
2006-02-21 R<EFBFBD>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 * upnp/inc/upnp.h: move some definitions which should not be
exported into "upnp/src/inc/util.h" exported into "upnp/src/inc/util.h"
@ -700,12 +709,12 @@ FORK FROM DEAD libupnp
* import all modifications below from libupnp in djmount 0.51 * import all modifications below from libupnp in djmount 0.51
into official libupnp into official libupnp
2006-01-17 R<EFBFBD>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 * threadutil/Makefile.am (libthreadutil_la_SOURCES): remove extraneous
file file
2006-01-15 R<EFBFBD>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 * configure.ac: add checks for large-file support
@ -725,53 +734,53 @@ FORK FROM DEAD libupnp
* ixml/src/node.c (ixmlNode_getNodeType): fix compilation warning * ixml/src/node.c (ixmlNode_getNodeType): fix compilation warning
on const return type on const return type
2006-01-12 R<EFBFBD>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 * upnp/src/inc/readwrite.h : suppress unused C++ header file
2006-01-11 R<EFBFBD>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/inc/config.h, upnp/src/inc/upnpapi.h,
upnp/src/inc/httpreadwrite.h: remove internal configuration variable upnp/src/inc/httpreadwrite.h: remove internal configuration variable
MINIMUM_DELAY (no clear purpose) MINIMUM_DELAY (no clear purpose)
2005-12-05 R<EFBFBD>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, * upnp/inc/upnp.h: re-declare obsolete method UpnpSetContentLength,
for binary compatibility with previous libupnp version. for binary compatibility with previous libupnp version.
* upnp/src/api/upnpapi.c: correct type of g_maxContentLength to size_t * upnp/src/api/upnpapi.c: correct type of g_maxContentLength to size_t
2005-11-01 R<EFBFBD>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 * autoconfiscate library : replace all makefiles by Makefile.am
for automake support, + preliminary autoconf support for automake support, + preliminary autoconf support
(generated config.h not yet used in source files) (generated config.h not yet used in source files)
2005-10-18 R<EFBFBD>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/src/makefile: fix location of DEBUG STATIC libupnp library
* upnp/sample/tvctrlpt/linux/Makefile, * upnp/sample/tvctrlpt/linux/Makefile,
upnp/sample/tvdevice/linux/Makefile: fix STATIC library support upnp/sample/tvdevice/linux/Makefile: fix STATIC library support
2005-10-16 R<EFBFBD>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 * threadutil/src/Makefile (clean): remove built library
2005-08-28 R<EFBFBD>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/ixml.h, ixml/src/ixml.c (ixmlRelaxParser) : new function
* ixml/src/ixmlparser.h, ixml/src/ixmlparser.c (Parser_setErrorChar) : * ixml/src/ixmlparser.h, ixml/src/ixmlparser.c (Parser_setErrorChar) :
new function new function
2005-08-02 R<EFBFBD>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 * ixml/src/Makefile: correct bug for static library being incorrectly
stripped when building non-debug stripped when building non-debug
2005-06-09 R<EFBFBD>mi Turboult <r3mi(at)users.sourceforge.net> 2005-06-09 Rémi Turboult <r3mi(at)users.sourceforge.net>
* ixml/src/element.c (ixmlElement_removeAttributeNode): * ixml/src/element.c (ixmlElement_removeAttributeNode):
remove some compilation warning remove some compilation warning
@ -782,7 +791,7 @@ FORK FROM DEAD libupnp
* upnp/inc/upnptools.h, upnp/src/api/upnptools.c : * upnp/inc/upnptools.h, upnp/src/api/upnptools.c :
add missing const's in public API add missing const's in public API
2005-05-28 R<EFBFBD>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) * upnp/inc/config.h: suppress HTTP_READ_BYTES (unused)
and replace by DEFAULT_SOAP_CONTENT_LENGTH (previously in upnpapi.h) and replace by DEFAULT_SOAP_CONTENT_LENGTH (previously in upnpapi.h)
@ -803,7 +812,7 @@ FORK FROM DEAD libupnp
* upnp/src/genlib/net/http/httpreadwrite.c : corrected an incorrect * upnp/src/genlib/net/http/httpreadwrite.c : corrected an incorrect
sprintf format sprintf format
2005-05-27 R<EFBFBD>mi Turboult <r3mi(at)users.sourceforge.net> 2005-05-27 Rémi Turboult <r3mi(at)users.sourceforge.net>
* upnp/makefile, upnp/src/makefile, * upnp/makefile, upnp/src/makefile,
ixml/Makefile, ixml/src/Makefile, ixml/Makefile, ixml/src/Makefile,
@ -811,7 +820,7 @@ FORK FROM DEAD libupnp
implement STATIC library support (from patch at implement STATIC library support (from patch at
http://sourceforge.net/tracker/?group_id=7189&atid=307189 ) http://sourceforge.net/tracker/?group_id=7189&atid=307189 )
2005-05-26 R<EFBFBD>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/api/upnpapi.c, upnp/src/soap/soap_device.c,
upnp/src/soap/makefile : upnp/src/soap/makefile :

17
configure.ac
View File

@ -4,12 +4,12 @@
# #
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
# #
# (C) Copyright 2005-2007 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net> # (C) Copyright 2005-2007 Rémi Turboult <r3mi@users.sourceforge.net>
# #
AC_PREREQ(2.60) AC_PREREQ(2.60)
AC_INIT([libupnp], [1.6.4], [mroberto@users.sourceforge.net]) AC_INIT([libupnp], [1.6.5], [mroberto@users.sourceforge.net])
dnl ############################################################################ dnl ############################################################################
dnl # *Independently* of the above libupnp package version, the libtool version 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: dnl # of the 3 libraries need to be updated whenever there is a change released:
@ -120,9 +120,20 @@ dnl #AC_SUBST([LT_VERSION_THREADUTIL], [4:2:2])
dnl #AC_SUBST([LT_VERSION_UPNP], [3:3:0]) dnl #AC_SUBST([LT_VERSION_UPNP], [3:3:0])
dnl # dnl #
dnl ############################################################################ dnl ############################################################################
dnl # Release 1.6.5:
dnl # "current:revision:age"
dnl #
dnl # - Code has changed in upnp
dnl # revision: 3 -> 4
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:4:0])
dnl #
dnl ############################################################################
AC_SUBST([LT_VERSION_IXML], [2:4:0]) AC_SUBST([LT_VERSION_IXML], [2:4:0])
AC_SUBST([LT_VERSION_THREADUTIL], [4:2:2]) AC_SUBST([LT_VERSION_THREADUTIL], [4:2:2])
AC_SUBST([LT_VERSION_UPNP], [3:3:0]) AC_SUBST([LT_VERSION_UPNP], [3:4:0])
dnl ############################################################################ dnl ############################################################################
dnl # Repeating the algorithm to place it closer to the modificatin place: dnl # Repeating the algorithm to place it closer to the modificatin place:
dnl # - library code modified: revision++ dnl # - library code modified: revision++

2
libupnp.spec
View File

@ -1,4 +1,4 @@
Version: 1.6.4 Version: 1.6.5
Summary: Universal Plug and Play (UPnP) SDK Summary: Universal Plug and Play (UPnP) SDK
Name: libupnp Name: libupnp
Release: 1%{?dist} Release: 1%{?dist}

2
m4/rt_bool_arg_enable.m4
View File

@ -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 $3 = help string (default value is appended) e.g. [compile debugging code]
dnl dnl
dnl @version $Id: rt_bool_arg_enable.m4,v 1.2 2006/02/18 14:35:09 r3mi Exp $ dnl @version $Id: rt_bool_arg_enable.m4,v 1.2 2006/02/18 14:35:09 r3mi Exp $
dnl @author R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net> dnl @author Rémi Turboult <r3mi@users.sourceforge.net>
dnl @license GPLWithACException dnl @license GPLWithACException
dnl dnl
dnl This file is free software, distributed under the terms of the GNU dnl This file is free software, distributed under the terms of the GNU

2
threadutil/Makefile.am
View File

@ -2,7 +2,7 @@
# #
# "Makefile.am" for "libupnp/threadutil" # "Makefile.am" for "libupnp/threadutil"
# #
# (C) Copyright 2005 R<EFBFBD>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 AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc

2
upnp/Makefile.am
View File

@ -1,7 +1,7 @@
# #
# "Makefile.am" for "libupnp/upnp" # "Makefile.am" for "libupnp/upnp"
# #
# Copyright (C) 2005 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net> # Copyright (C) 2005 Rémi Turboult <r3mi@users.sourceforge.net>
# #
SUBDIRS = doc . sample SUBDIRS = doc . sample

2
upnp/inc/upnpdebug.h
View File

@ -1,7 +1,7 @@
/******************************************************************************* /*******************************************************************************
* *
* Copyright (c) 2000-2003 Intel Corporation * Copyright (c) 2000-2003 Intel Corporation
* Copyright (c) 2006 R<EFBFBD>mi Turboult <r3mi@users.sourceforge.net> * Copyright (c) 2006 Rémi Turboult <r3mi@users.sourceforge.net>
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without

2
upnp/src/ssdp/ssdp_device.c
View File

@ -335,7 +335,7 @@ CreateServicePacket( IN int msg_type,
&buf, 1, 1, &buf, 1, 1,
"Q" "sssdc" "sdc" "ssc" "ssc" "ssc" "S" "Xc" "sscc", "Q" "sssdc" "sdc" "ssc" "ssc" "ssc" "S" "Xc" "sscc",
HTTPMETHOD_NOTIFY, "*", HTTPMETHOD_NOTIFY, "*",
1, "HOST: ", SSDP_IP, ":", SSDP_PORT, (size_t)1, "HOST: ", SSDP_IP, ":", SSDP_PORT,
"CACHE-CONTROL: max-age=", duration, "CACHE-CONTROL: max-age=", duration,
"LOCATION: ", location, "LOCATION: ", location,
"NT: ", nt, "NT: ", nt,

2
upnp/test/test_init.c
View File

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