removed tabs and trailing whitespace from source

4 files changed, 498 insertions, 498 deletions

diff --git a/docs/MANUAL b/docs/MANUAL
index 7ea420d45..7eac93a00 100644
--- a/docs/MANUAL
+++ b/docs/MANUAL
@@ -580,11 +580,11 @@ NETWORK INTERFACE
 
   Get a web page from a server using a specified port for the interface:
 
-	curl --interface eth0:1 http://www.netscape.com/
+        curl --interface eth0:1 http://www.netscape.com/
 
   or
 
-	curl --interface 192.168.1.10 http://www.netscape.com/
+        curl --interface 192.168.1.10 http://www.netscape.com/
 
 HTTPS
 
diff --git a/docs/examples/curlx.c b/docs/examples/curlx.c
index c5aabd344..2bb9a064d 100644
--- a/docs/examples/curlx.c
+++ b/docs/examples/curlx.c
@@ -1,4 +1,4 @@
-/* 
+/*
   curlx.c  Authors: Peter Sylvester, Jean-Paul Merlin
 
   This is a little program to demonstrate the usage of
@@ -6,7 +6,7 @@
   - an ssl initialisation callback setting a user key and trustbases
     coming from a pkcs12 file
   - using an ssl application callback to find a URI in the
-    certificate presented during ssl session establishment. 
+    certificate presented during ssl session establishment.
 
 */
 
@@ -20,13 +20,13 @@
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions, the following disclaimer,
- *    and the original OpenSSL and SSLeay Licences below. 
+ *    and the original OpenSSL and SSLeay Licences below.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions, the following disclaimer 
+ *    notice, this list of conditions, the following disclaimer
  *    and the original OpenSSL and SSLeay Licences below in
  *    the documentation and/or other materials provided with the
