From 907da069c450ca20442839d9e95e3661a5c06b61 Mon Sep 17 00:00:00 2001

From: Daniel Stenberg <daniel@haxx.se>

Date: Sun, 5 Aug 2018 11:51:07 +0200

Subject: [PATCH 01/14] URL-API

See header file and man pages for API. All documented API details work

and are tested in the 1560 test case.

Closes #2842

Upstream-commit: fb30ac5a2d63773c529c19259754e2b306ac2e2e

Signed-off-by: Kamil Dudka <kdudka@redhat.com>

---

 docs/libcurl/Makefile.inc        |    1 +

 docs/libcurl/curl_url.3          |   61 ++

 docs/libcurl/curl_url_cleanup.3  |   44 +

 docs/libcurl/curl_url_dup.3      |   52 ++

 docs/libcurl/curl_url_get.3      |  110 +++

 docs/libcurl/curl_url_set.3      |  120 +++

 docs/libcurl/symbols-in-versions |   30 +

 include/curl/Makefile.am         |    4 +-

 include/curl/curl.h              |    1 +

 include/curl/urlapi.h            |  121 +++

 lib/Makefile.inc                 |    5 +-

 lib/escape.c                     |   20 +-

 lib/escape.h                     |    3 +-

 lib/imap.c                       |    3 +-

 lib/transfer.c                   |  314 +------

 lib/url.c                        |   44 +-

 lib/url.h                        |    2 +

 lib/{escape.h => urlapi-int.h}   |   22 +-

 lib/urlapi.c                     | 1315 ++++++++++++++++++++++++++++++

 tests/data/Makefile.inc          |    2 +

 tests/data/test1560              |   28 +

 tests/libtest/Makefile.am        |    5 +

 tests/libtest/Makefile.inc       |    4 +

 tests/libtest/lib1560.c          |  760 +++++++++++++++++

 24 files changed, 2716 insertions(+), 355 deletions(-)

 create mode 100644 docs/libcurl/curl_url.3

 create mode 100644 docs/libcurl/curl_url_cleanup.3

 create mode 100644 docs/libcurl/curl_url_dup.3

 create mode 100644 docs/libcurl/curl_url_get.3

 create mode 100644 docs/libcurl/curl_url_set.3

 create mode 100644 include/curl/urlapi.h

 copy lib/{escape.h => urlapi-int.h} (66%)

 create mode 100644 lib/urlapi.c

 create mode 100644 tests/data/test1560

 create mode 100644 tests/libtest/lib1560.c

diff --git a/docs/libcurl/Makefile.inc b/docs/libcurl/Makefile.inc

index eea48c4..955492c 100644

--- a/docs/libcurl/Makefile.inc

+++ b/docs/libcurl/Makefile.inc

@@ -22,4 +22,5 @@ man_MANS = curl_easy_cleanup.3 curl_easy_getinfo.3 curl_easy_init.3      \

   curl_mime_data.3 curl_mime_data_cb.3 curl_mime_filedata.3              \

   curl_mime_filename.3 curl_mime_subparts.3                              \

   curl_mime_type.3 curl_mime_headers.3 curl_mime_encoder.3 libcurl-env.3 \

+  curl_url.3 curl_url_cleanup.3 curl_url_dup.3 curl_url_get.3 curl_url_set.3 \

   libcurl-security.3

diff --git a/docs/libcurl/curl_url.3 b/docs/libcurl/curl_url.3

new file mode 100644

index 0000000..0a56264

--- /dev/null

+++ b/docs/libcurl/curl_url.3

@@ -0,0 +1,61 @@

+.\" **************************************************************************

+.\" *                                  _   _ ____  _

+.\" *  Project                     ___| | | |  _ \| |

+.\" *                             / __| | | | |_) | |

+.\" *                            | (__| |_| |  _ <| |___

+.\" *                             \___|\___/|_| \_\_____|

+.\" *

