~ubuntu-branches/ubuntu/oneiric/libupnp4/oneiric-updates

« back to all changes in this revision

Viewing changes to debian/patches/08-renewals-sid.patch

  • Committer: Bazaar Package Importer
  • Author(s): Nick Leverton
  • Date: 2010-05-14 15:34:11 UTC
  • mfrom: (2.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20100514153411-9i238idmkyg7j00y
Tags: 1.8.0~svn20100507-1
* New pull from upstream subversion
* Fixes to BSD build issues (Closes: #573321, FTBFS on Gnu/kFreeBSD)
* More debug tidying (07-neaten-debug.patch):
  - send UPNP_CRITICAL msgs to the info log as well as to the error log.
  - don't print HTTP headers to stdout as they're already in logfile.
* Always compile in logging code but don't log unless requested
  (12-debian-always-debug.patch) to help porting other apps.
* Remove patches 03, 04, 06, 08 and 10, now in upstream (note naming
  difference in upstream's string object accessors).
* Add $PTHREAD_CFLAGS to libupnp.pc as assumed by {acx,ax}_pthread.m4
  (patch 16, Closes: #581608).

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Description: Fix auto-renewals to send the correct timeout and SID.
2
 
Author: Nick Leverton <nick@leverton.org>
3
 
Bug: https://sourceforge.net/support/tracker.php?aid=2962606
4
 
 
5
 
Index: libupnp4-1.8.0~svn20090313/upnp/src/gena/gena_ctrlpt.c
6
 
===================================================================
7
 
--- libupnp4-1.8.0~svn20090313.orig/upnp/src/gena/gena_ctrlpt.c 2010-03-03 07:29:23.000000000 +0000
8
 
+++ libupnp4-1.8.0~svn20090313/upnp/src/gena/gena_ctrlpt.c      2010-03-03 08:11:34.000000000 +0000
9
 
@@ -81,6 +81,7 @@
10
 
                eventType = UPNP_EVENT_SUBSCRIPTION_EXPIRED;
11
 
        } else {
12
 
                UpnpPrintf(UPNP_INFO, GENA, __FILE__, __LINE__, "GENA AUTO RENEW\n");
13
 
+               timeout = UpnpEventSubscribe_get_TimeOut(sub_struct);
14
 
                errCode = genaRenewSubscription(
15
 
                        event->handle,
16
 
                        UpnpEventSubscribe_get_SID(sub_struct),
17
 
@@ -303,7 +304,7 @@
18
 
                        &request, 1, 1,
19
 
                        "q" "ssc" "sscc",
20
 
                        HTTPMETHOD_SUBSCRIBE, &dest_url,
21
 
-                       "SID: ", renewal_sid,
22
 
+                       "SID: ", UpnpString_get_String(renewal_sid),
23
 
                        "TIMEOUT: Second-", timeout_str );
24
 
        } else {
25
 
                // subscribe