- *    distribution. 
+ *    distribution.
  *
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgments:
@@ -100,7 +100,7 @@ static char *curlx_usage[]={
 " -envpass arg     - environement variable which content the tia private key password",
 " -out arg         - output file (response)- default stdout",
 " -in arg          - input file (request)- default stdin",
-" -connect arg     - URL of the server for the connection ex: www.openevidenve.org", 
+" -connect arg     - URL of the server for the connection ex: www.openevidenve.org",
 " -mimetype arg    - MIME type for data in ex : application/timestamp-query or application/dvcs -default application/timestamp-query",
 " -acceptmime arg  - MIME type acceptable for the response ex : application/timestamp-response or application/dvcs -default none",
 " -accesstype arg  - an Object identifier in an AIA/SIA method, e.g. AD_DVCS or ad_timestamping",
@@ -109,7 +109,7 @@ NULL
 
 /*
 
-  ./curlx -p12 psy.p12 -envpass XX -in request -verbose -accesstype AD_DVCS 
+  ./curlx -p12 psy.p12 -envpass XX -in request -verbose -accesstype AD_DVCS
   -mimetype application/dvcs -acceptmime application/dvcs -out response
 
 */
@@ -134,33 +134,33 @@ typedef struct sslctxparm_st {
 
 static char *i2s_ASN1_IA5STRING( ASN1_IA5STRING *ia5)
 {
-	char *tmp;
-	if(!ia5 || !ia5->length) return NULL;
-	tmp = OPENSSL_malloc(ia5->length + 1);
-	memcpy(tmp, ia5->data, ia5->length);
-	tmp[ia5->length] = 0;
-	return tmp;
+        char *tmp;
+        if(!ia5 || !ia5->length) return NULL;
+        tmp = OPENSSL_malloc(ia5->length + 1);
+        memcpy(tmp, ia5->data, ia5->length);
+        tmp[ia5->length] = 0;
+        return tmp;
 }
 
 /* A conveniance routine to get an access URI. */
 
 static unsigned char *my_get_ext(X509 * cert, const int type, int extensiontype) {
 
-	int i;
-	STACK_OF(ACCESS_DESCRIPTION) * accessinfo ;
-	accessinfo =  X509_get_ext_d2i(cert, extensiontype, NULL, NULL) ;
-
-	if (!sk_ACCESS_DESCRIPTION_num(accessinfo)) return NULL;
-	for (i = 0; i < sk_ACCESS_DESCRIPTION_num(accessinfo); i++) {
-		ACCESS_DESCRIPTION * ad = sk_ACCESS_DESCRIPTION_value(accessinfo, i);
-		if (OBJ_obj2nid(ad->method) == type) {
-			if (ad->location->type == GEN_URI) {
-				return i2s_ASN1_IA5STRING(ad->location->d.ia5);
-			}
-			return NULL;
-		}
-	}	
-	return NULL;
+        int i;
+        STACK_OF(ACCESS_DESCRIPTION) * accessinfo ;
+        accessinfo =  X509_get_ext_d2i(cert, extensiontype, NULL, NULL) ;
+
+        if (!sk_ACCESS_DESCRIPTION_num(accessinfo)) return NULL;
+        for (i = 0; i < sk_ACCESS_DESCRIPTION_num(accessinfo); i++) {
+                ACCESS_DESCRIPTION * ad = sk_ACCESS_DESCRIPTION_value(accessinfo, i);
+                if (OBJ_obj2nid(ad->method) == type) {
+                        if (ad->location->type == GEN_URI) {
+                                return i2s_ASN1_IA5STRING(ad->location->d.ia5);
+                        }
+                        return NULL;
+                }
+        }
+        return NULL;
 }
 
 /* This is an application verification call back, it does not
@@ -170,192 +170,192 @@ static unsigned char *my_get_ext(X509 * cert, const int type, int extensiontype)
 */
 
 static int ssl_app_verify_callback(X509_STORE_CTX *ctx, void *arg) {
-	sslctxparm * p = (sslctxparm *) arg;
-	int ok;
-
-	if (p->verbose > 2) BIO_printf(p->errorbio,"entering ssl_app_verify_callback\n"); 
-	if ((ok= X509_verify_cert(ctx)) && ctx->cert) {
-		unsigned char * accessinfo ;
-		if (p->verbose > 1) X509_print_ex(p->errorbio,ctx->cert,0,0); 
-		if (accessinfo = my_get_ext(ctx->cert,p->accesstype ,NID_sinfo_access)) {
-        		if (p->verbose) BIO_printf(p->errorbio,"Setting URL from SIA to: %s\n",accessinfo); 
-			curl_easy_setopt(p->curl, CURLOPT_URL,accessinfo);
-		} else 	if (accessinfo = my_get_ext(ctx->cert,p->accesstype ,NID_info_access)) {
-        		if (p->verbose) BIO_printf(p->errorbio,"Setting URL from AIA to: %s\n",accessinfo); 
-			curl_easy_setopt(p->curl, CURLOPT_URL,accessinfo);
-		} 
-	}
-	if (p->verbose > 2) BIO_printf(p->errorbio,"leaving ssl_app_verify_callback with %d\n",ok); 
-	return(ok);
+        sslctxparm * p = (sslctxparm *) arg;
+        int ok;
+
+        if (p->verbose > 2) BIO_printf(p->errorbio,"entering ssl_app_verify_callback\n");
+        if ((ok= X509_verify_cert(ctx)) && ctx->cert) {
+                unsigned char * accessinfo ;
+                if (p->verbose > 1) X509_print_ex(p->errorbio,ctx->cert,0,0);
+                if (accessinfo = my_get_ext(ctx->cert,p->accesstype ,NID_sinfo_access)) {
+                        if (p->verbose) BIO_printf(p->errorbio,"Setting URL from SIA to: %s\n",accessinfo);
+                        curl_easy_setopt(p->curl, CURLOPT_URL,accessinfo);
+                } else  if (accessinfo = my_get_ext(ctx->cert,p->accesstype ,NID_info_access)) {
+                        if (p->verbose) BIO_printf(p->errorbio,"Setting URL from AIA to: %s\n",accessinfo);
+                        curl_easy_setopt(p->curl, CURLOPT_URL,accessinfo);
+                }
+        }
+        if (p->verbose > 2) BIO_printf(p->errorbio,"leaving ssl_app_verify_callback with %d\n",ok);
+        return(ok);
 }
 
 
 /* This is an example of an curl SSL initialisation call back. The callback sets:
-  - a private key and certificate 
+  - a private key and certificate
   - a trusted ca certificate
   - a preferred cipherlist
   - an application verification callback (the function above)
 */
 
 static CURLcode sslctxfun(CURL * curl, void * sslctx, void * parm) {
-      
-	sslctxparm * p = (sslctxparm *) parm;
-	SSL_CTX * ctx = (SSL_CTX *) sslctx ;
-
-	if (!SSL_CTX_use_certificate(ctx,p->usercert)) {
-		BIO_printf(p->errorbio, "SSL_CTX_use_certificate problem\n"); goto err;
-	}
-	if (!SSL_CTX_use_PrivateKey(ctx,p->pkey)) {
-		BIO_printf(p->errorbio, "SSL_CTX_use_PrivateKey\n"); goto err;
-	}
-		
-	if (!SSL_CTX_check_private_key(ctx)) {
-		BIO_printf(p->errorbio, "SSL_CTX_check_private_key\n"); goto err;
-	}
-		
-	SSL_CTX_set_quiet_shutdown(ctx,1);
-	SSL_CTX_set_cipher_list(ctx,"RC4-MD5");
-	SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
-
-	X509_STORE_add_cert(ctx->cert_store,sk_X509_value(p->ca,sk_X509_num(p->ca)-1)); 
-
-	SSL_CTX_set_verify_depth(ctx,2);
-	
-	SSL_CTX_set_verify(ctx,SSL_VERIFY_PEER,NULL); 
-
-	SSL_CTX_set_cert_verify_callback(ctx, ssl_app_verify_callback, parm); 
-
-  
-	return CURLE_OK ;
-err: 
- 	ERR_print_errors(p->errorbio);
-	return CURLE_SSL_CERTPROBLEM;
+
+        sslctxparm * p = (sslctxparm *) parm;
+        SSL_CTX * ctx = (SSL_CTX *) sslctx ;
+
+        if (!SSL_CTX_use_certificate(ctx,p->usercert)) {
+                BIO_printf(p->errorbio, "SSL_CTX_use_certificate problem\n"); goto err;
+        }
+        if (!SSL_CTX_use_PrivateKey(ctx,p->pkey)) {
+                BIO_printf(p->errorbio, "SSL_CTX_use_PrivateKey\n"); goto err;
+        }
+
+        if (!SSL_CTX_check_private_key(ctx)) {
+                BIO_printf(p->errorbio, "SSL_CTX_check_private_key\n"); goto err;
+        }
+
+        SSL_CTX_set_quiet_shutdown(ctx,1);
+        SSL_CTX_set_cipher_list(ctx,"RC4-MD5");
+        SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
+
+        X509_STORE_add_cert(ctx->cert_store,sk_X509_value(p->ca,sk_X509_num(p->ca)-1));
+
+        SSL_CTX_set_verify_depth(ctx,2);
+
+        SSL_CTX_set_verify(ctx,SSL_VERIFY_PEER,NULL);
+
+        SSL_CTX_set_cert_verify_callback(ctx, ssl_app_verify_callback, parm);
+
+
+        return CURLE_OK ;
+err:
+        ERR_print_errors(p->errorbio);
+        return CURLE_SSL_CERTPROBLEM;
 
 }
 
 int main(int argc, char **argv) {
 
-	BIO* in=NULL;
-	BIO* out=NULL;
-
-   
-	char * outfile = NULL;
-	char * infile = NULL ;
-
-	int tabLength=100;
-	char *binaryptr;
-	char* mimetype;
-	char* mimetypeaccept=NULL;
-	char* contenttype;
-	char** pp;
-   	unsigned char* hostporturl = NULL;
-   	binaryptr=(char*)malloc(tabLength);
- 	BIO * p12bio ;
- 	char **args = argv + 1;
-	unsigned char * serverurl;
-	sslctxparm p;
-	char *response;
-	p.verbose = 0;
-
-	CURLcode res;
-	struct curl_slist * headers=NULL;
-
-   	p.errorbio = BIO_new_fp (stderr, BIO_NOCLOSE);
-
- 	curl_global_init(CURL_GLOBAL_DEFAULT);
- 
+        BIO* in=NULL;
+        BIO* out=NULL;
+
+
+        char * outfile = NULL;
+        char * infile = NULL ;
+
+        int tabLength=100;
+        char *binaryptr;
+        char* mimetype;
+        char* mimetypeaccept=NULL;
+        char* contenttype;
+        char** pp;
+        unsigned char* hostporturl = NULL;
+        binaryptr=(char*)malloc(tabLength);
+        BIO * p12bio ;
+        char **args = argv + 1;
+        unsigned char * serverurl;
+        sslctxparm p;
+        char *response;
+        p.verbose = 0;
+
+        CURLcode res;
+        struct curl_slist * headers=NULL;
+
+        p.errorbio = BIO_new_fp (stderr, BIO_NOCLOSE);
+
+        curl_global_init(CURL_GLOBAL_DEFAULT);
+
 /* we need some more for the P12 decoding */
 
         OpenSSL_add_all_ciphers();
-        OpenSSL_add_all_digests(); 
-	ERR_load_crypto_strings();
-
-
-	int badarg=0;
-
-	while (*args && *args[0] == '-') {
-		if (!strcmp (*args, "-in")) {
-			if (args[1]) {
-				infile=*(++args);			  
-			} else badarg=1;
-		} else if (!strcmp (*args, "-out")) {
-			if (args[1]) {
-				outfile=*(++args);
-			} else badarg=1;
-		} else if (!strcmp (*args, "-p12")) {
-			if (args[1]) {
-				p.p12file = *(++args);
-			} else badarg=1;
-		} else if (strcmp(*args,"-envpass") == 0) {
-			if (args[1]) {
-				p.pst = getenv(*(++args));
-			} else badarg=1;
-		} else if (strcmp(*args,"-connect") == 0) {
-			if (args[1]) {
-				hostporturl = *(++args);
-			} else badarg=1;
-		} else if (strcmp(*args,"-mimetype") == 0) {
-			if (args[1]) {
-				mimetype = *(++args);
-			} else badarg=1; 
-		} else if (strcmp(*args,"-acceptmime") == 0) {
-			if (args[1]) {
-				mimetypeaccept = *(++args);
-			} else badarg=1; 
-		} else if (strcmp(*args,"-accesstype") == 0) {
-			if (args[1]) {
-				if ((p.accesstype = OBJ_obj2nid(OBJ_txt2obj(*++args,0))) == 0) badarg=1;
-		 	} else badarg=1; 
-		} else if (strcmp(*args,"-verbose") == 0) {
-			p.verbose++;
-		} else badarg=1;
-		args++;
-	}
-   
-	if (mimetype==NULL || mimetypeaccept == NULL) badarg = 1;
- 
-	if (badarg) {
-		for (pp=curlx_usage; (*pp != NULL); pp++)
-			BIO_printf(p.errorbio,"%s\n",*pp);
-		BIO_printf(p.errorbio,"\n");
-		goto err;
-	}
-
-
-  
-	/* set input */
-   
-	if ((in=BIO_new(BIO_s_file())) == NULL) {
-		BIO_printf(p.errorbio, "Error setting input bio\n");
-		goto err;
-	} else if (infile == NULL)
-		BIO_set_fp(in,stdin,BIO_NOCLOSE|BIO_FP_TEXT);
-	else if (BIO_read_filename(in,infile) <= 0) {
-		BIO_printf(p.errorbio, "Error opening input file %s\n", infile);
-		BIO_free(in);
-		goto err;
-	}
-   
-	/* set output  */
-     
-	if ((out=BIO_new(BIO_s_file())) == NULL) {
-		BIO_printf(p.errorbio, "Error setting output bio.\n");
-		goto err;
-	} else if (outfile == NULL)
-		BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
-	else if (BIO_write_filename(out,outfile) <= 0) {
-		BIO_printf(p.errorbio, "Error opening output file %s\n", outfile);
-		BIO_free(out);
- 		goto err;
-	}
-
-
-  	p.errorbio = BIO_new_fp (stderr, BIO_NOCLOSE);
-  
-  	if (!(p.curl = curl_easy_init())) {
-		BIO_printf(p.errorbio, "Cannot init curl lib\n");
-		goto err;
-  	} 
+        OpenSSL_add_all_digests();
+        ERR_load_crypto_strings();
+
+
+        int badarg=0;
+
+        while (*args && *args[0] == '-') {
+                if (!strcmp (*args, "-in")) {
+                        if (args[1]) {
+                                infile=*(++args);
+                        } else badarg=1;
+                } else if (!strcmp (*args, "-out")) {
+                        if (args[1]) {
+                                outfile=*(++args);
+                        } else badarg=1;
+                } else if (!strcmp (*args, "-p12")) {
+                        if (args[1]) {
+                                p.p12file = *(++args);
+                        } else badarg=1;
+                } else if (strcmp(*args,"-envpass") == 0) {
+                        if (args[1]) {
+                                p.pst = getenv(*(++args));
+                        } else badarg=1;
+                } else if (strcmp(*args,"-connect") == 0) {
+                        if (args[1]) {
+                                hostporturl = *(++args);
+                        } else badarg=1;
+                } else if (strcmp(*args,"-mimetype") == 0) {
+                        if (args[1]) {
+                                mimetype = *(++args);
+                        } else badarg=1;
+                } else if (strcmp(*args,"-acceptmime") == 0) {
+                        if (args[1]) {
+                                mimetypeaccept = *(++args);
+                        } else badarg=1;
+                } else if (strcmp(*args,"-accesstype") == 0) {
+                        if (args[1]) {
+                                if ((p.accesstype = OBJ_obj2nid(OBJ_txt2obj(*++args,0))) == 0) badarg=1;
+                        } else badarg=1;
+                } else if (strcmp(*args,"-verbose") == 0) {
+                        p.verbose++;
+                } else badarg=1;
+                args++;
+        }
+
+        if (mimetype==NULL || mimetypeaccept == NULL) badarg = 1;
+
+        if (badarg) {
+                for (pp=curlx_usage; (*pp != NULL); pp++)
+                        BIO_printf(p.errorbio,"%s\n",*pp);
+                BIO_printf(p.errorbio,"\n");
+                goto err;
+        }
+
+
+
+        /* set input */
+
+        if ((in=BIO_new(BIO_s_file())) == NULL) {
+                BIO_printf(p.errorbio, "Error setting input bio\n");
+                goto err;
+        } else if (infile == NULL)
+                BIO_set_fp(in,stdin,BIO_NOCLOSE|BIO_FP_TEXT);
+        else if (BIO_read_filename(in,infile) <= 0) {
+                BIO_printf(p.errorbio, "Error opening input file %s\n", infile);
+                BIO_free(in);
+                goto err;
+        }
+
+        /* set output  */
+
+        if ((out=BIO_new(BIO_s_file())) == NULL) {
+                BIO_printf(p.errorbio, "Error setting output bio.\n");
+                goto err;
+        } else if (outfile == NULL)
+                BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
+        else if (BIO_write_filename(out,outfile) <= 0) {
+                BIO_printf(p.errorbio, "Error opening output file %s\n", outfile);
+                BIO_free(out);
+                goto err;
+        }
+
+
+        p.errorbio = BIO_new_fp (stderr, BIO_NOCLOSE);
+
+        if (!(p.curl = curl_easy_init())) {
+                BIO_printf(p.errorbio, "Cannot init curl lib\n");
+                goto err;
+        }
 
 
 
@@ -365,112 +365,112 @@ int main(int argc, char **argv) {
         if (!(p.p12 = d2i_PKCS12_bio (p12bio, NULL))) {
                 BIO_printf(p.errorbio, "Cannot decode P12 structure %s\n", p.p12file); goto err;
         }
-	
-	p.ca= NULL;
-	if (!(PKCS12_parse (p.p12, p.pst, &(p.pkey), &(p.usercert), &(p.ca) ) )) {
+
+        p.ca= NULL;
+        if (!(PKCS12_parse (p.p12, p.pst, &(p.pkey), &(p.usercert), &(p.ca) ) )) {
                 BIO_printf(p.errorbio,"Invalid P12 structure in %s\n", p.p12file); goto err;
-	}
+        }
 
-	if (sk_X509_num(p.ca) <= 0) {
+        if (sk_X509_num(p.ca) <= 0) {
                 BIO_printf(p.errorbio,"No trustworthy CA given.%s\n", p.p12file); goto err;
-	}
-
-	if (p.verbose > 1) X509_print_ex(p.errorbio,p.usercert,0,0); 
-
-	/* determine URL to go */
-
-	if (hostporturl) {
-		serverurl=(char*) malloc(9+strlen(hostporturl));
-	  	sprintf(serverurl,"https://%s",hostporturl);
-	} else if (p.accesstype != 0) { /* see whether we can find an AIA or SIA for a given access type */
-		if (!(serverurl = my_get_ext(p.usercert,p.accesstype,NID_info_access))) {
-			BIO_printf(p.errorbio,"no service URL in user cert cherching in others certificats\n"); 
-			int j=0;
-			int find=0;
-			for (j=0;j<sk_X509_num(p.ca);j++) {
-	      			if ((serverurl = my_get_ext(sk_X509_value(p.ca,j),p.accesstype,NID_info_access))) break; 
-	      			if ((serverurl = my_get_ext(sk_X509_value(p.ca,j),p.accesstype,NID_sinfo_access))) break; 
-	 		}
-		}
-	}
-
-	if (!serverurl) { 
-	       BIO_printf(p.errorbio, "no service URL in certificats, check '-accesstype (AD_DVCS | ad_timestamping)' or use '-connect'\n"); goto err;
-	}
-	
-	if (p.verbose) BIO_printf(p.errorbio, "Service URL: <%s>\n", serverurl);
-	curl_easy_setopt(p.curl, CURLOPT_URL, serverurl);
- 
-	/* Now specify the POST binary data */
-
-	curl_easy_setopt(p.curl, CURLOPT_POSTFIELDS, binaryptr);
-     	curl_easy_setopt(p.curl, CURLOPT_POSTFIELDSIZE,tabLength);
-  
-	/* pass our list of custom made headers */
-
-	contenttype=(char*) malloc(15+strlen(mimetype));
-	sprintf(contenttype,"Content-type: %s",mimetype);
-    	headers = curl_slist_append(headers,contenttype);
-	curl_easy_setopt(p.curl, CURLOPT_HTTPHEADER, headers); 
-
-	if (p.verbose) BIO_printf(p.errorbio, "Service URL: <%s>\n", serverurl);
-
-	{
-		FILE *outfp;
-		BIO_get_fp(out,&outfp);
-		curl_easy_setopt(p.curl, CURLOPT_FILE,outfp); 
-        } 
-
-    	res = curl_easy_setopt(p.curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun)  ; 
-
-    	if (res != CURLE_OK) 
-		BIO_printf(p.errorbio,"%d %s=%d %d\n", __LINE__, "CURLOPT_SSL_CTX_FUNCTION",CURLOPT_SSL_CTX_FUNCTION,res);
-   
-	curl_easy_setopt(p.curl, CURLOPT_SSL_CTX_DATA, &p);  
-
-	{
-		int lu; int i=0;
-		while ((lu = BIO_read (in,&binaryptr[i],tabLength-i)) >0 ) {
-			i+=lu;
-			if (i== tabLength) {
-				tabLength+=100;
-				binaryptr=(char*)realloc(binaryptr,tabLength); /* should be more careful */
-			}
-		}
-		tabLength = i;
-	}
-	/* Now specify the POST binary data */
-
-	curl_easy_setopt(p.curl, CURLOPT_POSTFIELDS, binaryptr);
-     	curl_easy_setopt(p.curl, CURLOPT_POSTFIELDSIZE,tabLength);
-
- 
+        }
+
+        if (p.verbose > 1) X509_print_ex(p.errorbio,p.usercert,0,0);
+
+        /* determine URL to go */
+
+        if (hostporturl) {
+                serverurl=(char*) malloc(9+strlen(hostporturl));
+                sprintf(serverurl,"https://%s",hostporturl);
+        } else if (p.accesstype != 0) { /* see whether we can find an AIA or SIA for a given access type */
+                if (!(serverurl = my_get_ext(p.usercert,p.accesstype,NID_info_access))) {
+                        BIO_printf(p.errorbio,"no service URL in user cert cherching in others certificats\n");
+                        int j=0;
+                        int find=0;
+                        for (j=0;j<sk_X509_num(p.ca);j++) {
+                                if ((serverurl = my_get_ext(sk_X509_value(p.ca,j),p.accesstype,NID_info_access))) break;
+                                if ((serverurl = my_get_ext(sk_X509_value(p.ca,j),p.accesstype,NID_sinfo_access))) break;
+                        }
+                }
+        }
+
+        if (!serverurl) {
+               BIO_printf(p.errorbio, "no service URL in certificats, check '-accesstype (AD_DVCS | ad_timestamping)' or use '-connect'\n"); goto err;
+        }
+
+        if (p.verbose) BIO_printf(p.errorbio, "Service URL: <%s>\n", serverurl);
+        curl_easy_setopt(p.curl, CURLOPT_URL, serverurl);
+
+        /* Now specify the POST binary data */
+
+        curl_easy_setopt(p.curl, CURLOPT_POSTFIELDS, binaryptr);
+        curl_easy_setopt(p.curl, CURLOPT_POSTFIELDSIZE,tabLength);
+
+        /* pass our list of custom made headers */
+
+        contenttype=(char*) malloc(15+strlen(mimetype));
+        sprintf(contenttype,"Content-type: %s",mimetype);
+        headers = curl_slist_append(headers,contenttype);
+        curl_easy_setopt(p.curl, CURLOPT_HTTPHEADER, headers);
+
+        if (p.verbose) BIO_printf(p.errorbio, "Service URL: <%s>\n", serverurl);
+
+        {
+                FILE *outfp;
+                BIO_get_fp(out,&outfp);
+                curl_easy_setopt(p.curl, CURLOPT_FILE,outfp);
+        }
+
+        res = curl_easy_setopt(p.curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun)  ;
+
+        if (res != CURLE_OK)
+                BIO_printf(p.errorbio,"%d %s=%d %d\n", __LINE__, "CURLOPT_SSL_CTX_FUNCTION",CURLOPT_SSL_CTX_FUNCTION,res);
+
+        curl_easy_setopt(p.curl, CURLOPT_SSL_CTX_DATA, &p);
+
+        {
+                int lu; int i=0;
+                while ((lu = BIO_read (in,&binaryptr[i],tabLength-i)) >0 ) {
+                        i+=lu;
+                        if (i== tabLength) {
+                                tabLength+=100;
+                                binaryptr=(char*)realloc(binaryptr,tabLength); /* should be more careful */
+                        }
+                }
+                tabLength = i;
+        }
+        /* Now specify the POST binary data */
+
+        curl_easy_setopt(p.curl, CURLOPT_POSTFIELDS, binaryptr);
+        curl_easy_setopt(p.curl, CURLOPT_POSTFIELDSIZE,tabLength);
+
+
     /* Perform the request, res will get the return code */
 
-	BIO_printf(p.errorbio,"%d %s %d\n", __LINE__, "curl_easy_perform", res = curl_easy_perform(p.curl));
+        BIO_printf(p.errorbio,"%d %s %d\n", __LINE__, "curl_easy_perform", res = curl_easy_perform(p.curl));
         {
-    		int result =curl_easy_getinfo(p.curl,CURLINFO_CONTENT_TYPE,&response);
-    		if( mimetypeaccept && p.verbose)   
-     			 if(!strcmp(mimetypeaccept,response)) 
-			BIO_printf(p.errorbio,"the response has a correct mimetype : %s\n",response);
-      		else
-			BIO_printf(p.errorbio,"the reponse doesn\'t has an acceptable mime type, it is %s instead of %s\n",response,mimetypeaccept);
-	}
+                int result =curl_easy_getinfo(p.curl,CURLINFO_CONTENT_TYPE,&response);
+                if( mimetypeaccept && p.verbose)
+                         if(!strcmp(mimetypeaccept,response))
+                        BIO_printf(p.errorbio,"the response has a correct mimetype : %s\n",response);
+                else
+                        BIO_printf(p.errorbio,"the reponse doesn\'t has an acceptable mime type, it is %s instead of %s\n",response,mimetypeaccept);
+        }
 
-    /*** code d'erreur si accept mime ***, egalement code return HTTP != 200 ***/ 
+    /*** code d'erreur si accept mime ***, egalement code return HTTP != 200 ***/
 
 /* free the header list*/
 
     curl_slist_free_all(headers);
- 
+
     /* always cleanup */
     curl_easy_cleanup(p.curl);
-   
+
     BIO_free(in);
     BIO_free(out);
     return (EXIT_SUCCESS);
-    
-    
+
+
  err: BIO_printf(p.errorbio,"error");
      exit(1);
 }
diff --git a/docs/examples/fopen.c b/docs/examples/fopen.c
index eb5501628..88729e72d 100644
--- a/docs/examples/fopen.c
+++ b/docs/examples/fopen.c
@@ -55,16 +55,16 @@ enum fcurl_type_e { CFTYPE_NONE=0, CFTYPE_FILE=1, CFTYPE_CURL=2 };
 
 struct fcurl_data
 {
-    enum fcurl_type_e type;	/* type of handle */
+    enum fcurl_type_e type;     /* type of handle */
     union {
-	CURL *curl;
-	FILE *file;
-    } handle;			/* handle */
-
-    char *buffer;		/* buffer to store cached data*/
-    int buffer_len;		/* currently allocated buffers length */
-    int buffer_pos;		/* end of data in buffer*/
-    int still_running;		/* Is background url fetch still in progress */
+        CURL *curl;
+        FILE *file;
+    } handle;                   /* handle */
+
+    char *buffer;               /* buffer to store cached data*/
+    int buffer_len;             /* currently allocated buffers length */
+    int buffer_pos;             /* end of data in buffer*/
+    int still_running;          /* Is background url fetch still in progress */
 };
 
 typedef struct fcurl_data URL_FILE;
@@ -83,9 +83,9 @@ CURLM *multi_handle;
 /* curl calls this routine to get more data */
 static size_t
 write_callback(char *buffer,
-	       size_t size,
-	       size_t nitems,
-	       void *userp)
+               size_t size,
+               size_t nitems,
+               void *userp)
 {
     char *newbuff;
     int rembuff;
@@ -97,21 +97,21 @@ write_callback(char *buffer,
 
     if(size > rembuff)
     {
-	//not enuf space in buffer
-	newbuff=realloc(url->buffer,url->buffer_len + (size - rembuff));
-	if(newbuff==NULL)
-	{
-	    fprintf(stderr,"callback buffer grow failed\n");
-	    size=rembuff;
-	}
-	else
-	{
-	    /* realloc suceeded increase buffer size*/
-	    url->buffer_len+=size - rembuff;
-	    url->buffer=newbuff;
-
-	    /*printf("Callback buffer grown to %d bytes\n",url->buffer_len);*/
-	}
+        //not enuf space in buffer
+        newbuff=realloc(url->buffer,url->buffer_len + (size - rembuff));
+        if(newbuff==NULL)
+        {
+            fprintf(stderr,"callback buffer grow failed\n");
+            size=rembuff;
+        }
+        else
+        {
+            /* realloc suceeded increase buffer size*/
+            url->buffer_len+=size - rembuff;
+            url->buffer=newbuff;
+
+            /*printf("Callback buffer grown to %d bytes\n",url->buffer_len);*/
+        }
     }
 
     memcpy(&url->buffer[url->buffer_pos], buffer, size);
@@ -137,42 +137,42 @@ curl_fill_buffer(URL_FILE *file,int want,int waittime)
      * doesnt exceed required size already
      */
     if((!file->still_running) || (file->buffer_pos > want))
-	return 0;
+        return 0;
 
     /* attempt to fill buffer */
     do
     {
-	FD_ZERO(&fdread);
-	FD_ZERO(&fdwrite);
-	FD_ZERO(&fdexcep);
+        FD_ZERO(&fdread);
+        FD_ZERO(&fdwrite);
+        FD_ZERO(&fdexcep);
 
-	/* set a suitable timeout to fail on */
-	timeout.tv_sec = 60; /* 1 minute */
-	timeout.tv_usec = 0;
+        /* set a suitable timeout to fail on */
+        timeout.tv_sec = 60; /* 1 minute */
+        timeout.tv_usec = 0;
 
-	/* get file descriptors from the transfers */
-	curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
+        /* get file descriptors from the transfers */
+        curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
 
-	rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
+        rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
 
-	switch(rc) {
-	case -1:
-	    /* select error */
-	    break;
+        switch(rc) {
+        case -1:
+            /* select error */
+            break;
 
-	case 0:
-	    break;
+        case 0:
+            break;
 
-	default:
-	    /* timeout or readable/writable sockets */
-	    /* note we *could* be more efficient and not wait for
-	     * CURLM_CALL_MULTI_PERFORM to clear here and check it on re-entry
-	     * but that gets messy */
-	    while(curl_multi_perform(multi_handle, &file->still_running) ==
-		  CURLM_CALL_MULTI_PERFORM);
+        default:
+            /* timeout or readable/writable sockets */
+            /* note we *could* be more efficient and not wait for
+             * CURLM_CALL_MULTI_PERFORM to clear here and check it on re-entry
+             * but that gets messy */
+            while(curl_multi_perform(multi_handle, &file->still_running) ==
+                  CURLM_CALL_MULTI_PERFORM);
 
-	    break;
-	}
+            break;
+        }
     } while(file->still_running && (file->buffer_pos < want));
     return 1;
 }
@@ -184,22 +184,22 @@ curl_use_buffer(URL_FILE *file,int want)
     /* sort out buffer */
     if((file->buffer_pos - want) <=0)
     {
-	/* ditch buffer - write will recreate */
-	if(file->buffer)
-	    free(file->buffer);
+        /* ditch buffer - write will recreate */
+        if(file->buffer)
+            free(file->buffer);
 
-	file->buffer=NULL;
-	file->buffer_pos=0;
-	file->buffer_len=0;
+        file->buffer=NULL;
+        file->buffer_pos=0;
+        file->buffer_len=0;
     }
     else
     {
-	/* move rest down make it available for later */
-	memmove(file->buffer,
-		&file->buffer[want],
-		(file->buffer_pos - want));
+        /* move rest down make it available for later */
+        memmove(file->buffer,
+                &file->buffer[want],
+                (file->buffer_pos - want));
 
-	file->buffer_pos -= want;
+        file->buffer_pos -= want;
     }
     return 0;
 }
@@ -217,47 +217,47 @@ url_fopen(char *url,const char *operation)
 
     file = (URL_FILE *)malloc(sizeof(URL_FILE));
     if(!file)
-	return NULL;
+        return NULL;
 
     memset(file, 0, sizeof(URL_FILE));
 
     if((file->handle.file=fopen(url,operation)))
     {
-	file->type = CFTYPE_FILE; /* marked as URL */
+        file->type = CFTYPE_FILE; /* marked as URL */
     }
     else
     {
-	file->type = CFTYPE_CURL; /* marked as URL */
-	file->handle.curl = curl_easy_init();
+        file->type = CFTYPE_CURL; /* marked as URL */
+        file->handle.curl = curl_easy_init();
 
-	curl_easy_setopt(file->handle.curl, CURLOPT_URL, url);
-	curl_easy_setopt(file->handle.curl, CURLOPT_WRITEDATA, file);
-	curl_easy_setopt(file->handle.curl, CURLOPT_VERBOSE, FALSE);
-	curl_easy_setopt(file->handle.curl, CURLOPT_WRITEFUNCTION, write_callback);
+        curl_easy_setopt(file->handle.curl, CURLOPT_URL, url);
+        curl_easy_setopt(file->handle.curl, CURLOPT_WRITEDATA, file);
+        curl_easy_setopt(file->handle.curl, CURLOPT_VERBOSE, FALSE);
+        curl_easy_setopt(file->handle.curl, CURLOPT_WRITEFUNCTION, write_callback);
 
-	if(!multi_handle)
-	    multi_handle = curl_multi_init();
+        if(!multi_handle)
+            multi_handle = curl_multi_init();
 
-	curl_multi_add_handle(multi_handle, file->handle.curl);
+        curl_multi_add_handle(multi_handle, file->handle.curl);
 
-	/* lets start the fetch */
-	while(curl_multi_perform(multi_handle, &file->still_running) ==
-	      CURLM_CALL_MULTI_PERFORM );
+        /* lets start the fetch */
+        while(curl_multi_perform(multi_handle, &file->still_running) ==
+              CURLM_CALL_MULTI_PERFORM );
 
-	if((file->buffer_pos == 0) && (!file->still_running))
-	{
-	    /* if still_running is 0 now, we should return NULL */
+        if((file->buffer_pos == 0) && (!file->still_running))
+        {
+            /* if still_running is 0 now, we should return NULL */
 
-	    /* make sure the easy handle is not in the multi handle anymore */
-	    curl_multi_remove_handle(multi_handle, file->handle.curl);
+            /* make sure the easy handle is not in the multi handle anymore */
+            curl_multi_remove_handle(multi_handle, file->handle.curl);
 
-	    /* cleanup */
-	    curl_easy_cleanup(file->handle.curl);
+            /* cleanup */
+            curl_easy_cleanup(file->handle.curl);
 
-	    free(file);
+            free(file);
 
-	    file = NULL;
-	}
+            file = NULL;
+        }
     }
     return file;
 }