+.\" * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

+.\" *

+.\" * This software is licensed as described in the file COPYING, which

+.\" * you should have received as part of this distribution. The terms

+.\" * are also available at https://curl.haxx.se/docs/copyright.html.

+.\" *

+.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell

+.\" * copies of the Software, and permit persons to whom the Software is

+.\" * furnished to do so, under the terms of the COPYING file.

+.\" *

+.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

+.\" * KIND, either express or implied.

+.\" *

+.\" **************************************************************************

+.TH curl_url 3 "6 Aug 2018" "libcurl" "libcurl Manual"

+.SH NAME

+curl_url - returns a new CURLU handle

+.SH SYNOPSIS

+.B #include <curl/curl.h>

+

+CURLU *curl_url();

+.SH EXPERIMENTAL

+The URL API is considered \fBEXPERIMENTAL\fP until further notice. Please test

+it, report bugs and help us perfect it. Once proven to be reliable, the

+experimental label will be removed.

+

+While this API is marked experimental, we reserve the right to modify the API

+slightly if we deem it necessary and it makes it notably better or easier to

+use.

+.SH DESCRIPTION

+This function will allocates and returns a pointer to a fresh CURLU handle, to

+be used for further use of the URL API.

+.SH RETURN VALUE

+Returns a \fBCURLU *\fP if successful, or NULL if out of memory.

+.SH EXAMPLE

+.nf

+  CURLUcode rc;

+  CURLU *url = curl_url();

+  rc = curl_url_set(url, CURLUPART_URL, "https://example.com", 0);

+  if(!rc) {

+    char *scheme;

+    rc = curl_url_get(url, CURLUPART_SCHEME, &scheme, 0);

+    if(!rc) {

+      printf("the scheme is %s\n", scheme);

+      curl_free(scheme);

+    }

+    curl_url_cleanup(url);

+  }

+.fi

+.SH AVAILABILITY

+Added in curl 7.63.0

+.SH "SEE ALSO"

+.BR curl_url_cleanup "(3), " curl_url_get "(3), " curl_url_set "(3), "

+.BR curl_url_dup "(3), "

diff --git a/docs/libcurl/curl_url_cleanup.3 b/docs/libcurl/curl_url_cleanup.3

new file mode 100644

index 0000000..a8158b7

--- /dev/null

+++ b/docs/libcurl/curl_url_cleanup.3

@@ -0,0 +1,44 @@

+.\" **************************************************************************

+.\" *                                  _   _ ____  _

+.\" *  Project                     ___| | | |  _ \| |

+.\" *                             / __| | | | |_) | |

+.\" *                            | (__| |_| |  _ <| |___

+.\" *                             \___|\___/|_| \_\_____|

+.\" *

+.\" * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

+.\" *

+.\" * This software is licensed as described in the file COPYING, which

+.\" * you should have received as part of this distribution. The terms

+.\" * are also available at https://curl.haxx.se/docs/copyright.html.

+.\" *

+.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell

+.\" * copies of the Software, and permit persons to whom the Software is

+.\" * furnished to do so, under the terms of the COPYING file.

+.\" *

+.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

+.\" * KIND, either express or implied.

+.\" *

+.\" **************************************************************************

+.TH curl_url_cleanup 3 "6 Aug 2018" "libcurl" "libcurl Manual"

+.SH NAME

+curl_url_cleanup - free a CURLU handle

+.SH SYNOPSIS

+.B #include <curl/curl.h>

+

+void curl_url_cleanup(CURLU *handle);

+.fi

+.SH DESCRIPTION

+Frees all the resources associated with the given CURLU handle!

+.SH RETURN VALUE

+none

+.SH EXAMPLE

+.nf

+  CURLU *url = curl_url();

+  curl_url_set(url, CURLUPART_URL, "https://example.com", 0);

+  curl_url_cleanup(url);

+.fi

+.SH AVAILABILITY

