Skip to content

Commit 19288e3

Browse files
patthoytspatthoyts
committed
Install curl-7.26.0.tar.bz2
Signed-off-by: Pat Thoyts <[email protected]>
1 parent f2caa85 commit 19288e3

12 files changed

Lines changed: 155 additions & 63 deletions

File tree

‎mingw/bin/curl-ca-bundle.crt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
##
22
## lib/ca-bundle.crt -- Bundle of CA Root Certificates
33
##
4-
## Certificate data from Mozilla as of: Wed Jun 6 12:21:44 2012
4+
## Certificate data from Mozilla as of: Wed Jun 6 20:32:45 2012
55
##
66
## This is a bundle of X.509 certificates of public Certificate Authorities
77
## (CA). These were automatically extracted from Mozilla's root certificates
88
## file (certdata.txt). This file can be found in the mozilla source tree:
9-
## https://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
9+
## http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
1010
##
1111
## It contains the certificates in PEM format and therefore
1212
## can be directly used with curl / libcurl / php_curl, or with

‎mingw/bin/curl-config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ while test $# -gt 0; do
6666

6767
case "$1" in
6868
--built-shared)
69-
echo yes
69+
echo no
7070
;;
7171

7272
--ca)
@@ -94,7 +94,7 @@ while test $# -gt 0; do
9494
;;
9595

9696
--version)
97-
echo libcurl 7.25.0
97+
echo libcurl 7.26.0
9898
exit 0
9999
;;
100100

@@ -106,20 +106,20 @@ while test $# -gt 0; do
106106
# dash as that's used for things like version 1.2.3-CVS
107107
cpatch=`echo $checkfor | cut -d. -f3 | cut -d- -f1`
108108
checknum=`echo "$cmajor*256*256 + $cminor*256 + ${cpatch:-0}" | bc`
109-
numuppercase=`echo 071900 | tr 'a-f' 'A-F'`
109+
numuppercase=`echo 071a00 | tr 'a-f' 'A-F'`
110110
nownum=`echo "obase=10; ibase=16; $numuppercase" | bc`
111111

112112
if test "$nownum" -ge "$checknum"; then
113113
# silent success
114114
exit 0
115115
else
116-
echo "requested version $checkfor is newer than existing 7.25.0"
116+
echo "requested version $checkfor is newer than existing 7.26.0"
117117
exit 1
118118
fi
119119
;;
120120

121121
--vernum)
122-
echo 071900
122+
echo 071a00
123123
exit 0
124124
;;
125125

@@ -153,7 +153,7 @@ while test $# -gt 0; do
153153
;;
154154

155155
--configure)
156-
echo " '--prefix=/mingw' '--with-ssl=/mingw' '--enable-sspi'"
156+
echo " '--prefix=/mingw' '--with-ssl=/mingw' '--enable-sspi' '--disable-shared'"
157157
;;
158158

159159
*)

‎mingw/bin/curl.exe‎

-10.2 KB
Binary file not shown.

‎mingw/include/curl/curl.h‎

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -598,18 +598,32 @@ typedef enum {
598598
in 7.18.0 */
599599
} curl_proxytype; /* this enum was added in 7.10 */
600600

601-
#define CURLAUTH_NONE 0 /* nothing */
602-
#define CURLAUTH_BASIC (1<<0) /* Basic (default) */
603-
#define CURLAUTH_DIGEST (1<<1) /* Digest */
604-
#define CURLAUTH_GSSNEGOTIATE (1<<2) /* GSS-Negotiate */
605-
#define CURLAUTH_NTLM (1<<3) /* NTLM */
606-
#define CURLAUTH_DIGEST_IE (1<<4) /* Digest with IE flavour */
607-
#define CURLAUTH_NTLM_WB (1<<5) /* NTLM delegating to winbind helper */
608-
#define CURLAUTH_ONLY (1<<31) /* used together with a single other
609-
type to force no auth or just that
610-
single type */
611-
#define CURLAUTH_ANY (~CURLAUTH_DIGEST_IE) /* all fine types set */
612-
#define CURLAUTH_ANYSAFE (~(CURLAUTH_BASIC|CURLAUTH_DIGEST_IE))
601+
/*
602+
* Bitmasks for CURLOPT_HTTPAUTH and CURLOPT_PROXYAUTH options:
603+
*
604+
* CURLAUTH_NONE - No HTTP authentication
605+
* CURLAUTH_BASIC - HTTP Basic authentication (default)
606+
* CURLAUTH_DIGEST - HTTP Digest authentication
607+
* CURLAUTH_GSSNEGOTIATE - HTTP GSS-Negotiate authentication
608+
* CURLAUTH_NTLM - HTTP NTLM authentication
609+
* CURLAUTH_DIGEST_IE - HTTP Digest authentication with IE flavour
610+
* CURLAUTH_NTLM_WB - HTTP NTLM authentication delegated to winbind helper
611+
* CURLAUTH_ONLY - Use together with a single other type to force no
612+
* authentication or just that single type
613+
* CURLAUTH_ANY - All fine types set
614+
* CURLAUTH_ANYSAFE - All fine types except Basic
615+
*/
616+
617+
#define CURLAUTH_NONE ((unsigned long)0)
618+
#define CURLAUTH_BASIC (((unsigned long)1)<<0)
619+
#define CURLAUTH_DIGEST (((unsigned long)1)<<1)
620+
#define CURLAUTH_GSSNEGOTIATE (((unsigned long)1)<<2)
621+
#define CURLAUTH_NTLM (((unsigned long)1)<<3)
622+
#define CURLAUTH_DIGEST_IE (((unsigned long)1)<<4)
623+
#define CURLAUTH_NTLM_WB (((unsigned long)1)<<5)
624+
#define CURLAUTH_ONLY (((unsigned long)1)<<31)
625+
#define CURLAUTH_ANY (~CURLAUTH_DIGEST_IE)
626+
#define CURLAUTH_ANYSAFE (~(CURLAUTH_BASIC|CURLAUTH_DIGEST_IE))
613627

