From: Micah Cowan <micah@cowan.name>
Date: Mon, 1 Dec 2008 15:05:29 +0000 (-0800)
Subject: Automated merge.
X-Git-Tag: v1.13~338^2~2
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=1b4ed7dcb7bdad277a9ee2c5a42b6e70854db802

Automated merge.
---

1b4ed7dcb7bdad277a9ee2c5a42b6e70854db802
diff --cc src/url.h
index 2fa8d51c,badd9252..38eafca4
--- a/src/url.h
+++ b/src/url.h
@@@ -83,8 -83,9 +83,9 @@@ struct ur
  /* Function declarations */
  
  char *url_escape (const char *);
+ char *url_escape_unsafe_and_reserved (const char *);
  
 -struct url *url_parse (const char *, int *, struct iri *iri);
 +struct url *url_parse (const char *, int *, struct iri *iri, bool percent_encode);
  char *url_error (const char *, int);
  char *url_full_path (const struct url *);
  void url_set_dir (struct url *, const char *);