+Added in curl 7.63.0

+.SH "SEE ALSO"

+.BR curl_url_dup "(3), " curl_url "(3), " curl_url_set "(3), "

+.BR curl_url_get "(3), "

diff --git a/docs/libcurl/curl_url_dup.3 b/docs/libcurl/curl_url_dup.3

new file mode 100644

index 0000000..4815dbd

--- /dev/null

+++ b/docs/libcurl/curl_url_dup.3

@@ -0,0 +1,52 @@

+.\" **************************************************************************

+.\" *                                  _   _ ____  _

+.\" *  Project                     ___| | | |  _ \| |

+.\" *                             / __| | | | |_) | |

+.\" *                            | (__| |_| |  _ <| |___

+.\" *                             \___|\___/|_| \_\_____|

+.\" *

+.\" * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

+.\" *

+.\" * This software is licensed as described in the file COPYING, which

+.\" * you should have received as part of this distribution. The terms

+.\" * are also available at https://curl.haxx.se/docs/copyright.html.

+.\" *

+.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell

+.\" * copies of the Software, and permit persons to whom the Software is

+.\" * furnished to do so, under the terms of the COPYING file.

+.\" *

+.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

+.\" * KIND, either express or implied.

+.\" *

+.\" **************************************************************************

+.TH curl_url_dup 3 "6 Aug 2018" "libcurl" "libcurl Manual"

+.SH NAME

+curl_url_dup - duplicate a CURLU handle

+.SH SYNOPSIS

+.B #include <curl/curl.h>

+

+CURLU *curl_url_dup(CURLU *inhandle);

+.fi

+.SH DESCRIPTION

+Duplicates a given CURLU \fIinhandle\fP and all its contents and returns a

+pointer to a new CURLU handle. The new handle also needs to be freed with

+\fIcurl_url_cleanup(3)\fP.

+.SH RETURN VALUE

+Returns a new handle or NULL if out of memory.

+.SH EXAMPLE

+.nf

+  CURLUcode rc;

+  CURLU *url = curl_url();

+  CURLU *url2;

+  rc = curl_url_set(url, CURLUPART_URL, "https://example.com", 0);

+  if(!rc) {

+    url2 = curl_url_dup(url); /* clone it! */

+    curl_url_cleanup(url2);

+  }

+  curl_url_cleanup(url);

+.fi

+.SH AVAILABILITY

+Added in curl 7.63.0

+.SH "SEE ALSO"

+.BR curl_url_cleanup "(3), " curl_url "(3), " curl_url_set "(3), "

+.BR curl_url_get "(3), "

diff --git a/docs/libcurl/curl_url_get.3 b/docs/libcurl/curl_url_get.3

new file mode 100644

index 0000000..824d496

--- /dev/null

+++ b/docs/libcurl/curl_url_get.3

@@ -0,0 +1,110 @@

+.\" **************************************************************************

+.\" *                                  _   _ ____  _

+.\" *  Project                     ___| | | |  _ \| |

+.\" *                             / __| | | | |_) | |

+.\" *                            | (__| |_| |  _ <| |___

+.\" *                             \___|\___/|_| \_\_____|

+.\" *

+.\" * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

+.\" *

+.\" * This software is licensed as described in the file COPYING, which

+.\" * you should have received as part of this distribution. The terms

+.\" * are also available at https://curl.haxx.se/docs/copyright.html.

+.\" *

+.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell

+.\" * copies of the Software, and permit persons to whom the Software is

+.\" * furnished to do so, under the terms of the COPYING file.

+.\" *

+.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

+.\" * KIND, either express or implied.

+.\" *

+.\" **************************************************************************

+.TH curl_url_get 3 "6 Aug 2018" "libcurl" "libcurl Manual"

+.SH NAME

+curl_url_get - extract a part from a URL

+.SH SYNOPSIS

+.B #include <curl/curl.h>

+

+.nf

