Skip to content
Snippets Groups Projects
Commit 8d2c2426 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

7.1.1 commit

parent e559a7b8
No related branches found
Tags curl-7_1_1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
include/curl/curl.h
+ 2
− 2
View file @ 8d2c2426
......@@ -419,8 +419,8 @@ char *curl_getenv(char *variable);
char *curl_version(void);
/* This is the version number */
#define LIBCURL_VERSION "7.0.12test"
#define LIBCURL_VERSION_NUM 0x07000c
#define LIBCURL_VERSION "7.1.1"
#define LIBCURL_VERSION_NUM 0x070101
/* linked-list structure for the CURLOPT_QUOTE option */
struct curl_slist {
......
src/hugehelp.c
+ 26
− 21
View file @ 8d2c2426
......@@ -190,7 +190,9 @@ puts (
" one. This allows you to make even trickier stuff than\n"
" curl would normally do. You should not replace inter­\n"
" nally set headers without knowing perfectly well what\n"
" you're doing.\n"
" you're doing. Replacing an internal header with one\n"
" without content on the right side of the colon will\n"
" prevent that header from appearing.\n"
"\n"
" -i/--include\n"
" (HTTP) Include the HTTP-header in the output. The HTTP-\n"
......@@ -213,7 +215,6 @@ puts (
"\n"
" Specify the filename as '-' to make curl read the file\n"
" from stdin.\n"
"\n"
" -l/--list-only\n"
" (FTP) When listing an FTP directory, this switch forces\n"
" a name-only view. Especially useful if you want to\n"
......@@ -225,17 +226,19 @@ puts (
" (HTTP/HTTPS) If the server reports that the requested\n"
" page has a different location (indicated with the\n"
" header line Location:) this flag will let curl attempt\n"
" to reattempt the get on the new place. If used together\n"
" with -i or -I, headers from all requested pages will be\n"
);
puts(
" shown.\n"
" to reattempt the get on the new place. If used together\n"
" with -i or -I, headers from all requested pages will be\n"
" shown. If this flag is used when making a HTTP POST,\n"
" curl will automatically switch to GET after the initial\n"
" POST has been done.\n"
"\n"
" -m/--max-time <seconds>\n"
" Maximum time in seconds that you allow the whole opera­\n"
" tion to take. This is useful for preventing your batch\n"
" jobs from hanging for hours due to slow networks or\n"
" links going down. This doesn't work properly in win32\n"
" links going down. This doesn't work fully in win32\n"
" systems.\n"
"\n"
" -M/--manual\n"
......@@ -317,7 +320,6 @@ puts (
" to be run before and after the transfer. If the server\n"
" returns failure for one of the commands, the entire\n"
" operation will be aborted.\n"
"\n"
" -r/--range <range>\n"
" (HTTP/FTP) Retrieve a byte range (i.e a partial docu­\n"
" ment) from a HTTP/1.1 or FTP server. Ranges can be\n"
......@@ -422,9 +424,9 @@ puts (
" url_effective The URL that was fetched last. This is\n"
" mostly meaningful if you've told curl to\n"
" follow location: headers.\n"
"\n"
" http_code The numerical code that was found in the\n"
" last retrieved HTTP(S) page.\n"
"\n"
" time_total The total time, in seconds, that the\n"
" full operation lasted. The time will be\n"
" displayed with millisecond resolution.\n"
......@@ -464,13 +466,13 @@ puts (
"\n"
" -X/--request <command>\n"
" (HTTP) Specifies a custom request to use when communi­\n"
);
puts(
" cating with the HTTP server. The specified request\n"
" will be used instead of the standard GET. Read the HTTP\n"
" 1.1 specification for details and explanations.\n"
"\n"
" (FTP) Specifies a custom FTP command to use instead of\n"
);
puts(
" LIST when doing file lists with ftp.\n"
"\n"
" -y/--speed-time <time>\n"
......@@ -478,6 +480,7 @@ puts (
" ond during a speed-time period, the download gets\n"
" aborted. If speed-time is used, the default speed-limit\n"
" will be 1 unless set with -y.\n"
"\n"
" -Y/--speed-limit <speed>\n"
" If a download is slower than this given speed, in bytes\n"
" per second, for speed-time seconds it gets aborted.\n"
......@@ -489,8 +492,8 @@ puts (
" been modified before that time. The date expression can\n"
" be all sorts of date strings or if it doesn't match any\n"
" internal ones, it tries to get the time from a given\n"
" file name instead! See the GNU date(1) man page for\n"
" date expression details.\n"
" file name instead! See the GNU date(1) or curl_get­\n"
" date(3) man pages for date expression details.\n"
"\n"
" Start the date expression with a dash (-) to make it\n"
" request for a document that is older than the given\n"
......@@ -526,9 +529,9 @@ puts (
"ENVIRONMENT\n"
" HTTP_PROXY [protocol://]<host>[:port]\n"
" Sets proxy server to use for HTTP.\n"
"\n"
" HTTPS_PROXY [protocol://]<host>[:port]\n"
" Sets proxy server to use for HTTPS.\n"
"\n"
" FTP_PROXY [protocol://]<host>[:port]\n"
" Sets proxy server to use for FTP.\n"
"\n"
......@@ -577,9 +580,9 @@ puts (
"\n"
" 10 FTP user/password incorrect. Either one or both were\n"
" not accepted by the server.\n"
"\n"
" 11 FTP weird PASS reply. Curl couldn't parse the reply\n"
" sent to the PASS request.\n"
"\n"
" 12 FTP weird USER reply. Curl couldn't parse the reply\n"
" sent to the USER request.\n"
"\n"
......@@ -628,10 +631,10 @@ puts (
"\n"
" 29 FTP couldn't set ASCII. The server returned an unknown\n"
" reply.\n"
"\n"
" 30 FTP PORT failed. The PORT command failed.\n"
"\n"
" 31 FTP couldn't use REST. The REST command failed.\n"
"\n"
" 32 FTP couldn't use SIZE. The SIZE command failed. The\n"
" command is an extension to the original FTP spec RFC\n"
" 959.\n"
......@@ -712,6 +715,8 @@ puts (
" - Luong Dinh Dung <u8luong@lhsystems.hu>\n"
" - Torsten Foertsch <torsten.foertsch@gmx.net>\n"
" - Kristian Köhntopp <kris@koehntopp.de>\n"
" - Fred Noz <FNoz@siac.com>\n"
" - Caolan McNamara <caolan@csn.ul.ie>\n"
"\n"
"WWW\n"
" http://curl.haxx.se\n"
......@@ -774,6 +779,8 @@ puts (
" To ftp files using name+passwd, include them in the URL like:\n"
"\n"
" curl ftp://name:passwd@machine.domain:port/full/path/to/file\n"
);
puts(
"\n"
" or specify them with the -u flag like\n"
"\n"
......@@ -786,8 +793,6 @@ puts (
" pick a file like:\n"
"\n"
" curl http://name:passwd@machine.domain/full/path/to/file\n"
);
puts(
"\n"
" or specify user and password separately like in\n"
"\n"
......@@ -1056,6 +1061,8 @@ puts (
" Curl also has the ability to use previously received cookies in following\n"
" sessions. If you get cookies from a server and store them in a file in a\n"
" manner similar to:\n"
);
puts(
"\n"
" curl --dump-header headers www.example.com\n"
"\n"
......@@ -1066,8 +1073,6 @@ puts (
"\n"
" Note that by specifying -b you enable the \"cookie awareness\" and with -L\n"
" you can make curl follow a location: (which often is used in combination\n"
);
puts(
" with cookies). So that if a site sends cookies and a location, you can\n"
" use a non-existing file to trig the cookie awareness like:\n"
"\n"
......@@ -1327,6 +1332,8 @@ puts (
" curl -z yesterday http://remote.server.com/remote.html\n"
"\n"
" Curl will then accept a wide range of date formats. You always make the date\n"
);
puts(
" check the other way around by prepending it with a dash '-'.\n"
"\n"
"DICT\n"
......@@ -1339,8 +1346,6 @@ puts (
"\n"
" Aliases for 'm' are 'match' and 'find', and aliases for 'd' are 'define'\n"
" and 'lookup'. For example,\n"
);
puts(
"\n"
" curl dict://dict.org/find:curl\n"
"\n"
......
src/version.h
+ 1
− 1
View file @ 8d2c2426
#define CURL_NAME "curl"
#define CURL_VERSION "7.0.11test"
#define CURL_VERSION "7.1"
#define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment