merged with DEV300_m67

5 files changed, 676 insertions, 44 deletions

diff --git a/neon/makefile.mk b/neon/makefile.mk
index f25fefd69935..367e5ffc0a46 100644
--- a/neon/makefile.mk
+++ b/neon/makefile.mk
@@ -54,6 +54,13 @@ NEON_NAME=neon-0.28.2
 
 TARFILE_NAME=$(NEON_NAME)
 PATCH_FILES=neon.patch
+
+.IF "$(GUI)"=="WNT" 
+    PATCH_FILES+=neon_exports_win.patch
+.ELSE
+    PATCH_FILES+=neon_exports_unix.patch
+.ENDIF
+
 ADDITIONAL_FILES=src$/makefile.mk src$/config.h src$/ne_ntlm.h src$/ne_ntlm.c
 BUILD_DIR=src
 
diff --git a/neon/neon.patch b/neon/neon.patch
index 59924a9a605b..8257b64a7758 100644
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -499,6 +499,7 @@
 +PRJNAME=neon
 +TARGET=neon
 +LIBTARGET=NO
++USE_DEFFILE=TRUE
 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 +
 +# --- Settings -----------------------------------------------------
@@ -512,7 +513,19 @@
 +.IF "$(SYSTEM_LIBXML)" == "YES"
 +CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
 +.ELSE
-+CFLAGS+=-I$(SOLARINCDIR)$/external$/zlib
++LIBXMLINCDIR=external$/libxml
++CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR)
++.ENDIF
++
++.IF "$(SYSTEM_OPENSSL)" == "YES"
++CFLAGS+= $(OPENSSL_CFLAGS)
++.ENDIF
++
++.IF "$(SYSTEM_ZLIB)" == "YES"
++CFLAGS+=-DSYSTEM_ZLIB
++.ELSE
++ZLIBINCDIR=external$/zlib
++CFLAGS+=-I$(SOLARINCDIR)$/$(ZLIBINCDIR)
 +.ENDIF
 +
 +SLOFILES= \
@@ -547,12 +560,38 @@
 +#       $(SLO)$/ne_gnutls.obj \
 +#       $(SLO)$/ne_stubssl.obj
 +
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
-+LIB1OBJFILES=$(SLOFILES)
++SHL1OBJS=$(SLOFILES)
++SHL1TARGET=$(TARGET)
++SHL1VERSIONMAP=exports.map
++SHL1IMPLIB=i$(TARGET)
++
++SHL1STDLIBS+= $(LIBXML2LIB) \
++              $(ZLIB3RDLIB)
++
++.IF "$(GUI)"=="WNT"
++	SHL1STDLIBS+= $(WSOCK32LIB)
++	.IF "$(WINDOWS_VISTA_PSDK)" != ""
++		SHL1STDLIBS+= $(WS2_32LIB)
++	.ENDIF
++	SHL1STDLIBS+= $(OPENSSLLIB)
++.ELSE # WNT
++	.IF "$(OS)"=="SOLARIS"
++		SHL1STDLIBS+= -lnsl -lsocket -ldl
++	.ENDIF # SOLARIS
++	.IF "$(OS)"=="OS2"
++		SHL1STDLIBS+= pthread.lib libz.lib
++	.ENDIF # OS2
++	.IF "$(SYSTEM_OPENSSL)"=="YES"
++		SHL1STDLIBS+= $(OPENSSLLIB)
++	.ELSE
++		SHL1STDLIBS+= $(OPENSSLLIBST)
++	.ENDIF
++.ENDIF # WNT
++
++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 +
 +# --- Targets ------------------------------------------------------
-+
++DEF1NAME=$(SHL1TARGET)
 +.INCLUDE :  target.mk
 --- misc/neon-0.28.2/src/ne_auth.c	2008-02-29 17:30:12.000000000 +0100
 +++ misc/build/neon-0.28.2/src/ne_auth.c	2009-11-26 23:41:57.000000000 +0100
