diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-06-21 23:35:08 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-06-21 23:39:10 +0200 |
| commit | 9b167fd090f596eac828817d48c247eeae53407f (patch) | |
| tree | d89ba04374722be9ca36d633a82e07616abbe0f6 /lib | |
| parent | 8de8f4eb7e7c276eb2b2a2f7888c88d0779bed39 (diff) | |
--request-target: instead of --strip-path-slash
... and CURLOPT_REQUEST_TARGET instead of CURLOPT_STRIP_PATH_SLASH.
This option instead provides the full "alternative" target to use in the
request, instead of extracting the path from the URL.
Test 1298 and 1299 updated accordingly.
Idea-by: Evert Pot
Suggestion: https://daniel.haxx.se/blog/2017/06/19/options-with-curl/comment-page-1/#comment-18373
Closes #1593
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/http.c | 4 | ||||
| -rw-r--r-- | lib/url.c | 6 | ||||
| -rw-r--r-- | lib/urldata.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/http.c b/lib/http.c index 2d04705ba..b8f4c8a21 100644 --- a/lib/http.c +++ b/lib/http.c @@ -2269,8 +2269,8 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) if(result) return result; - if(data->set.strip_path_slash) - ppath++; + if(data->set.str[STRING_TARGET]) + ppath = data->set.str[STRING_TARGET]; /* url */ if(paste_ftp_userpwd) @@ -829,9 +829,9 @@ CURLcode Curl_setopt(struct Curl_easy *data, CURLoption option, then this can be changed to HEAD later on) */ data->set.httpreq = HTTPREQ_GET; break; - case CURLOPT_STRIP_PATH_SLASH: - arg = va_arg(param, long); - data->set.strip_path_slash = (bool)arg; + case CURLOPT_REQUEST_TARGET: + result = setstropt(&data->set.str[STRING_TARGET], + va_arg(param, char *)); break; case CURLOPT_FILETIME: /* diff --git a/lib/urldata.h b/lib/urldata.h index 9310abc17..8c4a029fe 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -1588,7 +1588,7 @@ enum dupstring { #ifdef USE_UNIX_SOCKETS STRING_UNIX_SOCKET_PATH, /* path to Unix socket, if used */ #endif - + STRING_TARGET, /* CURLOPT_REQUEST_TARGET */ /* -- end of zero-terminated strings -- */ STRING_LASTZEROTERMINATED, |