+CURLUcode curl_url_get(CURLU *url,

+                       CURLUPart what,

+                       char **part,

+                       unsigned int flags)

+.fi

+.SH DESCRIPTION

+Given the \fIurl\fP handle of an already parsed URL, this function lets the

+user extract individual pieces from it.

+

+The \fIwhat\fP argument should be the particular part to extract (see list

+below) and \fIpart\fP points to a 'char *' to get updated to point to a newly

+allocated string with the contents.

+

+The \fIflags\fP argument is a bitmask with individual features.

+

+The returned part pointer must be freed with \fIcurl_free(3)\fP after use.

+.SH FLAGS

+The flags argument is zero, one or more bits set in a bitmask.

+.IP CURLU_DEFAULT_PORT

+If the handle has no port stored, this option will make \fIcurl_url_get(3)\fP

+return the default port for the used scheme.

+.IP CURLU_DEFAULT_SCHEME

+If the handle has no scheme stored, this option will make

+\fIcurl_url_get(3)\fP return the default scheme instead of error.

+.IP CURLU_NO_DEFAULT_PORT

+Instructs \fIcurl_url_get(3)\fP to not return a port number if it matches the

+default port for the scheme.

+.IP CURLU_URLDECODE

+Asks \fIcurl_url_get(3)\fP to URL decode the contents before returning it. It

+will not attempt to decode the scheme, the port number or the full URL.

+

+The query component will also get plus-to-space convertion as a bonus when

+this bit is set.

+

+Note that this URL decoding is charset unaware and you will get a zero

+terminated string back with data that could be intended for a particular

+encoding.

+

+If there's any byte values lower than 32 in the decoded string, the get

+operation will return an error instead.

+.SH PARTS

+.IP CURLUPART_URL

+When asked to return the full URL, \fIcurl_url_get(3)\fP will return a

+normalized and possibly cleaned up version of what was previously parsed.

+.IP CURLUPART_SCHEME

+Scheme cannot be URL decoded on get.

+.IP CURLUPART_USER

+.IP CURLUPART_PASSWORD

+.IP CURLUPART_OPTIONS

+.IP CURLUPART_HOST

+.IP CURLUPART_PORT

+Port cannot be URL decoded on get.

+.IP CURLUPART_PATH

+.IP CURLUPART_QUERY

+The query part will also get pluses converted to space when asked to URL

+decode on get with the CURLU_URLDECODE bit.

+.IP CURLUPART_FRAGMENT

+.SH RETURN VALUE

+Returns a CURLUcode error value, which is CURLUE_OK (0) if everything went

+fine.

+

+If this function returns an error, no URL part is returned.

+.SH EXAMPLE

+.nf

+  CURLUcode rc;

+  CURLU *url = curl_url();

+  rc = curl_url_set(url, CURLUPART_URL, "https://example.com", 0);

+  if(!rc) {

+    char *scheme;

+    rc = curl_url_get(url, CURLUPART_SCHEME, &scheme, 0);

+    if(!rc) {

+      printf("the scheme is %s\n", scheme);

+      curl_free(scheme);

+    }

+    curl_url_cleanup(url);

+  }

+.fi

+.SH AVAILABILITY

+Added in curl 7.63.0

+.SH "SEE ALSO"

+.BR curl_url_cleanup "(3), " curl_url "(3), " curl_url_set "(3), "

+.BR curl_url_dup "(3), "

diff --git a/docs/libcurl/curl_url_set.3 b/docs/libcurl/curl_url_set.3

new file mode 100644

index 0000000..75fc0d9

--- /dev/null

+++ b/docs/libcurl/curl_url_set.3

@@ -0,0 +1,120 @@

+.\" **************************************************************************

+.\" *                                  _   _ ____  _

+.\" *  Project                     ___| | | |  _ \| |

+.\" *                             / __| | | | |_) | |

+.\" *                            | (__| |_| |  _ <| |___

