← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/libtorrent-rasterbar/oneiric

« back to all changes in this revision

Viewing changes to src/escape_string.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andrew Starr-Bochicchio
  • Date: 2010-08-10 12:57:25 UTC
  • mfrom: (1.3.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20100810125725-i2o9iblow20w7qde
Tags: 0.15.1-0ubuntu1
https://launchpad.net/bugs/615950
* New upstream point release.

* New package libtorrent-rasterbar6 (bump up library soname). (LP: #615950)
 - Must Conflict/Replace libtorrent-rasterbar5 (= 0.15.0-0ubuntu1) or it will
   fail to install trying to overwrite '/usr/lib/libtorrent-rasterbar.so.6.0.0'

* Sync on git.debian.org/collab-maint/libtorrent-rasterbar.git:
 - debian/{control,rules}: Bump debhelper build-dep to (>= 7.4.10)
   and pass to dh in order to enable parallel build support.
 - debian/watch: Use googlecode.debian.net redirector.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/escape_string.cpp
188
188
                // % should be ok
189
189
                "%+"
190
190
                // reserved
191
 
                ";?:@=&/"
 
191
                ";?:@=&,$/"
192
192
                // unreserved (special characters) ' excluded,
193
193
                // since some buggy trackers fail with those
194
 
                "$-_.!~*(),"
 
194
                "-_!.~*()"
195
195
                // unreserved (alphanumerics)
196
196
                "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
197
197
                "0123456789";
226
226
        
227
227
        std::string escape_string(const char* str, int len)
228
228
        {
229
 
                return escape_string_impl(str, len, 9);
 
229
                return escape_string_impl(str, len, 11);
230
230
        }
231
231
 
232
232
        std::string escape_path(const char* str, int len)
233
233
        {
234
 
                return escape_string_impl(str, len, 8);
 
234
                return escape_string_impl(str, len, 10);
235
235
        }
236
236
 
237
237
        bool need_encoding(char const* str, int len)
442
442
        }
443
443
 
444
444
        boost::optional<std::string> url_has_argument(
445
 
                std::string const& url, std::string argument, int* out_pos)
 
445
                std::string const& url, std::string argument, size_t* out_pos)
446
446
        {
447
447
                size_t i = url.find('?');
448
448
                if (i == std::string::npos) return boost::optional<std::string>();