614628
#define CURLSSH_AUTH_ANY ~0 /* all types supported by the server */
615629
#define CURLSSH_AUTH_NONE 0 /* none allowed, silly but complete */
@@ -1624,13 +1638,16 @@ enum CURL_TLSAUTH {
16241638
};
16251639

16261640
/* symbols to use with CURLOPT_POSTREDIR.
1627-
CURL_REDIR_POST_301 and CURL_REDIR_POST_302 can be bitwise ORed so that
1628-
CURL_REDIR_POST_301 | CURL_REDIR_POST_302 == CURL_REDIR_POST_ALL */
1641+
CURL_REDIR_POST_301, CURL_REDIR_POST_302 and CURL_REDIR_POST_303
1642+
can be bitwise ORed so that CURL_REDIR_POST_301 | CURL_REDIR_POST_302
1643+
| CURL_REDIR_POST_303 == CURL_REDIR_POST_ALL */
16291644

16301645
#define CURL_REDIR_GET_ALL 0
16311646
#define CURL_REDIR_POST_301 1
16321647
#define CURL_REDIR_POST_302 2
1633-
#define CURL_REDIR_POST_ALL (CURL_REDIR_POST_301|CURL_REDIR_POST_302)
1648+
#define CURL_REDIR_POST_303 4
1649+
#define CURL_REDIR_POST_ALL \
1650+
(CURL_REDIR_POST_301|CURL_REDIR_POST_302|CURL_REDIR_POST_303)
16341651