+.\" *                             \___|\___/|_| \_\_____|

+.\" *

+.\" * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

+.\" *

+.\" * This software is licensed as described in the file COPYING, which

+.\" * you should have received as part of this distribution. The terms

+.\" * are also available at https://curl.haxx.se/docs/copyright.html.

+.\" *

+.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell

+.\" * copies of the Software, and permit persons to whom the Software is

+.\" * furnished to do so, under the terms of the COPYING file.

+.\" *

+.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

+.\" * KIND, either express or implied.

+.\" *

+.\" **************************************************************************

+.TH curl_url_set 3 "6 Aug 2018" "libcurl" "libcurl Manual"

+.SH NAME

+curl_url_set - set a part from a URL

+.SH SYNOPSIS

+.B #include <curl/curl.h>

+

+CURLUcode curl_url_set(CURLU *url,

+                       CURLUPart part,

+                       const char *content,

+                       unsigned int flags)

+.fi

+.SH DESCRIPTION

+Given the \fIurl\fP handle of an already parsed URL, this function lets the

+user set/update individual pieces of it.

+

+The \fIpart\fP argument should identify the particular URL part (see list

+below) to set or change, with \fIcontent\fP pointing to a zero terminated

+string with the new contents for that URL part. The contents should be in the

+form and encoding they'd use in a URL: URL encoded.

+

+Setting a part to a NULL pointer will effectively remove that part's contents

+from the CURLU handle.

+

+The \fIflags\fP argument is a bitmask with independent features.

+.SH PARTS

+.IP CURLUPART_URL

+Allows the full URL of the handle to be replaced. If the handle already is

+populated with a URL, the new URL can be relative to the previous.

+

+When successfully setting a new URL, relative or absolute, the handle contents

+will be replaced with the information of the newly set URL.

+

+Pass a pointer to a zero terminated string to the \fIurl\fP parameter. The

+string must point to a correctly formatted "RFC 3986+" URL or be a NULL

+pointer.

+.IP CURLUPART_SCHEME

+Scheme cannot be URL decoded on set.

+.IP CURLUPART_USER

+.IP CURLUPART_PASSWORD

+.IP CURLUPART_OPTIONS

+.IP CURLUPART_HOST

+The host name can use IDNA. The string must then be encoded as your locale

+says or UTF-8 (when winidn is used).

+.IP CURLUPART_PORT

+Port cannot be URL encoded on set.

+.IP CURLUPART_PATH

+If a path is set in the URL without a leading slash, a slash will be inserted

+automatically when this URL is read from the handle.

+.IP CURLUPART_QUERY

+The query part will also get spaces converted to pluses when asked to URL

+encode on set with the CURLU_URLENCODE bit.

+

+If used in with \fICURLU_APPENDQUERY\fP, the provided part will be appended on

+the end of the existing query - and if the previous part didn't end with an

+ampersand (&), an ampersand will be inserted before the new appended part.

+

+When \fCURLU_APPENDQUERY\fP is used together with \fICURLU_URLENCODE\fP,

+the '=' symbols will not be URL encoded.

+

+The question mark in the URL is not part of the actual query contents.

+.IP CURLUPART_FRAGMENT

+The hash sign in the URL is not part of the actual fragment contents.

+.SH FLAGS

+The flags argument is zero, one or more bits set in a bitmask.

+.IP CURLU_NON_SUPPORT_SCHEME

+If set, allows \fIcurl_url_set(3)\fP to set a non-supported scheme.

+.IP CURLU_URLENCODE

+When set, \fIcurl_url_set(3)\fP URL encodes the part on entry, except for

+scheme, port and URL.

+

+When setting the path component with URL encoding enabled, the slash character

+will be skipped.

+

+The query part gets space-to-plus conversion before the URL conversion.

+

+This URL encoding is charset unaware and will convert the input on a

+byte-by-byte manner.

+.SH RETURN VALUE

