FindWin32CACert: return OK even if CA cert isn't found

Bug: http://curl.haxx.se/mail/lib-2011-11/0180.html
Reported by: Mark Brand

Android.mk

@@ -2,7 +2,7 @@
 #
 # Place the curl source (including this makefile) into external/curl/ in the
 # Android source tree.  Then build them with 'make curl' or just 'make libcurl'
-# from the Android root. Tested with Android 1.5 and 2.1
+# from the Android root. Tested with Android versions 1.5, 2.1-2.3
 #
 # Note: you must first create a curl_config.h file by running configure in the
 # Android environment. The only way I've found to do this is tricky. Perform a
@@ -42,7 +42,7 @@
 # into the right place (but see the note about this below).
 #
 # Dan Fandrich
-# August 2010
+# November 2011
 
 LOCAL_PATH:= $(call my-dir)
 

RELEASE-NOTES

@@ -1,4 +1,4 @@
-Curl and libcurl 7.23.0
+Curl and libcurl 7.24.0
 
  Public curl releases:         125
  Command line options:         149
@@ -9,47 +9,11 @@ Curl and libcurl 7.23.0
 
 This release includes the following changes:
 
- o Empty headers can be sent in HTTP requests by terminating with a semicolon
- o SSL session sharing support added to curl_share_setopt()
- o Added support to MAIL FROM for the optional SIZE parameter
- o smtp: Added support for NTLM authentication
- o curl tool: code split into tool_*.[ch] files
+ o 
 
 This release includes the following bugfixes:
 
- o handle HTTP redirects to "//hostname/path"
- o SMTP without --mail-from caused segfault
- o prevent extra progress meter headers between multiple files
- o allow Content-Length to be replaced when sending HTTP requests
- o curl now always sets postfieldsize to allow --data-binary and --data
-   to be mixed in the same command line
- o curl_multi_fdset: avoid FD_SET out of bounds
- o lots of MinGW build tweaks
- o Curl_gethostname: return un-qualified machine name
- o fixed the openssl version number configure check
- o nss: certificates from files are no longer looked up by file base names
- o returning abort from the progress function when using the multi interface
-   would not properly cancel the transfer and close the connection
- o fix libcurl.m4 to not fail with modern gcc versions
- o ftp: improved the failed PORT host name resolved error message
- o TFTP timeout and unexpected block adjustments
- o HTTP and GOPHER test server-side connection closing adjustments
- o fix endless loop upon transport connection timeout
- o don't clobber errno on failed connect
- o typecheck: allow NULL to unset CURLOPT_ERRORBUFFER
- o formdata: ack read callback abort
- o make --show-error properly position independent
- o set the ipv6-connection boolean correctly on connect
- o SMTP: fix end-of-body string escaping
- o gtls: only call gnutls_transport_set_lowat with <gnutls-2.12.0
- o HTTP: handle multiple auths in a single WWW-Authenticate line
- o curl_multi_fdset: correct fdset with FTP PORT use
- o windbuild: fix the static build
- o fix builds with GnuTLS version 3
- o fix calling of OpenSSL's ERR_remove_state(0)
- o HTTP auth: fix proxy Negotiate bug when Negotiate not requested
- o ftp PORT: don't hang if bind() fails
- o -# would crash on terminals wider than 256 columns
+ o 
 
 This release includes the following known bugs:
 
@@ -58,13 +22,6 @@ This release includes the following known bugs:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- Yukihiro Kawada, Dave Reisner, Gisle Vanem, Guenter Knauf, Steve Holme,
- Yang Tse, Christopher Stone, Taneli Vahakangas, Albert Chin,
- Alejandro Alvarez, Dan Fandrich, Julien Royer, Georg Lippitsch,
- Vladimir Grishchenko, Dominique Leuenberger, Marcin Adamski,
- Jerry Wu, Michal Marek, Frank Van Uffelen, Fabian Hiernaux, Anton Bychkov,
- Andreas Olsson, Kamil Dudka, Thomas L. Shinnick, Tim Harder, Nick Zitzmann,
- Gokhan Sengun, Tom Wright, Patrick Monnerat, Rene Bernhardt,
- Alexey Zakhlestin
+ 
 
         Thanks! (and sorry if I forgot to mention someone)

docs/THANKS

@@ -14,9 +14,11 @@ Adrian Schuur
 Adriano Meirelles
 Akos Pasztory
 Alan Pinstein
+Albert Chin
 Albert Chin-A-Young
 Albert Choy
 Ale Vesely
+Alejandro Alvarez
 Aleksandar Milivojevic
 Alessandro Vesely
 Alex Bligh
@@ -32,6 +34,7 @@ Alexander Zhuravlev
 Alexey Borzov
 Alexey Pesternikov
 Alexey Simak
+Alexey Zakhlestin
 Alexis Carvalho
 Alfred Gebert
 Allen Pulsifer
