From 6b5c8b82b575ae9e86906e8a6259be79caa57ba9 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 24 Jul 2008 02:38:00 +0000
Subject: [PATCH] 2008-07-24 03:42 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)    * contrib/hbcurl/hbcurl.c      ! Disabled string hashing for
 curl_formadd() with        CURLFORM_COPYNAME. I've misread the docs (sorry
 Przemek),        hashing is only needed for CURLFORM_PTRNAME, which we       
 currently don't use. I've disbled some code to avoid        unused function
 warnings, but other than that it may        be good to have the possibility
 for hashing for future        functions too.      ! Fixed/Added support for
 CURLFORM_COPYNAME parameter        with embedded zeroes by passing the string
 length        using CURLFORM_NAMELENGTH. Not tested.

---
 harbour/ChangeLog               | 13 +++++++++++++
 harbour/contrib/hbcurl/hbcurl.c | 29 ++++++++++++++++-------------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4374153e0d..522da11079 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,19 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-07-24 03:42 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * contrib/hbcurl/hbcurl.c
+     ! Disabled string hashing for curl_formadd() with
+       CURLFORM_COPYNAME. I've misread the docs (sorry Przemek), 
+       hashing is only needed for CURLFORM_PTRNAME, which we 
+       currently don't use. I've disbled some code to avoid 
+       unused function warnings, but other than that it may 
+       be good to have the possibility for hashing for future 
+       functions too.
+     ! Fixed/Added support for CURLFORM_COPYNAME parameter 
+       with embedded zeroes by passing the string length 
+       using CURLFORM_NAMELENGTH. Not tested.
+
 2008-07-23 21:43 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/hbsqlit3/sqlite3/sqlite3.c
     * pacified warnings
diff --git a/harbour/contrib/hbcurl/hbcurl.c b/harbour/contrib/hbcurl/hbcurl.c
index 3aa77e04bb..8f253677ba 100644
--- a/harbour/contrib/hbcurl/hbcurl.c
+++ b/harbour/contrib/hbcurl/hbcurl.c
@@ -52,11 +52,6 @@
  *
  */
 
-/* NOTE: Harbour requires libcurl 7.17.0 or upper.
-         This was the version where curl_easy_setopt() started to
-         make copies of passed strings, which we currently require.
-         [vszakats] */
-
 #include "curl/curl.h"
 #include "curl/types.h"
 #include "curl/easy.h"
@@ -74,8 +69,15 @@
 #define HB_CURL_OPT_BOOL( n )      ( ISLOG( n ) ? ( long ) hb_parl( n ) : ( ISNUM( n ) ? hb_parnl( n ) : 1 ) )
 #define HB_CURL_OPT_LARGENUM( n )  ( ( curl_off_t ) hb_parnint( n ) )
 
+/* NOTE: Harbour requires libcurl 7.17.0 or upper.
+         This was the version where curl_easy_setopt() started to
+         make copies of passed strings, which we currently require.
+         Update: This requirement is now sorted out by local string 
+                 buffering logic used with pre-7.17.0 versions of 
+                 libcurl.
+         [vszakats] */
+
 #if LIBCURL_VERSION_NUM < 0x071100
-   /* #error hbcurl: Harbour hbcurl needs libcurl 7.17.0 or upper. */
 #  ifndef HB_CURL_HASH_STRINGS
 #     define HB_CURL_HASH_STRINGS
 #  endif
@@ -120,16 +122,18 @@ typedef struct _HB_CURL
  * make own copy of passed strings
  */
 
+#ifdef HB_CURL_HASH_STRINGS
+
 #define HB_CURL_HASH_TABLE_SIZE    509UL
 
 /* returns a hash key */
-static HB_HASH_FUNC( hb_curl_HashKey )    /* ULONG func (void *Value, void *Cargo) */
+static HB_HASH_FUNC( hb_curl_HashKey )    /* ULONG func( void * Value, void * Cargo ) */
 {
    ULONG ulSum = 0;
-   char *szName = ( char * )Value;
+   char * szName = ( char * ) Value;
    
    while( *szName )
-     ulSum += *szName++;
+      ulSum += *szName++;
 
    HB_SYMBOL_UNUSED( HashPtr );
    HB_SYMBOL_UNUSED( Cargo );
@@ -150,7 +154,7 @@ static HB_HASH_FUNC( hb_curl_HashDel )
 static HB_HASH_FUNC( hb_curl_HashCmp )
 {
    HB_SYMBOL_UNUSED( HashPtr );
-   return strcmp( (char *)Value, (char *)Cargo );
+   return strcmp( ( char * ) Value, ( char * ) Cargo );
 }
 
 static const char * hb_curl_StrHashNew( PHB_CURL hb_curl, const char * szValue )
@@ -170,8 +174,6 @@ static const char * hb_curl_StrHashNew( PHB_CURL hb_curl, const char * szValue )
    return szHash;
 }
 
-#ifdef HB_CURL_HASH_STRINGS
-
 #  define hb_curl_StrHash( c, s )   hb_curl_StrHashNew( (c), (s) )
 
 #else
@@ -865,7 +867,8 @@ HB_FUNC( CURL_EASY_SETOPT )
 
                      curl_formadd( &hb_curl->pHTTPPOST_First,
                                    &hb_curl->pHTTPPOST_Last,
-                                   CURLFORM_COPYNAME, hb_curl_StrHashNew( hb_curl, hb_arrayGetCPtr( pSubArray, 1 ) ),
+                                   CURLFORM_COPYNAME, hb_arrayGetCPtr( pSubArray, 1 ),
+                                   CURLFORM_NAMELENGTH, hb_arrayGetCLen( pSubArray, 1 ),
                                    CURLFORM_FILE, hb_curl_StrHash( hb_curl, hb_arrayGetCPtr( pSubArray, 2 ) ),
                                    CURLFORM_END );
                   }