+Returns a CURLUcode error value, which is CURLUE_OK (0) if everything went

+fine.

+

+If this function returns an error, no URL part is returned.

+.SH EXAMPLE

+.nf

+  CURLUcode rc;

+  CURLU *url = curl_url();

+  rc = curl_url_set(url, CURLUPART_URL, "https://example.com", 0);

+  if(!rc) {

+    char *scheme;

+    /* change it to an FTP URL */

+    rc = curl_url_set(url, CURLUPART_SCHEME, "ftp", 0);

+  }

+  curl_url_cleanup(url);

+.fi

+.SH AVAILABILITY

+Added in curl 7.63.0

+.SH "SEE ALSO"

+.BR curl_url_cleanup "(3), " curl_url "(3), " curl_url_get "(3), "

+.BR curl_url_dup "(3), "

diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions

index 7448b4f..c797cb7 100644

--- a/docs/libcurl/symbols-in-versions

+++ b/docs/libcurl/symbols-in-versions

@@ -718,6 +718,36 @@ CURLSSLSET_NO_BACKENDS          7.56.0

 CURLSSLSET_OK                   7.56.0

 CURLSSLSET_TOO_LATE             7.56.0

 CURLSSLSET_UNKNOWN_BACKEND      7.56.0

+CURLUPART_FRAGMENT              7.62.0

+CURLUPART_HOST                  7.62.0

+CURLUPART_OPTIONS               7.62.0

+CURLUPART_PASSWORD              7.62.0

+CURLUPART_PATH                  7.62.0

+CURLUPART_PORT                  7.62.0

+CURLUPART_QUERY                 7.62.0

+CURLUPART_SCHEME                7.62.0

+CURLUPART_URL                   7.62.0

+CURLUPART_USER                  7.62.0

+CURLUE_BAD_HANDLE               7.62.0

+CURLUE_BAD_PARTPOINTER          7.62.0

+CURLUE_BAD_PORT_NUMBER          7.62.0

+CURLUE_MALFORMED_INPUT          7.62.0

+CURLUE_NO_FRAGMENT              7.62.0

+CURLUE_NO_HOST                  7.62.0

+CURLUE_NO_OPTIONS               7.62.0

+CURLUE_NO_PASSWORD              7.62.0

+CURLUE_NO_PATH                  7.62.0

+CURLUE_NO_PORT                  7.62.0

+CURLUE_NO_QUERY                 7.62.0

+CURLUE_NO_SCHEME                7.62.0

+CURLUE_NO_USER                  7.62.0

+CURLUE_OK                       7.62.0

+CURLUE_OUT_OF_MEMORY            7.62.0

+CURLUE_RELATIVE                 7.62.0

+CURLUE_UNKNOWN_PART             7.62.0

+CURLUE_UNSUPPORTED_SCHEME       7.62.0

+CURLUE_URLDECODE                7.62.0

+CURLUE_USER_NOT_ALLOWED         7.62.0

 CURLUSESSL_ALL                  7.17.0

 CURLUSESSL_CONTROL              7.17.0

 CURLUSESSL_NONE                 7.17.0

diff --git a/include/curl/Makefile.am b/include/curl/Makefile.am

index 989d4a2..bf5f061 100644

--- a/include/curl/Makefile.am

+++ b/include/curl/Makefile.am

@@ -5,7 +5,7 @@

 #                            | (__| |_| |  _ <| |___

 #                             \___|\___/|_| \_\_____|

 #

-# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

+# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 #

 # This software is licensed as described in the file COPYING, which

 # you should have received as part of this distribution. The terms

@@ -21,7 +21,7 @@

 ###########################################################################

 pkginclude_HEADERS = \

 	curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \

-	typecheck-gcc.h system.h

+	typecheck-gcc.h system.h urlapi.h

 pkgincludedir= $(includedir)/curl

diff --git a/include/curl/curl.h b/include/curl/curl.h

