commit: r1625 - in neon/branches/0.28.x: . macros src

[joe at manyfish.co.uk]

Author: joe
Date: Wed Jan 28 17:16:15 2009
New Revision: 1625

Modified:
   neon/branches/0.28.x/THANKS
   neon/branches/0.28.x/macros/neon.m4
   neon/branches/0.28.x/src/ne_basic.h

Log:
Merge r1617, r1618, r1619 from trunk:

* macros/neon.m4 (LIBNEON_SOURCE_CHECKS): Check for 
  socket functions in -lnetwork, for Haiku.

* THANKS: Convert to UTF-8.

* src/ne_basic.h: Docs updates.



Modified: neon/branches/0.28.x/THANKS
==============================================================================
--- neon/branches/0.28.x/THANKS	(original)
+++ neon/branches/0.28.x/THANKS	Wed Jan 28 17:16:15 2009
@@ -1,16 +1,16 @@
 Thanks go to the following people for contributing to neon development
 with code, patches, or good bug reports or suggestions.
 
-Arun Garg, Blair Zajac, Branko Èibej, Daniel Berlin, David Sloat,
+Arun Garg, Blair Zajac, Branko Èibej, Daniel Berlin, David Sloat,
 David Reid, Dirk Bergstrom, Ulrich Drepper, Gerald Richter, Greg
 Stein, Gregor Bornemann, Jeff Johnson, Jeremy Elson, Jim Whitehead,
 Johan Lindh, Justin Erenkrantz, Kai Sommerfeld, Keith Wannamaker, Lee
-Mallabone, Magnus Sirwiö, Markus Mueller, Max Bowsher, Michael
+Mallabone, Magnus Sirwiö, Markus Mueller, Max Bowsher, Michael
 Sobolev, Mike Rosellini, Mo DeJong, Noriaki Takamiya, Olof Oberg,
 Pawel Golaszewski, Peter Boos, Peter Moulder, rado, Risko Gergely,
 Rodney Dawes, Sam TH, Sander Alberink, Sander Striker, Stefan Esser,
 Shane Mayer, Taisuke Yamada, Teng Xu, Tom Bednarz, Tom Lee, Tommi
-Komulainen, Torsten Kalix, Wilfredo Sánchez, Daniel Veillard, Vladimir
+Komulainen, Torsten Kalix, Wilfredo Sánchez, Daniel Veillard, Vladimir
 Berezniker, Jiang Lei, Werner Baumann, Mike DiCuccio, Gisle Vanem,
 Hans Meine, Laszlo Boszormenyi, Matthias Miller, Albert Chin, 
 Kiyo Kelvin Lee, D.J. Heap, Dongsheng Song, Aleix Conchillo Flaque.

Modified: neon/branches/0.28.x/macros/neon.m4
==============================================================================
--- neon/branches/0.28.x/macros/neon.m4	(original)
+++ neon/branches/0.28.x/macros/neon.m4	Wed Jan 28 17:16:15 2009
@@ -626,7 +626,8 @@
 
 # Unixware 7 can only link gethostbyname with -lnsl -lsocket
 # Pick up -lsocket first, then the gethostbyname check will work.
-NE_SEARCH_LIBS(socket, socket inet ws2_32)
+# Haiku requires -lnetwork for socket functions.
+NE_SEARCH_LIBS(socket, socket inet ws2_32 network)
 
 # Enable getaddrinfo support if it, gai_strerror and inet_ntop are
 # all available.
@@ -659,7 +660,8 @@
    # Checks for non-getaddrinfo() based resolver interfaces.
    # QNX has gethostbyname in -lsocket. BeOS only has it in -lbind.
    # CygWin/Winsock2 has it in -lws2_32, allegedly.
-   NE_SEARCH_LIBS(gethostbyname, socket nsl bind ws2_32)
+   # Haiku requires -lnetwork for socket functions.
+   NE_SEARCH_LIBS(gethostbyname, socket nsl bind ws2_32 network)
    NE_SEARCH_LIBS(hstrerror, resolv,,[:])
    NE_CHECK_FUNCS(hstrerror)
    # Older Unixes don't declare h_errno.

Modified: neon/branches/0.28.x/src/ne_basic.h
==============================================================================
--- neon/branches/0.28.x/src/ne_basic.h	(original)
+++ neon/branches/0.28.x/src/ne_basic.h	Wed Jan 28 17:16:15 2009
@@ -51,26 +51,29 @@
  * collection resource, depth may be NE_DEPTH_ZERO to request that the
  * collection and its properties are to be copied, or
  * NE_DEPTH_INFINITE to request that the collection and its contents
- * are to be copied.  */
+ * are to be copied.  Returns NE_* error code. */
 int ne_copy(ne_session *sess, int overwrite, int depth,
 	    const char *src, const char *dest);
 
-/* Move resource from 'src' to dest 'path'. */
+/* Move resource from 'src' to 'dest' path.  Returns NE_* error
+ * code. */
 int ne_move(ne_session *sess, int overwrite,
 	    const char *src, const char *dest);
 
-/* Delete resource at 'path'. */
+/* Delete resource at 'path'.  Returns NE_* error code. */
 int ne_delete(ne_session *sess, const char *path);
-/* Create a collection at 'path', which MUST have a trailing slash. */
+
+/* Create a collection at 'path', which is required to have a trailing
+ * slash.  Returns NE_* error code. */
 int ne_mkcol(ne_session *sess, const char *path);
 
-/* Adds a Depth: header to a request */
+/* Adds a Depth: header to a request. */
 void ne_add_depth_header(ne_request *req, int depth);
 
 /* Retrieve modification time of resource at location 'path', using
  * the HEAD method, placing parsed time in *modtime.  *modtime is set
  * to -1 if no Last-Modified response header was given, or the date
- * given could not be parsed. */
+ * given could not be parsed.  Returns NE_* error code.  */
 int ne_getmodtime(ne_session *sess, const char *path, time_t *modtime);
 
 typedef struct {