@@ -270,26 +270,26 @@ url_fclose(URL_FILE *file)
     switch(file->type)
     {
     case CFTYPE_FILE:
-	ret=fclose(file->handle.file); /* passthrough */
-	break;
+        ret=fclose(file->handle.file); /* passthrough */
+        break;
 
     case CFTYPE_CURL:
-	/* make sure the easy handle is not in the multi handle anymore */
-	curl_multi_remove_handle(multi_handle, file->handle.curl);
+        /* make sure the easy handle is not in the multi handle anymore */
+        curl_multi_remove_handle(multi_handle, file->handle.curl);
 
-	/* cleanup */
-	curl_easy_cleanup(file->handle.curl);
-	break;
+        /* cleanup */
+        curl_easy_cleanup(file->handle.curl);
+        break;
 
     default: /* unknown or supported type - oh dear */
-	ret=EOF;
-	errno=EBADF;
-	break;
+        ret=EOF;
+        errno=EBADF;
+        break;
 
     }
 
     if(file->buffer)
-	free(file->buffer);/* free any allocated buffer space */
+        free(file->buffer);/* free any allocated buffer space */
 
     free(file);
 
@@ -304,17 +304,17 @@ url_feof(URL_FILE *file)
     switch(file->type)
     {
     case CFTYPE_FILE:
-	ret=feof(file->handle.file);
-	break;
+        ret=feof(file->handle.file);
+        break;
 
     case CFTYPE_CURL:
-	if((file->buffer_pos == 0) && (!file->still_running))
-	    ret = 1;
-	break;
+        if((file->buffer_pos == 0) && (!file->still_running))
+            ret = 1;
+        break;
     default: /* unknown or supported type - oh dear */
-	ret=-1;
-	errno=EBADF;
-	break;
+        ret=-1;
+        errno=EBADF;
+        break;
     }
     return ret;
 }