16351652
typedef enum {
16361653
CURL_TIMECOND_NONE,

‎mingw/include/curl/curlver.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030

3131
/* This is the version number of the libcurl package from which this header
3232
file origins: */
33-
#define LIBCURL_VERSION "7.25.0"
33+
#define LIBCURL_VERSION "7.26.0"
3434

3535
/* The numeric version number is also available "in parts" by using these
3636
defines: */
3737
#define LIBCURL_VERSION_MAJOR 7
38-
#define LIBCURL_VERSION_MINOR 25
38+
#define LIBCURL_VERSION_MINOR 26
3939
#define LIBCURL_VERSION_PATCH 0
4040

4141
/* This is the numeric version of the libcurl version number, meant for easier
@@ -53,7 +53,7 @@
5353
and it is always a greater number in a more recent release. It makes
5454
comparisons with greater than and less than work.
5555
*/
56-
#define LIBCURL_VERSION_NUM 0x071900
56+
#define LIBCURL_VERSION_NUM 0x071a00
5757

5858
/*
5959
* This is the date and time when the full source package was created. The
@@ -64,6 +64,6 @@
6464
*
6565
* "Mon Feb 12 11:35:33 UTC 2007"
6666
*/
67-
#define LIBCURL_TIMESTAMP "Thu Mar 22 18:49:32 UTC 2012"
67+
#define LIBCURL_TIMESTAMP "Thu May 24 16:05:42 UTC 2012"
6868

6969
#endif /* __CURL_CURLVER_H */

‎mingw/include/curl/typecheck-gcc.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* | (__| |_| | _ <| |___
88
* \___|\___/|_| \_\_____|
99
*
10-
* Copyright (C) 1998 - 2011, Daniel Stenberg, <[email protected]>, et al.
10+
* Copyright (C) 1998 - 2012, Daniel Stenberg, <[email protected]>, et al.
1111
*
1212
* This software is licensed as described in the file COPYING, which
1313
* you should have received as part of this distribution. The terms
@@ -141,8 +141,9 @@ __extension__ ({ \
141141

142142
/* To define a new warning, use _CURL_WARNING(identifier, "message") */
143143
#define _CURL_WARNING(id, message) \
144-
static void __attribute__((warning(message))) __attribute__((unused)) \
145-
__attribute__((noinline)) id(void) { __asm__(""); }
144+
static void __attribute__((__warning__(message))) \
145+
__attribute__((__unused__)) __attribute__((__noinline__)) \
146+
id(void) { __asm__(""); }
146147

147148
_CURL_WARNING(_curl_easy_setopt_err_long,
148149
"curl_easy_setopt expects a long argument for this option")

‎mingw/lib/libcurl.a‎

5.25 KB
Binary file not shown.

‎mingw/lib/pkgconfig/libcurl.pc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ supported_features="SSL libz SSPI NTLM"
3333
Name: libcurl
3434
URL: http://curl.haxx.se/
3535
Description: Library to transfer files with ftp, http, etc.
36-
Version: 7.25.0
36+
Version: 7.26.0
3737
Libs: -L${libdir} -lcurl
3838
Libs.private: -lssl -lcrypto -lgdi32 -lwldap32 -lws2_32 -lz -lws2_32
3939
Cflags: -I${includedir}

‎mingw/share/man/man1/curl-config.1‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.\" * | (__| |_| | _ <| |___
66
.\" * \___|\___/|_| \_\_____|
77
.\" *
8-
.\" * Copyright (C) 1998 - 2010, Daniel Stenberg, <[email protected]>, et al.
8+
.\" * Copyright (C) 1998 - 2012, Daniel Stenberg, <[email protected]>, et al.
99
.\" *
1010
.\" * This software is licensed as described in the file COPYING, which
1111
.\" * you should have received as part of this distribution. The terms
@@ -93,7 +93,6 @@ What's the installed libcurl version?
9393

9494
How do I build a single file with a one-line command?
9595

96-
$ `curl-config --cc --cflags --libs` -o example example.c
97-
96+
$ `curl-config --cc --cflags` -o example example.c `curl-config --libs`
9897
.SH "SEE ALSO"
9998
.BR curl (1)

‎mingw/share/man/man1/curl.1‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1485,6 +1485,11 @@ The variables available at this point are:
14851485
The URL that was fetched last. This is most meaningful if you've told curl
14861486
to follow location: headers.
14871487
.TP
1488+
.B filename_effective
1489+
The ultimate filename that curl writes out to. This is only meaningful if curl
1490+
is told to write to a file with the --remote-name or --output option. It's most
1491+
useful in combination with the --remote-header-name option. (Added in 7.25.1)
1492+
.TP
14881493
.B http_code
14891494
The numerical response code that was found in the last retrieved HTTP(S) or
14901495
FTP(s) transfer. In 7.18.2 the alias \fBresponse_code\fP was added to show the
@@ -1569,7 +1574,7 @@ means the verification was successful. (Added in 7.19.0)
15691574
.RE
15701575

15711576
If this option is used several times, the last one will be used.
1572-
.IP "-x, --proxy <[protocol://][user@password]proxyhost[:port]>"
1577+
.IP "-x, --proxy <[protocol://][user:password@]proxyhost[:port]>"
15731578
Use the specified HTTP proxy. If the port number is not specified, it is
15741579
assumed at port 1080.
15751580

@@ -1582,6 +1587,10 @@ converted to HTTP. It means that certain protocol specific operations might
15821587
not be available. This is not the case if you can tunnel through the proxy, as
15831588
one with the \fI-p, --proxytunnel\fP option.
15841589

1590+
User and password that might be provided in the proxy string are URL decoded
1591+
by libcurl. This allows you to pass in special characters such as @ by using
1592+
%40 or pass in a colon with %3a.
1593+
15851594
The proxy host can be specified the exact same way as the proxy environment
15861595
variables, including the protocol prefix (http://) and the embedded user +
15871596
password.
@@ -1628,12 +1637,12 @@ speed-time seconds it gets aborted. speed-time is set with -y and is 30 if
16281637
not set.
16291638

16301639
If this option is used several times, the last one will be used.
1631-
.IP "-z, --time-cond <date expression>"
1632-
(HTTP/FTP/FILE) Request a file that has been modified later than the given time
1633-
and date, or one that has been modified before that time. The date expression
1634-
can be all sorts of date strings or if it doesn't match any internal ones, it
1635-
tries to get the time from a given file name instead! See the
1636-
\fIcurl_getdate(3)\fP man pages for date expression details.
1640+
.IP "-z/--time-cond <date expression>|<file>"
1641+
(HTTP/FTP) Request a file that has been modified later than the given time and
1642+
date, or one that has been modified before that time. The <date expression> can
1643+
be all sorts of date strings or if it doesn't match any internal ones, it is
1644+
taken as a filename and tries to get the modification date (mtime) from <file>
1645+
instead. See the \fIcurl_getdate(3)\fP man pages for date expression details.
16371646

16381647
Start the date expression with a dash (-) to make it request for a document
16391648
that is older than the given date/time, default is a document that is newer

0 commit comments

Comments
 (0)