diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3b2094c4a7..8d734701a1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-08 01:33 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/hbcurl/hbcurl.c + * contrib/hbcurl/hbcurl.ch + + Added support for 7.19.0 features. + + * doc/whatsnew.txt + + Added recent changes. + 2008-09-07 01:44 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbcurl/make_vc.bat ! Fixed external .lib handling for MSVC. @@ -18,7 +26,7 @@ * contrib/hbhpdf/make_b32.bat * contrib/hbhpdf/make_vc.bat - + Added .lib/.dll support for libharu 2.1.0 + + Added .lib/.dll support for libharu 2.1.0 binary distribution version. 2008-09-06 12:38 UTC+0200 Viktor Szakats (harbour.01 syenar hu) diff --git a/harbour/contrib/hbcurl/hbcurl.c b/harbour/contrib/hbcurl/hbcurl.c index aaa38434c3..608d34eb86 100644 --- a/harbour/contrib/hbcurl/hbcurl.c +++ b/harbour/contrib/hbcurl/hbcurl.c @@ -790,6 +790,11 @@ HB_FUNC( CURL_EASY_SETOPT ) case HB_CURLOPT_TCP_NODELAY: res = curl_easy_setopt( hb_curl->curl, CURLOPT_TCP_NODELAY, HB_CURL_OPT_BOOL( 3 ) ); break; +#if LIBCURL_VERSION_NUM > 0x071300 + case HB_CURLOPT_ADDRESS_SCOPE: + res = curl_easy_setopt( hb_curl->curl, CURLOPT_ADDRESS_SCOPE, hb_parnl( 3 ) ); + break; +#endif /* Names and passwords options (Authentication) */ @@ -1228,6 +1233,14 @@ HB_FUNC( CURL_EASY_SETOPT ) res = curl_easy_setopt( hb_curl->curl, CURLOPT_KRB4LEVEL, hb_curl_StrHash( hb_curl, hb_parc( 3 ) ) ); #endif break; +#if LIBCURL_VERSION_NUM > 0x071300 + case HB_CURLOPT_CRLFILE: + res = curl_easy_setopt( hb_curl->curl, CURLOPT_CRLFILE, hb_curl_StrHash( hb_curl, hb_parc( 3 ) ) ); + break; + case HB_CURLOPT_ISSUERCERT: + res = curl_easy_setopt( hb_curl->curl, CURLOPT_ISSUERCERT, hb_curl_StrHash( hb_curl, hb_parc( 3 ) ) ); + break; +#endif /* SSH options */ @@ -1599,6 +1612,18 @@ HB_FUNC( CURL_EASY_GETINFO ) #endif type = HB_CURL_INFO_TYPE_STR; break; + case HB_CURLINFO_PRIMARY_IP: +#if LIBCURL_VERSION_NUM >= 0x071300 + res = HB_CURL_EASY_GETINFO( hb_curl, CURLINFO_PRIMARY_IP, &ret_string ); +#endif + type = HB_CURL_INFO_TYPE_STR; + break; + case HB_CURLINFO_APPCONNECT_TIME: +#if LIBCURL_VERSION_NUM >= 0x071300 + res = HB_CURL_EASY_GETINFO( hb_curl, CURLINFO_APPCONNECT_TIME, &ret_double ); +#endif + type = HB_CURL_INFO_TYPE_DOUBLE; + break; } switch( type ) diff --git a/harbour/contrib/hbcurl/hbcurl.ch b/harbour/contrib/hbcurl/hbcurl.ch index c9b5844c23..b6f6ae00a1 100644 --- a/harbour/contrib/hbcurl/hbcurl.ch +++ b/harbour/contrib/hbcurl/hbcurl.ch @@ -52,6 +52,8 @@ * */ +/* NOTE: This file is also used by C code. */ + #ifndef HBCURL_CH_ #define HBCURL_CH_ @@ -219,6 +221,9 @@ #define HB_CURLOPT_PROXY_TRANSFER_MODE 166 #define HB_CURLOPT_SEEKFUNCTION 167 #define HB_CURLOPT_SEEKDATA 168 +#define HB_CURLOPT_CRLFILE 169 +#define HB_CURLOPT_ISSUERCERT 170 +#define HB_CURLOPT_ADDRESS_SCOPE 171 #define HB_CURLOPT_DOWNLOAD 1001 /* Harbour special ones */ #define HB_CURLOPT_PROGRESSBLOCK 1002 #define HB_CURLOPT_UL_FILE_SETUP 1003 @@ -359,6 +364,8 @@ #define HB_CURLINFO_COOKIELIST 29 #define HB_CURLINFO_LASTSOCKET 30 #define HB_CURLINFO_FTP_ENTRY_PATH 31 +#define HB_CURLINFO_PRIMARY_IP 32 +#define HB_CURLINFO_APPCONNECT_TIME 33 /* curl result codes. */ @@ -445,5 +452,7 @@ #define HB_CURLE_SSH 79 /* error from the SSH layer, somewhat generic so the error message will be of interest when this has happened */ #define HB_CURLE_SSL_SHUTDOWN_FAILED 80 /* Failed to shut down the SSL connection */ #define HB_CURLE_AGAIN 81 /* socket is not ready for send/recv, wait till it's ready and try again */ +#define HB_CURLE_SSL_CRL_BADFILE 82 /* could not load CRL file, missing or wrong format (Added in 7.19.0) */ +#define HB_CURLE_SSL_ISSUER_ERROR 83 /* Issuer check failed. (Added in 7.19.0) */ #endif /* HBCURL_CH_ */ diff --git a/harbour/doc/whatsnew.txt b/harbour/doc/whatsnew.txt index c04a9e6205..ddc6b7df48 100644 --- a/harbour/doc/whatsnew.txt +++ b/harbour/doc/whatsnew.txt @@ -143,7 +143,7 @@ Core - Bad workaround added for Pelles C 5.00.1 in AMD64 mode to compile the Harbour 'inet' subsystem. It won't properly work, but it lets build the rest of Harbour (like hbrun.exe). -- PCRE lib upgraded to 7.8 RC1 (from 7.7) +- PCRE lib upgraded to 7.8 (from 7.7) - Fixed dbInfo( DBI_POSITIONED ) returned value. - Fixed internal error in dirty index reading. - Fixed return value of HB_INETGETSNDBUFSIZE(). @@ -195,6 +195,8 @@ Contrib fixes some potential leaks and GPFs. This code could use some more testing, be aware. - hbbmcdx fixed internal error in dirty index reading. +- hbcurl added support for libcurl 7.19.0 features. +- hbhpdf added support for libharu 2.1.0. Known build issues =============================