summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornpmccallum <npmccallum@c587cffe-e639-0410-9787-d7902ae8ed56>2010-09-26 22:55:30 +0000
committernpmccallum <npmccallum@c587cffe-e639-0410-9787-d7902ae8ed56>2010-09-26 22:55:30 +0000
commit09aa9b0dd37d2d4cada49fd7eb7dd39a1152803c (patch)
treecc928d2dea91b7cc0afa6b802679c941bf9a5fed
parent3e116216707b8b86f14e7f1774ddefc77cc5dd93 (diff)
downloadlibproxy-09aa9b0dd37d2d4cada49fd7eb7dd39a1152803c.tar.gz
two more win32 fixes
git-svn-id: http://libproxy.googlecode.com/svn/trunk@763 c587cffe-e639-0410-9787-d7902ae8ed56
-rw-r--r--libproxy/proxy.cpp2
-rw-r--r--libproxy/url.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libproxy/proxy.cpp b/libproxy/proxy.cpp
index 54f7f17..8e62264 100644
--- a/libproxy/proxy.cpp
+++ b/libproxy/proxy.cpp
@@ -261,7 +261,7 @@ void proxy_factory::_get_proxies(url *realurl, vector<string> &response) {
/* Check our ignore patterns */
ignores = this->mm.get_extensions<ignore_extension>();
- invign = confign[0] == '-';
+ invign = confign.size() > 0 && confign[0] == '-';
if (invign) confign = confign.substr(1);
for (size_t i=0 ; i < confign.size() && !ignored;) {
size_t next = confign.find(',', i);
diff --git a/libproxy/url.cpp b/libproxy/url.cpp
index e454b61..b6f3fe4 100644
--- a/libproxy/url.cpp
+++ b/libproxy/url.cpp
@@ -173,7 +173,7 @@ url::url(const string &url) throw(parse_error)
* / path-empty
*/
- if (hier_part.size() >= 2 && hier_part[0] == '/' && hier_part[1] == '/') {
+ if (hier_part.size() > 2 && hier_part[0] == '/' && hier_part[1] == '/') {
size_t authority_start, authority_end;
size_t userinfo_start, userinfo_end;
size_t host_start, host_end;