index 067b34d..8f473e2 100644

--- a/include/curl/curl.h

+++ b/include/curl/curl.h

@@ -2779,6 +2779,7 @@ CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);

   stuff before they can be included! */

 #include "easy.h" /* nothing in curl is fun without the easy stuff */

 #include "multi.h"

+#include "urlapi.h"

 /* the typechecker doesn't work in C++ (yet) */

 #if defined(__GNUC__) && defined(__GNUC_MINOR__) && \

diff --git a/include/curl/urlapi.h b/include/curl/urlapi.h

new file mode 100644

index 0000000..b16cfce

--- /dev/null

+++ b/include/curl/urlapi.h

@@ -0,0 +1,121 @@

+#ifndef __CURL_URLAPI_H

+#define __CURL_URLAPI_H

+/***************************************************************************

+ *                                  _   _ ____  _

+ *  Project                     ___| | | |  _ \| |

+ *                             / __| | | | |_) | |

+ *                            | (__| |_| |  _ <| |___

+ *                             \___|\___/|_| \_\_____|

+ *

+ * Copyright (C) 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

+ *

+ * This software is licensed as described in the file COPYING, which

+ * you should have received as part of this distribution. The terms

+ * are also available at https://curl.haxx.se/docs/copyright.html.

+ *

+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell

+ * copies of the Software, and permit persons to whom the Software is

+ * furnished to do so, under the terms of the COPYING file.

+ *

+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

+ * KIND, either express or implied.

+ *

+ ***************************************************************************/

+

+#ifdef  __cplusplus

+extern "C" {

+#endif

+

+/* the error codes for the URL API */

+typedef enum {

+  CURLUE_OK,

+  CURLUE_BAD_HANDLE,          /* 1 */

+  CURLUE_BAD_PARTPOINTER,     /* 2 */

+  CURLUE_MALFORMED_INPUT,     /* 3 */

+  CURLUE_BAD_PORT_NUMBER,     /* 4 */

+  CURLUE_UNSUPPORTED_SCHEME,  /* 5 */

+  CURLUE_URLDECODE,           /* 6 */

+  CURLUE_RELATIVE,            /* 7 */

+  CURLUE_USER_NOT_ALLOWED,    /* 8 */

+  CURLUE_UNKNOWN_PART,        /* 9 */

+  CURLUE_NO_SCHEME,           /* 10 */

+  CURLUE_NO_USER,             /* 11 */

+  CURLUE_NO_PASSWORD,         /* 12 */

+  CURLUE_NO_OPTIONS,          /* 13 */

+  CURLUE_NO_HOST,             /* 14 */

+  CURLUE_NO_PORT,             /* 15 */

+  CURLUE_NO_PATH,             /* 16 */

+  CURLUE_NO_QUERY,            /* 17 */

+  CURLUE_NO_FRAGMENT,         /* 18 */

+  CURLUE_OUT_OF_MEMORY        /* 19 */

+} CURLUcode;

+

+typedef enum {

+  CURLUPART_URL,

+  CURLUPART_SCHEME,

+  CURLUPART_USER,

+  CURLUPART_PASSWORD,

+  CURLUPART_OPTIONS,

+  CURLUPART_HOST,

+  CURLUPART_PORT,

+  CURLUPART_PATH,

+  CURLUPART_QUERY,

+  CURLUPART_FRAGMENT

+} CURLUPart;

+

+#define CURLU_DEFAULT_PORT (1<<0)       /* return default port number */

+#define CURLU_NO_DEFAULT_PORT (1<<1)    /* act as if no port number was set,

+                                           if the port number matches the

+                                           default for the scheme */

+#define CURLU_DEFAULT_SCHEME (1<<2)     /* return default scheme if

+                                           missing */

+#define CURLU_NON_SUPPORT_SCHEME (1<<3) /* allow non-supported scheme */

+#define CURLU_PATH_AS_IS (1<<4)         /* leave dot sequences */

+#define CURLU_DISALLOW_USER (1<<5)      /* no user+password allowed */

+#define CURLU_URLDECODE (1<<6)          /* URL decode on get */

+#define CURLU_URLENCODE (1<<7)          /* URL encode on set */

+#define CURLU_APPENDQUERY (1<<8)        /* append a form style part */

+

+typedef struct Curl_URL CURLU;

+

+/*

+ * curl_url() creates a new CURLU handle and returns a pointer to it.

+ * Must be freed with curl_url_cleanup().

+ */

+CURL_EXTERN CURLU *curl_url(void);

+

+/*

+ * curl_url_cleanup() frees the CURLU handle and related resources used for

+ * the URL parsing. It will not free strings previously returned with the URL

+ * API.

+ */

+CURL_EXTERN void curl_url_cleanup(CURLU *handle);

+

+/*

+ * curl_url_dup() duplicates a CURLU handle and returns a new copy. The new

+ * handle must also be freed with curl_url_cleanup().

+ */

+CURL_EXTERN CURLU *curl_url_dup(CURLU *in);

+

+/*

+ * curl_url_get() extracts a specific part of the URL from a CURLU

+ * handle. Returns error code. The returned pointer MUST be freed with

+ * curl_free() afterwards.

+ */

+CURL_EXTERN CURLUcode curl_url_get(CURLU *handle, CURLUPart what,

+                                   char **part, unsigned int flags);

+

+/*

+ * curl_url_set() sets a specific part of the URL in a CURLU handle. Returns

+ * error code. The passed in string will be copied. Passing a NULL instead of

+ * a part string, clears that part.

+ */

+CURL_EXTERN CURLUcode curl_url_set(CURLU *handle, CURLUPart what,

+                                   const char *part, unsigned int flags);

+

+

+#ifdef __cplusplus

+} /* end of extern "C" */