@@ -327,38 +327,38 @@ url_fread(void *ptr, size_t size, size_t nmemb, URL_FILE *file)
     switch(file->type)
     {
     case CFTYPE_FILE:
-	want=fread(ptr,size,nmemb,file->handle.file);
-	break;
+        want=fread(ptr,size,nmemb,file->handle.file);
+        break;
 
     case CFTYPE_CURL:
-	want = nmemb * size;
+        want = nmemb * size;
 
-	curl_fill_buffer(file,want,1);
+        curl_fill_buffer(file,want,1);
 
-	/* check if theres data in the buffer - if not curl_fill_buffer()
-	 * either errored or EOF */
-	if(!file->buffer_pos)
-	    return 0;
+        /* check if theres data in the buffer - if not curl_fill_buffer()
+         * either errored or EOF */
+        if(!file->buffer_pos)
+            return 0;
 
-	/* ensure only available data is considered */
-	if(file->buffer_pos < want)
-	    want = file->buffer_pos;
+        /* ensure only available data is considered */
+        if(file->buffer_pos < want)
+            want = file->buffer_pos;
 
-	/* xfer data to caller */
-	memcpy(ptr, file->buffer, want);
+        /* xfer data to caller */
+        memcpy(ptr, file->buffer, want);
 
-	curl_use_buffer(file,want);
+        curl_use_buffer(file,want);
 
-	want = want / size;	/* number of items - nb correct op - checked
-				 * with glibc code*/
+        want = want / size;     /* number of items - nb correct op - checked
+                                 * with glibc code*/
 
-	/*printf("(fread) return %d bytes %d left\n", want,file->buffer_pos);*/
-	break;
+        /*printf("(fread) return %d bytes %d left\n", want,file->buffer_pos);*/
+        break;
 
     default: /* unknown or supported type - oh dear */
-	want=0;
-	errno=EBADF;
-	break;
+        want=0;
+        errno=EBADF;
+        break;
 
     }
     return want;