@@ -66,6 +69,7 @@ Andy Tsouladze
 Angus Mackay
 Anthony Bryan
 Antoine Calando
+Anton Bychkov
 Anton Kalmykov
 Arkadiusz Miskiewicz
 Armel Asselin
@@ -140,6 +144,7 @@ Christophe Legry
 Christopher Conroy
 Christopher Palow
 Christopher R. Palmer
+Christopher Stone
 Ciprian Badescu
 Claes Jakobsson
 Clarence Gardner
@@ -225,6 +230,7 @@ Dmitry Rechkin
 Dolbneff A.V
 Domenico Andreoli
 Dominick Meglio
+Dominique Leuenberger
 Doug Kaufman
 Doug Porter
 Douglas E. Wegscheid
@@ -265,6 +271,7 @@ Erwin Authried
 Eugene Kotlyarov
 Evan Jordan
 Eygene Ryabinkin
+Fabian Hiernaux
 Fabian Keil
 Fabrizio Ammollo
 Fedor Karpelevitch
@@ -277,6 +284,7 @@ Frank Keeney
 Frank McGeough
 Frank Meier
 Frank Ticheler
+Frank Van Uffelen
 Fred Machado
 Fred New
 Fred Noz
@@ -306,6 +314,7 @@ Giuseppe Attardi
 Giuseppe D'Ambrosio
 Glen Nakamura
 Glen Scott
+Gokhan Sengun
 Grant Erickson
 Greg Hewgill
 Greg Morse
@@ -393,6 +402,7 @@ Jeffrey Pohlmeyer
 Jeremy Friesner
 Jerome Muffat-Meridol
 Jerome Vouillon
+Jerry Wu
 Jes Badwal
 Jesper Jensen
 Jesse Noller
@@ -442,6 +452,7 @@ Juergen Wilke
 Jukka Pihl
 Julian Noble
 Julien Chaffraix
+Julien Royer
 Jun-ichiro itojun Hagino
 Jurij Smakov
 Justin Fletcher
@@ -520,6 +531,7 @@ Marc Boucher
 Marc Kleine-Budde
 Marcel Roelofs
 Marcelo Juchem
+Marcin Adamski
 Marcin Konicki
 Marco G. Salvagno
 Marco Maggi
@@ -813,10 +825,12 @@ Sven Wegener
 S<EFBFBD>bastien Willemijns
 T. Bharath
 T. Yamada
+Taneli Vahakangas
 Tanguy Fautre
 Temprimus
 Thomas J. Moore
 Thomas Klausner
+Thomas L. Shinnick
 Thomas Lopatic
 Thomas Schwinge
 Thomas Tonino
@@ -825,6 +839,7 @@ Tim Baker
 Tim Bartley
 Tim Chen
 Tim Costello
+Tim Harder
 Tim Newsome
 Tim Sneddon
 Tinus van den Berg
@@ -840,6 +855,7 @@ Tom Mattison
 Tom Moers
 Tom Mueller
 Tom Regner
+Tom Wright
 Tom Zerucha
 Tomas Pospisek
 Tomas Szepe
@@ -869,6 +885,7 @@ Vincent Sanders
 Vincent Torri
 Vlad Grachov
 Vlad Ureche
+Vladimir Grishchenko
 Vladimir Lazarenko
 Vojtech Janota
 Vojtech Minarik
@@ -886,6 +903,7 @@ Xavier Bouchoux
 Yang Tse
 Yarram Sunil
 Yehoshua Hershberg
+Yukihiro Kawada
 Yuriy Sosov
 Yves Lejeune
 Zmey Petroff

include/curl/curlver.h

@@ -30,12 +30,12 @@
 
 /* This is the version number of the libcurl package from which this header
    file origins: */
-#define LIBCURL_VERSION "7.23.0-DEV"
+#define LIBCURL_VERSION "7.24.0-DEV"
 
 /* The numeric version number is also available "in parts" by using these
    defines: */
 #define LIBCURL_VERSION_MAJOR 7
-#define LIBCURL_VERSION_MINOR 23
+#define LIBCURL_VERSION_MINOR 24
 #define LIBCURL_VERSION_PATCH 0
 
 /* This is the numeric version of the libcurl version number, meant for easier
@@ -53,7 +53,7 @@
    and it is always a greater number in a more recent release. It makes
    comparisons with greater than and less than work.
 */
-#define LIBCURL_VERSION_NUM 0x071700
+#define LIBCURL_VERSION_NUM 0x071800
 
 /*
  * This is the date and time when the full source package was created. The

src/tool_doswin.c

@@ -285,8 +285,6 @@ CURLcode FindWin32CACert(struct Configurable *config, const char *bundle_file)
       if(!config->cacert)
         result = CURLE_OUT_OF_MEMORY;
     }
-    else
-      result = CURLE_SSL_CACERT;
 
     Curl_safefree(buf);
   }