+#endif

+

+#endif

diff --git a/lib/Makefile.inc b/lib/Makefile.inc

index 76ca6d0..1ff82e1 100644

--- a/lib/Makefile.inc

+++ b/lib/Makefile.inc

@@ -54,7 +54,8 @@ LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c   \

   http_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_sasl.c rand.c        \

   curl_multibyte.c hostcheck.c conncache.c pipeline.c dotdot.c          \

   x509asn1.c http2.c smb.c curl_endian.c curl_des.c system_win32.c      \

-  mime.c sha256.c setopt.c curl_path.c curl_ctype.c curl_range.c psl.c

+  mime.c sha256.c setopt.c curl_path.c curl_ctype.c curl_range.c psl.c  \

+  urlapi.c

 LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \

   formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h if2ip.h         \

@@ -74,7 +75,7 @@ LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \

   curl_setup_once.h multihandle.h setup-vms.h pipeline.h dotdot.h       \

   x509asn1.h http2.h sigpipe.h smb.h curl_endian.h curl_des.h           \

   curl_printf.h system_win32.h rand.h mime.h curl_sha256.h setopt.h     \

-  curl_path.h curl_ctype.h curl_range.h psl.h

+  curl_path.h curl_ctype.h curl_range.h psl.h urlapi-int.h

 LIB_RCFILES = libcurl.rc

diff --git a/lib/escape.c b/lib/escape.c

index 10774f0..afd3899 100644

--- a/lib/escape.c

+++ b/lib/escape.c

@@ -5,7 +5,7 @@

  *                            | (__| |_| |  _ <| |___

  *                             \___|\___/|_| \_\_____|

  *

- * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

+ * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

  *

  * This software is licensed as described in the file COPYING, which

  * you should have received as part of this distribution. The terms

@@ -41,7 +41,7 @@

    its behavior is altered by the current locale.

    See https://tools.ietf.org/html/rfc3986#section-2.3

 */

-static bool Curl_isunreserved(unsigned char in)