@@ -373,45 +373,45 @@ url_fgets(char *ptr, int size, URL_FILE *file)
     switch(file->type)
     {
     case CFTYPE_FILE:
-	ptr = fgets(ptr,size,file->handle.file);
-	break;
+        ptr = fgets(ptr,size,file->handle.file);
+        break;
 
     case CFTYPE_CURL:
-	curl_fill_buffer(file,want,1);
+        curl_fill_buffer(file,want,1);
 
-	/* check if theres data in the buffer - if not fill either errored or
-	 * EOF */
-	if(!file->buffer_pos)
-	    return NULL;
+        /* check if theres data in the buffer - if not fill either errored or
+         * EOF */
+        if(!file->buffer_pos)
+            return NULL;
 
-	/* ensure only available data is considered */
-	if(file->buffer_pos < want)
-	    want = file->buffer_pos;
+        /* ensure only available data is considered */
+        if(file->buffer_pos < want)
+            want = file->buffer_pos;
 
-	/*buffer contains data */
-	/* look for newline or eof */
-	for(loop=0;loop < want;loop++)
-	{
-	    if(file->buffer[loop] == '\n')
-	    {
-		want=loop+1;/* include newline */
-		break;
-	    }
-	}
+        /*buffer contains data */
+        /* look for newline or eof */
+        for(loop=0;loop < want;loop++)
+        {
+            if(file->buffer[loop] == '\n')
+            {
+                want=loop+1;/* include newline */
+                break;
+            }
+        }
 
-	/* xfer data to caller */
-	memcpy(ptr, file->buffer, want);
-	ptr[want]=0;/* allways null terminate */
+        /* xfer data to caller */
+        memcpy(ptr, file->buffer, want);
+        ptr[want]=0;/* allways null terminate */
 
-	curl_use_buffer(file,want);
+        curl_use_buffer(file,want);
 
-	/*printf("(fgets) return %d bytes %d left\n", want,file->buffer_pos);*/
-	break;
+        /*printf("(fgets) return %d bytes %d left\n", want,file->buffer_pos);*/
+        break;
 
     default: /* unknown or supported type - oh dear */
-	ptr=NULL;
-	errno=EBADF;
-	break;
+        ptr=NULL;
+        errno=EBADF;
+        break;
     }
 
     return ptr;/*success */
