Changeset 3556

Timestamp:

Oct 25, 2007, 4:52:12 PM (15 years ago)

Author:

livings124

Message:

trunk: Ensure only a single "?" is used for appending arguments to the announce and scrape URL (fixes #411)

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• libtransmission/tracker.c (modified) (3 diffs)

trunk/NEWS

@@ -3 +3 @@
 0.91 (2007/xx/xx)
 - libtransmission (all platforms):
-   + Fix 0.90 socket connection leak.
-   + Fix 0.90 OpenBSD build error.
+   + Fix 0.90 socket connection leak
+   + Fix 0.90 OpenBSD build error
+   + Ensure only a single "?" is used for appending arguments to the announce and scrape URL
 - OS X:
-   + Add Dutch localization, Re-add Russian localization, fix Korean localization
+   + Fix a crash caused by custom sound files
+   + Add Dutch localization, re-add Russian localization, fix Korean localization
 - gtk:
-   + Fix 0.90 packaging errors.
+   + Fix 0.90 packaging errors
 
 0.90 (2007/10/23)

trunk/libtransmission/tracker.c

@@ -580 +580 @@
         struct evbuffer * buf = evbuffer_new( );
 
-        evbuffer_add_printf( buf, "%s?info_hash=%s", address->scrape, t->escaped );
+        evbuffer_add_printf( buf, "%s%sinfo_hash=%s",
+                             address->scrape,
+                             ( strchr(address->scrape, '?') == NULL ? "?" : "&" ),
+                             t->escaped );
         uri = tr_strdup( (char*) EVBUFFER_DATA( buf ) );
         evbuffer_free( buf );
@@ -620 +623 @@
     char * ret;
 
+    char * ann = getCurrentAddress(t)->announce;
+    
     evbuffer_add_printf( buf, "%s"
-                              "?info_hash=%s"
+                              "%sinfo_hash=%s"
                               "&peer_id=%s"
                               "&port=%d"
@@ -635 +640 @@
                               "%s%s"
                               "%s%s",
-        getCurrentAddress(t)->announce,
+        ann,
+        ( strchr(ann, '?') == NULL ? "?" : "&" ),
         t->escaped,
         t->peer_id,