@@ -594,8 +633,8 @@
  static int get_credentials(auth_session *sess, ne_buffer **errmsg, int attempt,
                             struct auth_challenge *chall, char *pwbuf) 
  {
--    if (chall->handler->creds(chall->handler->userdata, sess->realm, 
-+    if (chall->handler->creds(chall->handler->userdata, chall->protocol->name, sess->realm, 
+-    if (chall->handler->creds(chall->handler->userdata, sess->realm,
++    if (chall->handler->creds(chall->handler->userdata, chall->protocol->name, sess->realm,
                                chall->handler->attempt++, sess->username, pwbuf) == 0) {
          return 0;
      } else {
@@ -603,11 +642,11 @@
      int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0;
      int status;
      char *response = NULL;
--    
+-
 +    char password[NE_ABUFSIZ];
 +
      NE_DEBUG(NE_DBG_HTTPAUTH, "auth: SSPI challenge.\n");
--    
+-
 +
      if (!sess->sspi_context) {
          ne_uri uri = {0};
@@ -617,7 +656,7 @@
          }
      }
 +
-+	/* Authentification needs more than one http request. 
++	/* Authentification needs more than one http request.
 +	 * As long as authentification in progress use the existing credentials.
 +	 * Otherwise get new credentials.*/
 +	if (!parms->opaque)
@@ -637,7 +676,7 @@
  
 +#ifdef HAVE_NTLM
 +
-+static char *request_ntlm(auth_session *sess, struct auth_request *request) 
++static char *request_ntlm(auth_session *sess, struct auth_request *request)
 +{
 +    char *token = ne_ntlm_getRequestToken(sess->ntlm_context);
 +    if (token) {
@@ -651,12 +690,12 @@
 +
 +static int ntlm_challenge(auth_session *sess, int attempt,
 +                          struct auth_challenge *parms,
-+                          ne_buffer **errmsg) 
++                          ne_buffer **errmsg)
 +{
 +    int status;
-+    
++
 +    NE_DEBUG(NE_DBG_HTTPAUTH, "auth: NTLM challenge.\n");
-+    
++
 +    if (!parms->opaque && (!sess->ntlm_context || (attempt > 1))) {
 +        char password[NE_ABUFSIZ];
 +
@@ -674,7 +713,7 @@
 +        }
 +
 +        status = ne_ntlm_create_context(&sess->ntlm_context,
-+                                        sess->username, 
++                                        sess->username,
 +                                        password);
 +        if (status) {
 +            return status;
@@ -689,7 +728,7 @@
 +    return 0;
 +}
 +#endif /* HAVE_NTLM */
-+ 
++
 +
  /* Examine a digest challenge: return 0 if it is a valid Digest challenge,
   * else non-zero. */
@@ -827,7 +866,7 @@
 +++ misc/build/neon-0.28.2/src/ne_ntlm.c	2009-11-26 23:41:57.000000000 +0100
 @@ -1 +1,703 @@
 -dummy
-+/* 
++/*
 +   Handling of NTLM Authentication
 +   Copyright (C) 2003, Daniel Stenberg <daniel@haxx.se>
 +   Copyright (C) 2009, Kai Sommerfeld <kso@openoffice.org>
@@ -836,7 +875,7 @@
 +   modify it under the terms of the GNU Library General Public
 +   License as published by the Free Software Foundation; either
 +   version 2 of the License, or (at your option) any later version.
-+   
++
 +   This library is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -850,7 +889,7 @@
 +*/
 +
 +/* NTLM details:
-+   
++
 +   http://davenport.sourceforge.net/ntlm.html
 +   http://www.innovation.ch/java/ntlm.html
 +
@@ -1058,8 +1097,8 @@
 +      memcpy(ctx->nonce, &buffer[24], 8);
 +
 +    /* at index decimal 20, there's a 32bit NTLM flag field */
-+      
-+    if (buffer) ne_free(buffer); 
++
++    if (buffer) ne_free(buffer);
 +  }
 +  else {
 +    if(ctx->state >= NTLMSTATE_TYPE1)
@@ -1145,7 +1184,7 @@
 +
 +  if (len > 14)
 +    len = 14;
-+  
++
 +  for (i=0; i<len; i++)
 +    pw[i] = toupper(password[i]);
 +
@@ -1159,7 +1198,7 @@
 +    setup_des_key(pw, DESKEY(ks));
 +    DES_ecb_encrypt((DES_cblock *)magic, (DES_cblock *)lmbuffer,
 +                    DESKEY(ks), DES_ENCRYPT);
-+  
++
 +    setup_des_key(pw+7, DESKEY(ks));
 +    DES_ecb_encrypt((DES_cblock *)magic, (DES_cblock *)(lmbuffer+8),
 +                    DESKEY(ks), DES_ENCRYPT);
@@ -1213,13 +1252,13 @@
 +  if(!ctx->user || !ctx->passwd)
 +    /* no user, no auth */
 +    return 0; /* OK */
-+  
++
 +  switch(ctx->state) {
 +  case NTLMSTATE_TYPE1:
 +  default: /* for the weird cases we (re)start here */
 +    hostoff = 32;
 +    domoff = hostoff + hostlen;
-+    
++
 +    /* Create and send a type-1 message:
 +
 +    Index Description          Content
@@ -1272,7 +1311,7 @@
 +    ctx->requestToken = ne_base64(ntlmbuf, size);
 +
 +    break;
-+    
++
 +  case NTLMSTATE_TYPE2:
 +    /* We received the type-2 already, create a type-3 message:
 +
@@ -1290,7 +1329,7 @@
 +    52 (64) start of data block
 +
 +    */
-+  
++
 +  {
 +    int lmrespoff;
 +    int ntrespoff;
@@ -1340,25 +1379,25 @@
 +                    "%c%c" /* NT-response allocated space */
 +                    "%c%c" /* NT-response offset */
 +                    "%c%c" /* 2 zeroes */
-+                    
++
 +                    "%c%c"  /* domain length */
 +                    "%c%c"  /* domain allocated space */
 +                    "%c%c"  /* domain name offset */
 +                    "%c%c"  /* 2 zeroes */
-+                    
++
 +                    "%c%c"  /* user length */
 +                    "%c%c"  /* user allocated space */
 +                    "%c%c"  /* user offset */
 +                    "%c%c"  /* 2 zeroes */
-+                    
++
 +                    "%c%c"  /* host length */
 +                    "%c%c"  /* host allocated space */
 +                    "%c%c"  /* host offset */
 +                    "%c%c%c%c%c%c"  /* 6 zeroes */
-+                    
++
 +                    "\xff\xff"  /* message length */
 +                    "%c%c"  /* 2 zeroes */
-+                    
++
 +                    "\x01\x82" /* flags */
 +                    "%c%c"  /* 2 zeroes */
 +
@@ -1375,7 +1414,7 @@
 +                    SHORTPAIR(0x18),
 +                    SHORTPAIR(lmrespoff),
 +                    0x0, 0x0,
-+                    
++
 +#ifdef USE_NTRESPONSES
 +                    SHORTPAIR(0x18),  /* NT-response length, twice */
 +                    SHORTPAIR(0x18),
@@ -1395,12 +1434,12 @@
 +                    SHORTPAIR(userlen),
 +                    SHORTPAIR(useroff),
 +                    0x0, 0x0,
-+                    
++
 +                    SHORTPAIR(hostlen),
 +                    SHORTPAIR(hostlen),
 +                    SHORTPAIR(hostoff),
 +                    0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-+             
++
 +                    0x0, 0x0,
 +
 +                    0x0, 0x0);
@@ -1428,7 +1467,7 @@
 +    }
 +
 +#ifdef USE_NTRESPONSES
-+    if(size < ((int)sizeof(ntlmbuf) - 0x18)) {      
++    if(size < ((int)sizeof(ntlmbuf) - 0x18)) {
 +      memcpy(&ntlmbuf[size], ntresp, 0x18);
 +      size += 0x18;
 +    }
@@ -1504,7 +1543,7 @@
 +        if (context->state <= NTLMSTATE_TYPE3) {
 +	  ntlm ntlmstatus = ne_input_ntlm(context, responseToken);
 +
-+	  if (ntlmstatus != NTLM_FINE) { 
++	  if (ntlmstatus != NTLM_FINE) {
 +	    return -1;
 +	  }
 +	}
@@ -1534,7 +1573,7 @@
 +++ misc/build/neon-0.28.2/src/ne_ntlm.h	2009-11-26 23:41:57.000000000 +0100
 @@ -1 +1,44 @@
 -dummy
-+/* 
++/*
 +   Handling of NTLM Authentication
 +   Copyright (C) 2009, Kai Sommerfeld <kso@openoffice.org>
 +
@@ -1542,7 +1581,7 @@
 +   modify it under the terms of the GNU Library General Public
 +   License as published by the Free Software Foundation; either
 +   version 2 of the License, or (at your option) any later version.
-+   
++
 +   This library is distributed in the hope that it will be useful,
 +   but WITHOUT ANY WARRANTY; without even the implied warranty of
 +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -1594,12 +1633,12 @@
          return -1;
      }
  
-+    return 0; 
++    return 0;
 +}
 +
 +/*
 + * Simplification wrapper arround AcquireCredentialsHandle as most of
-+ * the parameters do not change. 
++ * the parameters do not change.
 + */
 +static int acquireCredentialsHandleForUsername(CredHandle * credentials, char *package, const char *username, const char *password)
 +{
@@ -1652,7 +1691,7 @@
  
          /* Reset any existing context since we are starting over */
          resetContext(sspiContext);
-+		
++
 +	if (strlen(username) != 0) {
 +	  if (acquireCredentialsHandleForUsername
 +	        (&sspiContext->credentials, sspiContext->mechanism, username, password) != SEC_E_OK) {
diff --git a/neon/neon_exports_unix.patch b/neon/neon_exports_unix.patch
new file mode 100644
index 000000000000..4e8098eb1eeb
--- /dev/null
+++ b/neon/neon_exports_unix.patch
@@ -0,0 +1,289 @@
+--- misc/neon-0.28.2/src/exports.map	2009-09-29 10:28:13.531250000 +0200
++++ misc/build/neon-0.28.2/src/exports.map	2009-09-21 12:16:53.453125000 +0200
+@@ -0,0 +1,286 @@
++NEON_0_28_2 {
++	global:
++		ne__negotiate_ssl;
++		ne__ssl_exit;
++		ne__ssl_init;
++		ne_ssl_cert_cmp;
++		ne_ssl_cert_digest;
++		ne_ssl_cert_export;
++		ne_ssl_cert_free;
++		ne_ssl_cert_identity;
++		ne_ssl_cert_import;
++		ne_ssl_cert_issuer;
++		ne_ssl_cert_read;
++		ne_ssl_cert_signedby;
++		ne_ssl_cert_subject;
++		ne_ssl_cert_validity_time;
++		ne_ssl_cert_write;
++		ne_ssl_clicert_decrypt;
++		ne_ssl_clicert_encrypted;
++		ne_ssl_clicert_free;
++		ne_ssl_clicert_name;
++		ne_ssl_clicert_owner;
++		ne_ssl_clicert_read;
++		ne_ssl_context_create;
++		ne_ssl_context_destroy;
++		ne_ssl_context_keypair;
++		ne_ssl_context_set_flag;
++		ne_ssl_context_set_verify;
++		ne_ssl_context_trustcert;
++		ne_ssl_dname_cmp;
++		ne_ssl_readable_dname;
++		ne_ssl_set_clicert;
++		ne_ssl_trust_default_ca;
++		ne_xml_dispatch_request;
++		ne_xml_parse_response;
++		ne_xml_create;
++		ne_xml_currentline;
++		ne_xml_destroy;
++		ne_xml_doc_encoding;
++		ne_xml_failed;
++		ne_xml_get_attr;
++		ne_xml_get_error;
++		ne_xml_mapid;
++		ne_xml_parse;
++		ne_xml_parse_v;
++		ne_xml_push_handler;
++		ne_xml_resolve_nspace;
++		ne_xml_set_error;
++		ne_debug;
++		ne_debug_init;
++		ne_debug_mask;
++		ne_debug_stream;
++		ne_has_support;
++		ne_parse_statusline;
++		ne_version_match;
++		ne_version_string;
++		ne_path_childof;
++		ne_path_compare;
++		ne_path_escape;
++		ne_path_has_trailing_slash;
++		ne_path_parent;
++		ne_path_unescape;
++		ne_uri_cmp;
++		ne_uri_copy;
++		ne_uri_defaultport;
++		ne_uri_free;
++		ne_uri_parse;
++		ne_uri_resolve;
++		ne_uri_unparse;
++		ne_base64;
++		ne_buffer_altered;
++		ne_buffer_append;
++		ne_buffer_clear;
++		ne_buffer_concat;
++		ne_buffer_create;
++		ne_buffer_destroy;
++		ne_buffer_finish;
++		ne_buffer_grow;
++		ne_buffer_ncreate;
++		ne_buffer_snprintf;
++		ne_buffer_zappend;
++		ne_concat;
++		ne_qtoken;
++		ne_shave;
++		ne_snprintf;
++		ne_strcasecmp;
++		ne_strclean;
++		ne_strerror;
++		ne_strncasecmp;
++		ne_token;
++		ne_tolower_array;
++		ne_unbase64;
++		ne_vsnprintf;
++		ne__sock_sslsock;
++		ne_addr_destroy;
++		ne_addr_error;
++		ne_addr_first;
++		ne_addr_next;
++		ne_addr_resolve;
++		ne_addr_result;
++		ne_iaddr_cmp;
++		ne_iaddr_free;
++		ne_iaddr_make;
++		ne_iaddr_print;
++		ne_iaddr_reverse;
++		ne_iaddr_typeof;
++		ne_sock_accept;
++		ne_sock_accept_ssl;
++		ne_sock_block;
++		ne_sock_cipher;
++		ne_sock_close;
++		ne_sock_connect;
++		ne_sock_connect_ssl;
++		ne_sock_connect_timeout;
++		ne_sock_create;
++		ne_sock_error;
++		ne_sock_exit;
++		ne_sock_fd;
++		ne_sock_fullread;
++		ne_sock_fullwrite;
++		ne_sock_init;
++		ne_sock_peek;
++		ne_sock_peer;
++		ne_sock_prebind;
++		ne_sock_read;
++		ne_sock_read_timeout;
++		ne_sock_readline;
++		ne_sock_sessid;
++		ne__ssl_set_verify_err;
++		ne_close_connection;
++		ne_fill_proxy_uri;
++		ne_fill_server_uri;
++		ne_get_error;
++		ne_get_scheme;
++		ne_get_server_hostport;
++		ne_get_session_flag;
++		ne_hook_close_conn;
++		ne_hook_create_request;
++		ne_hook_destroy_request;
++		ne_hook_destroy_session;
++		ne_hook_post_headers;
++		ne_hook_post_send;
++		ne_hook_pre_send;
++		ne_session_create;
++		ne_session_destroy;
++		ne_session_proxy;
++		ne_set_addrlist;
++		ne_set_connect_timeout;
++		ne_set_error;
++		ne_set_localaddr;
++		ne_set_notifier;
++		ne_set_progress;
++		ne_set_read_timeout;
++		ne_set_session_flag;
++		ne_set_session_private;
++		ne_set_useragent;
++		ne_ssl_cert_validity;
++		ne_ssl_provide_clicert;
++		ne_ssl_set_verify;
++		ne_ssl_trust_cert;
++		ne_unhook_close_conn;
++		ne_unhook_create_request;
++		ne_unhook_destroy_request;
++		ne_unhook_destroy_session;
++		ne_unhook_post_headers;
++		ne_unhook_post_send;
++		ne_unhook_pre_send;
++		ne_version_pre_http11;
++		ne_accept_2xx;
++		ne_accept_always;
++		ne_add_request_header;
++		ne_add_response_body_reader;
++		ne_begin_request;
++		ne_discard_response;
++		ne_end_request;
++		ne_get_request_flag;
++		ne_get_request_private;
++		ne_get_response_header;
++		ne_get_session;
++		ne_get_session_private;
++		ne_get_status;
++		ne_print_request_header;
++		ne_read_response_block;
++		ne_read_response_to_fd;
++		ne_request_create;
++		ne_request_destroy;
++		ne_request_dispatch;
++		ne_response_header_iterate;
++		ne_set_request_body_buffer;
++		ne_set_request_body_fd;
++		ne_set_request_body_provider;
++		ne_set_request_flag;
++		ne_set_request_private;
++		ne_redirect_location;
++		ne_redirect_register;
++		ne_propfind_allprop;
++		ne_propfind_create;
++		ne_propfind_current_private;
++		ne_propfind_destroy;
++		ne_propfind_get_parser;
++		ne_propfind_get_request;
++		ne_propfind_named;
++		ne_propfind_set_private;
++		ne_propnames;
++		ne_proppatch;
++		ne_propset_iterate;
++		ne_propset_lang;
++		ne_propset_private;
++		ne_propset_status;
++		ne_propset_value;
++		ne_simple_propfind;
++		ne_ascii_to_md5;
++		ne_md5_create_ctx;
++		ne_md5_destroy_ctx;
++		ne_md5_dup_ctx;
++		ne_md5_finish_ascii;
++		ne_md5_finish_ctx;
++		ne_md5_process_block;
++		ne_md5_process_bytes;
++		ne_md5_read_ctx;
++		ne_md5_reset_ctx;
++		ne_md5_stream;
++		ne_md5_to_ascii;
++		ne_lock;
++		ne_lock_copy;
++		ne_lock_create;
++		ne_lock_destroy;
++		ne_lock_discover;
++		ne_lock_free;
++		ne_lock_refresh;
++		ne_lock_using_parent;
++		ne_lock_using_resource;
++		ne_lockstore_add;
++		ne_lockstore_create;
++		ne_lockstore_destroy;
++		ne_lockstore_findbyuri;
++		ne_lockstore_first;
++		ne_lockstore_next;
++		ne_lockstore_register;
++		ne_lockstore_remove;
++		ne_unlock;
++		ne_i18n_init;
++		ne_asctime_parse;
++		ne_httpdate_parse;
++		ne_iso8601_parse;
++		ne_rfc1036_parse;
++		ne_rfc1123_date;
++		ne_rfc1123_parse;
++		ne_decompress_destroy;
++		ne_decompress_reader;
++		ne_add_depth_header;
++		ne_copy;
++		ne_delete;
++		ne_get;
++		ne_get_content_type;
++		ne_get_range;
++		ne_getmodtime;
++		ne_mkcol;
++		ne_move;
++		ne_options;
++		ne_options2;
++		ne_post;
++		ne_put;
++		ne_add_proxy_auth;
++		ne_add_server_auth;
++		ne_forget_auth;
++		ne_set_proxy_auth;
++		ne_set_server_auth;
++		ne_calloc;
++		ne_malloc;
++		ne_oom_callback;
++		ne_realloc;
++		ne_strdup;
++		ne_strndup;
++		ne_acl_set;
++		ne_207_create;
++		ne_207_destroy;
++		ne_207_get_current_propstat;
++		ne_207_get_current_response;
++		ne_207_set_propstat_handlers;
++		ne_207_set_response_handlers;
++		ne_accept_207;
++		ne_simple_request;
++	local:
++		*;
++};
diff --git a/neon/neon_exports_win.patch b/neon/neon_exports_win.patch
new file mode 100644
index 000000000000..479f03a9d6bc
--- /dev/null
+++ b/neon/neon_exports_win.patch
@@ -0,0 +1,295 @@
+--- misc/neon-0.28.2/src/exports.map	2009-09-29 10:28:13.531250000 +0200
++++ misc/build/neon-0.28.2/src/exports.map	2009-09-21 12:16:53.453125000 +0200
+@@ -0,0 +1,292 @@
++NEON_0_28_2 {
++	global:
++		ne_sspi_authenticate;
++		ne_sspi_clear_context;
++		ne_sspi_create_context;
++		ne_sspi_deinit;
++		ne_sspi_destroy_context;
++		ne_sspi_init;
++		ne__negotiate_ssl;
++		ne__ssl_exit;
++		ne__ssl_init;
++		ne_ssl_cert_cmp;
++		ne_ssl_cert_digest;
++		ne_ssl_cert_export;
++		ne_ssl_cert_free;
++		ne_ssl_cert_identity;
++		ne_ssl_cert_import;
++		ne_ssl_cert_issuer;
++		ne_ssl_cert_read;
++		ne_ssl_cert_signedby;
++		ne_ssl_cert_subject;
++		ne_ssl_cert_validity_time;
++		ne_ssl_cert_write;
++		ne_ssl_clicert_decrypt;
++		ne_ssl_clicert_encrypted;
++		ne_ssl_clicert_free;
++		ne_ssl_clicert_name;
++		ne_ssl_clicert_owner;
++		ne_ssl_clicert_read;
++		ne_ssl_context_create;
++		ne_ssl_context_destroy;
++		ne_ssl_context_keypair;
++		ne_ssl_context_set_flag;
++		ne_ssl_context_set_verify;
++		ne_ssl_context_trustcert;
++		ne_ssl_dname_cmp;
++		ne_ssl_readable_dname;
++		ne_ssl_set_clicert;
++		ne_ssl_trust_default_ca;
++		ne_xml_dispatch_request;
++		ne_xml_parse_response;
++		ne_xml_create;
++		ne_xml_currentline;
++		ne_xml_destroy;
++		ne_xml_doc_encoding;
++		ne_xml_failed;
++		ne_xml_get_attr;
++		ne_xml_get_error;
++		ne_xml_mapid;
++		ne_xml_parse;
++		ne_xml_parse_v;
++		ne_xml_push_handler;
++		ne_xml_resolve_nspace;
++		ne_xml_set_error;
++		ne_debug;
++		ne_debug_init;
++		ne_debug_mask;
++		ne_debug_stream;
++		ne_has_support;
++		ne_parse_statusline;
++		ne_version_match;
++		ne_version_string;
++		ne_path_childof;
++		ne_path_compare;
++		ne_path_escape;
++		ne_path_has_trailing_slash;
++		ne_path_parent;
++		ne_path_unescape;
++		ne_uri_cmp;
++		ne_uri_copy;
++		ne_uri_defaultport;
++		ne_uri_free;
++		ne_uri_parse;
++		ne_uri_resolve;
++		ne_uri_unparse;
++		ne_base64;
++		ne_buffer_altered;
++		ne_buffer_append;
++		ne_buffer_clear;
++		ne_buffer_concat;
++		ne_buffer_create;
++		ne_buffer_destroy;
++		ne_buffer_finish;
++		ne_buffer_grow;
++		ne_buffer_ncreate;
++		ne_buffer_snprintf;
++		ne_buffer_zappend;
++		ne_concat;
++		ne_qtoken;
++		ne_shave;
++		ne_snprintf;
++		ne_strcasecmp;
++		ne_strclean;
++		ne_strerror;
++		ne_strncasecmp;
++		ne_token;
++		ne_tolower_array;
++		ne_unbase64;
++		ne_vsnprintf;
++		ne__sock_sslsock;
++		ne_addr_destroy;
++		ne_addr_error;
++		ne_addr_first;
++		ne_addr_next;
++		ne_addr_resolve;
++		ne_addr_result;
++		ne_iaddr_cmp;
++		ne_iaddr_free;
++		ne_iaddr_make;
++		ne_iaddr_print;
++		ne_iaddr_reverse;
++		ne_iaddr_typeof;
++		ne_sock_accept;
++		ne_sock_accept_ssl;
++		ne_sock_block;
++		ne_sock_cipher;
++		ne_sock_close;
++		ne_sock_connect;
++		ne_sock_connect_ssl;
++		ne_sock_connect_timeout;
++		ne_sock_create;
++		ne_sock_error;
++		ne_sock_exit;
++		ne_sock_fd;
++		ne_sock_fullread;
++		ne_sock_fullwrite;
++		ne_sock_init;
++		ne_sock_peek;
++		ne_sock_peer;
++		ne_sock_prebind;
++		ne_sock_read;
++		ne_sock_read_timeout;
++		ne_sock_readline;
++		ne_sock_sessid;
++		ne__ssl_set_verify_err;
++		ne_close_connection;
++		ne_fill_proxy_uri;
++		ne_fill_server_uri;
++		ne_get_error;
++		ne_get_scheme;
++		ne_get_server_hostport;
++		ne_get_session_flag;
++		ne_hook_close_conn;
++		ne_hook_create_request;
++		ne_hook_destroy_request;
++		ne_hook_destroy_session;
++		ne_hook_post_headers;
++		ne_hook_post_send;
++		ne_hook_pre_send;
++		ne_session_create;
++		ne_session_destroy;
++		ne_session_proxy;
++		ne_set_addrlist;
++		ne_set_connect_timeout;
++		ne_set_error;
++		ne_set_localaddr;
++		ne_set_notifier;
++		ne_set_progress;
++		ne_set_read_timeout;
++		ne_set_session_flag;
++		ne_set_session_private;
++		ne_set_useragent;
++		ne_ssl_cert_validity;
++		ne_ssl_provide_clicert;
++		ne_ssl_set_verify;
++		ne_ssl_trust_cert;
++		ne_unhook_close_conn;
++		ne_unhook_create_request;
++		ne_unhook_destroy_request;
++		ne_unhook_destroy_session;
++		ne_unhook_post_headers;
++		ne_unhook_post_send;
++		ne_unhook_pre_send;
++		ne_version_pre_http11;
++		ne_accept_2xx;
++		ne_accept_always;
++		ne_add_request_header;
++		ne_add_response_body_reader;
++		ne_begin_request;
++		ne_discard_response;
++		ne_end_request;
++		ne_get_request_flag;
++		ne_get_request_private;
++		ne_get_response_header;
++		ne_get_session;
++		ne_get_session_private;
++		ne_get_status;
++		ne_print_request_header;
++		ne_read_response_block;
++		ne_read_response_to_fd;
++		ne_request_create;
++		ne_request_destroy;
++		ne_request_dispatch;
++		ne_response_header_iterate;
++		ne_set_request_body_buffer;
++		ne_set_request_body_fd;
++		ne_set_request_body_provider;
++		ne_set_request_flag;
++		ne_set_request_private;
++		ne_redirect_location;
++		ne_redirect_register;
++		ne_propfind_allprop;
++		ne_propfind_create;
++		ne_propfind_current_private;
++		ne_propfind_destroy;
++		ne_propfind_get_parser;
++		ne_propfind_get_request;
++		ne_propfind_named;
++		ne_propfind_set_private;
++		ne_propnames;
++		ne_proppatch;
++		ne_propset_iterate;
++		ne_propset_lang;
++		ne_propset_private;
++		ne_propset_status;
++		ne_propset_value;
++		ne_simple_propfind;
++		ne_ascii_to_md5;
++		ne_md5_create_ctx;
++		ne_md5_destroy_ctx;
++		ne_md5_dup_ctx;
++		ne_md5_finish_ascii;
++		ne_md5_finish_ctx;
++		ne_md5_process_block;
++		ne_md5_process_bytes;
++		ne_md5_read_ctx;
++		ne_md5_reset_ctx;
++		ne_md5_stream;
++		ne_md5_to_ascii;
++		ne_lock;
++		ne_lock_copy;
++		ne_lock_create;
++		ne_lock_destroy;
++		ne_lock_discover;
++		ne_lock_free;
++		ne_lock_refresh;
++		ne_lock_using_parent;
++		ne_lock_using_resource;
++		ne_lockstore_add;
++		ne_lockstore_create;
++		ne_lockstore_destroy;
++		ne_lockstore_findbyuri;
++		ne_lockstore_first;
++		ne_lockstore_next;
++		ne_lockstore_register;
++		ne_lockstore_remove;
++		ne_unlock;
++		ne_i18n_init;
++		ne_asctime_parse;
++		ne_httpdate_parse;
++		ne_iso8601_parse;
++		ne_rfc1036_parse;
++		ne_rfc1123_date;
++		ne_rfc1123_parse;
++		ne_decompress_destroy;
++		ne_decompress_reader;
++		ne_add_depth_header;
++		ne_copy;
++		ne_delete;
++		ne_get;
++		ne_get_content_type;
++		ne_get_range;
++		ne_getmodtime;
++		ne_mkcol;
++		ne_move;
++		ne_options;
++		ne_options2;
++		ne_post;
++		ne_put;
++		ne_add_proxy_auth;
++		ne_add_server_auth;
++		ne_forget_auth;
++		ne_set_proxy_auth;
++		ne_set_server_auth;
++		ne_calloc;
++		ne_malloc;
++		ne_oom_callback;
++		ne_realloc;
++		ne_strdup;
++		ne_strndup;
++		ne_acl_set;
++		ne_207_create;
++		ne_207_destroy;
++		ne_207_get_current_propstat;
++		ne_207_get_current_response;
++		ne_207_set_propstat_handlers;
++		ne_207_set_response_handlers;
++		ne_accept_207;
++		ne_simple_request;
++	local:
++		*;
++};
diff --git a/neon/prj/d.lst b/neon/prj/d.lst
index c9cf72163a44..a6c269e96600 100644
--- a/neon/prj/d.lst
+++ b/neon/prj/d.lst
@@ -2,5 +2,7 @@ mkdir: %_DEST%\inc%_EXT%\external
 mkdir: %_DEST%\inc%_EXT%\external\neon
 ..\version.mk %_DEST%\inc%_EXT%\external\neon\version.mk
 ..\%__SRC%\inc\ne_*.h %_DEST%\inc%_EXT%\external\neon\ne_*.h
-..\%__SRC%\slb\neon.lib %_DEST%\lib%_EXT%\neon.lib
-..\%__SRC%\lib\libneon.a %_DEST%\lib%_EXT%\libneon.a
+..\%__SRC%\lib\ineon.lib %_DEST%\lib%_EXT%\ineon.lib
+..\%__SRC%\bin\neon*.dll %_DEST%\bin%_EXT%\neon*.dll
+..\%__SRC%\lib\libneon*.so %_DEST%\lib%_EXT%\libneon*.so
+..\%__SRC%\lib\libneon*.dylib %_DEST%\lib%_EXT%\libneon*.dylib
\ No newline at end of file