@@ -423,28 +423,28 @@ url_rewind(URL_FILE *file)
     switch(file->type)
     {
     case CFTYPE_FILE:
-	rewind(file->handle.file); /* passthrough */
-	break;
+        rewind(file->handle.file); /* passthrough */
+        break;
 
     case CFTYPE_CURL:
-	/* halt transaction */
-	curl_multi_remove_handle(multi_handle, file->handle.curl);
+        /* halt transaction */
+        curl_multi_remove_handle(multi_handle, file->handle.curl);
 
-	/* restart */
-	curl_multi_add_handle(multi_handle, file->handle.curl);
+        /* restart */
+        curl_multi_add_handle(multi_handle, file->handle.curl);
 
-	/* ditch buffer - write will recreate - resets stream pos*/
-	if(file->buffer)
-	    free(file->buffer);
+        /* ditch buffer - write will recreate - resets stream pos*/
+        if(file->buffer)
+            free(file->buffer);
 
-	file->buffer=NULL;
-	file->buffer_pos=0;
-	file->buffer_len=0;
+        file->buffer=NULL;
+        file->buffer_pos=0;
+        file->buffer_len=0;
 
-	break;
+        break;
 
     default: /* unknown or supported type - oh dear */
-	break;
+        break;
 
     }
 
@@ -466,33 +466,33 @@ main(int argc, char *argv[])
 
     if(argc < 2)
     {
-	url="http://192.168.7.3/testfile";/* default to testurl */
+        url="http://192.168.7.3/testfile";/* default to testurl */
     }
     else
     {
-	url=argv[1];/* use passed url */
+        url=argv[1];/* use passed url */
     }
 
     /* copy from url line by line with fgets */
     outf=fopen("fgets.test","w+");
     if(!outf)
     {
-	perror("couldnt open fgets output file\n");
-	return 1;
+        perror("couldnt open fgets output file\n");
+        return 1;
     }
 
     handle = url_fopen(url, "r");
     if(!handle)
     {
-	printf("couldn't url_fopen()\n");
-	fclose(outf);
-	return 2;
+        printf("couldn't url_fopen()\n");
+        fclose(outf);
+        return 2;
     }
 
     while(!url_feof(handle))
     {
-	url_fgets(buffer,sizeof(buffer),handle);
-	fwrite(buffer,1,strlen(buffer),outf);
+        url_fgets(buffer,sizeof(buffer),handle);
+        fwrite(buffer,1,strlen(buffer),outf);
     }
 
     url_fclose(handle);
