From b49d54103a4f011998195263de850642fa21f705 Mon Sep 17 00:00:00 2001

From: Kamil Dudka <kdudka@redhat.com>

Date: Tue, 9 Jul 2013 14:59:01 +0200

Subject: [PATCH 1/3] curl.1: document the --time-cond option in the man page

[upstream commit 3a0e931fc715a80004958794a96b12cf90503f99]

---

 docs/curl.1 |    3 +++

 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/docs/curl.1 b/docs/curl.1

index 1aeeb46..4b12c3f 100644

--- a/docs/curl.1

+++ b/docs/curl.1

@@ -1407,6 +1407,9 @@ default 512 bytes will be used.

 If this option is used several times, the last one will be used.

 (Added in 7.20.0)

+.IP " -z, --time-cond TIME"

+Transfer based on a time condition.  TIME may to be preceded by -, +, or =.

+See the corresponding sections 14.24, 14.28, and 14.29 of RFC 2068.

 .IP "--tlsauthtype <authtype>"

 Set TLS authentication type. Currently, the only supported option is "SRP",

 for TLS-SRP (RFC 5054). If \fI--tlsuser\fP and \fI--tlspassword\fP are

-- 

1.7.1

From fdc89d82464d90560aa5da857374906338472ed6 Mon Sep 17 00:00:00 2001

From: Kamil Dudka <kdudka@redhat.com>

Date: Tue, 9 Jul 2013 14:59:01 +0200

Subject: [PATCH 2/3] curl.1: document the --post303 option in the man page

[upstream commit 39e85d99feede7cc573902e8ab6b3dd759022d9c]

---

 docs/curl.1 |    7 +++++++

 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/docs/curl.1 b/docs/curl.1

index 4b12c3f..5dd6579 100644

--- a/docs/curl.1

+++ b/docs/curl.1

@@ -1038,6 +1038,13 @@ ubiquitous in web browsers, so curl does the conversion by default to maintain

 consistency. However, a server may require a POST to remain a POST after such

 a redirection. This option is meaningful only when using \fI-L, --location\fP

 (Added in 7.19.1)

+.IP "--post303"

+(HTTP) Tells curl to respect RFC 2616/10.3.2 and not convert POST requests

+into GET requests when following a 303 redirection. The non-RFC behaviour is

+ubiquitous in web browsers, so curl does the conversion by default to maintain

+consistency. However, a server may require a POST to remain a POST after such

+a redirection. This option is meaningful only when using \fI-L, --location\fP

+(Added in 7.26.0)

 .IP "--proto <protocols>"

 Tells curl to use the listed protocols for its initial retrieval. Protocols

 are evaluated left to right, are comma separated, and are each a protocol

-- 

1.7.1

From 31102c7190a0a009cf0c06b23f98880cb43d4f55 Mon Sep 17 00:00:00 2001

From: Kamil Dudka <kdudka@redhat.com>

Date: Tue, 9 Jul 2013 15:45:36 +0200

Subject: [PATCH 3/3] Revert "curl.1: document the --time-cond option in the man page"

This reverts commit 3a0e931fc715a80004958794a96b12cf90503f99 because

the documentation of --time-cond was duplicated by mistake.

Reported by: Dave Reisner

[upstream commit 45339625bc85b29225a2035a57eceda43206dd1e]

---

 docs/curl.1 |    5 +----

 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/docs/curl.1 b/docs/curl.1

index 5dd6579..b350865 100644

--- a/docs/curl.1

+++ b/docs/curl.1

@@ -1414,9 +1414,6 @@ default 512 bytes will be used.

 If this option is used several times, the last one will be used.

 (Added in 7.20.0)

-.IP " -z, --time-cond TIME"

-Transfer based on a time condition.  TIME may to be preceded by -, +, or =.

-See the corresponding sections 14.24, 14.28, and 14.29 of RFC 2068.

 .IP "--tlsauthtype <authtype>"

 Set TLS authentication type. Currently, the only supported option is "SRP",

 for TLS-SRP (RFC 5054). If \fI--tlsuser\fP and \fI--tlspassword\fP are

@@ -1699,7 +1696,7 @@ speed-time seconds it gets aborted. speed-time is set with \fI-y\fP and is 30

 if not set.

 If this option is used several times, the last one will be used.

-.IP "-z/--time-cond <date expression>|<file>"

+.IP "-z, --time-cond <date expression>|<file>"

 (HTTP/FTP) Request a file that has been modified later than the given time and

 date, or one that has been modified before that time. The <date expression>

 can be all sorts of date strings or if it doesn't match any internal ones, it

-- 

1.7.1