@@ -504,20 +504,20 @@ main(int argc, char *argv[])
     outf=fopen("fread.test","w+");
     if(!outf)
     {
-	perror("couldnt open fread output file\n");
-	return 1;
+        perror("couldnt open fread output file\n");
+        return 1;
     }
 
     handle = url_fopen("testfile", "r");
     if(!handle) {
-	printf("couldn't url_fopen()\n");
-	fclose(outf);
-	return 2;
+        printf("couldn't url_fopen()\n");
+        fclose(outf);
+        return 2;
     }
 
     do {
-	nread = url_fread(buffer, 1,sizeof(buffer), handle);
-	fwrite(buffer,1,nread,outf);
+        nread = url_fread(buffer, 1,sizeof(buffer), handle);
+        fwrite(buffer,1,nread,outf);
     } while(nread);
 
     url_fclose(handle);
@@ -529,26 +529,26 @@ main(int argc, char *argv[])
     outf=fopen("rewind.test","w+");
     if(!outf)
     {
-	perror("couldnt open fread output file\n");
-	return 1;
+        perror("couldnt open fread output file\n");
+        return 1;
     }
 
     handle = url_fopen("testfile", "r");
     if(!handle) {
-	printf("couldn't url_fopen()\n");
-	fclose(outf);
-	return 2;
+        printf("couldn't url_fopen()\n");
+        fclose(outf);
+        return 2;
     }
 
-	nread = url_fread(buffer, 1,sizeof(buffer), handle);
-	fwrite(buffer,1,nread,outf);
-	url_rewind(handle);
+        nread = url_fread(buffer, 1,sizeof(buffer), handle);
+        fwrite(buffer,1,nread,outf);
+        url_rewind(handle);
 
-	buffer[0]='\n';
-	fwrite(buffer,1,1,outf);
+        buffer[0]='\n';
+        fwrite(buffer,1,1,outf);
 
-	nread = url_fread(buffer, 1,sizeof(buffer), handle);
-	fwrite(buffer,1,nread,outf);
+        nread = url_fread(buffer, 1,sizeof(buffer), handle);
+        fwrite(buffer,1,nread,outf);
 
 
     url_fclose(handle);
diff --git a/docs/examples/multi-app.c b/docs/examples/multi-app.c
index 9e3d72703..ecb7e3814 100644
--- a/docs/examples/multi-app.c
+++ b/docs/examples/multi-app.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
  * $Id$
@@ -24,9 +24,9 @@
  * Download a HTTP file and upload an FTP file simultaneously.
  */
 
-#define HANDLECOUNT 2	/* Number of simultaneous transfers */
-#define HTTP_HANDLE 0	/* Index for the HTTP transfer */
-#define FTP_HANDLE 1	/* Index for the FTP transfer */
+#define HANDLECOUNT 2   /* Number of simultaneous transfers */
+#define HTTP_HANDLE 0   /* Index for the HTTP transfer */
+#define FTP_HANDLE 1    /* Index for the FTP transfer */
 
 int main(int argc, char **argv)
 {
@@ -111,11 +111,11 @@ int main(int argc, char **argv)
 
        switch (idx) {
          case HTTP_HANDLE:
-	   printf("HTTP transfer completed with status %d\n", msg->data.result);
-	   break;
-	 case FTP_HANDLE:
-	   printf("FTP transfer completed with status %d\n", msg->data.result);
-	   break;
+           printf("HTTP transfer completed with status %d\n", msg->data.result);
+           break;
+         case FTP_HANDLE:
+           printf("FTP transfer completed with status %d\n", msg->data.result);
+           break;
        }
     }
   }