libsoup r1051 - in trunk: . libsoup tests

[tml svn gnome org]

Author: tml
Date: Thu Jan 24 09:44:38 2008
New Revision: 1051
URL: http://svn.gnome.org/viewvc/libsoup?rev=1051&view=rev

Log:
2008-01-23  Tor Lillqvist  <tml novell com>

	* configure.in: Allow autogening even without AM_PATH_LIBGCRYPT
	available

	* libsoup/soup-date.c (soup_date_new_from_time_t): Correct use of
	gmtime().

	* libsoup/soup-headers.c (soup_headers_parse_status_line): Return
	FALSE if neither HTTP nor ICY. Avoids crash in
	tests/header-parsing.

	* libsoup/soup-socket.c: On Windows SHUT_RDWR is called SD_BOTH.
	(set_nonblocking): Fix typo.

	* tests/continue-test.c: Seems to build fine without <pthread.h>,
	so drop that.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libsoup/soup-date.c
   trunk/libsoup/soup-headers.c
   trunk/libsoup/soup-socket.c
   trunk/tests/continue-test.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jan 24 09:44:38 2008
@@ -133,6 +133,8 @@
 dnl *** SSL Library check (GnuTLS) ***
 dnl **********************************
 
+dnl Allow autogening even without AM_PATH_LIBGCRYPT available
+m4_ifdef([AM_PATH_LIBGCRYPT],,[m4_define(AM_PATH_LIBGCRYPT,)])
 AC_ARG_ENABLE(ssl, 
 	      [  --enable-ssl             Turn on Secure Sockets Layer support [default=yes]],,
 	      enable_ssl=auto)

Modified: trunk/libsoup/soup-date.c
==============================================================================
--- trunk/libsoup/soup-date.c	(original)
+++ trunk/libsoup/soup-date.c	Thu Jan 24 09:44:38 2008
@@ -423,7 +423,7 @@
 #ifdef HAVE_GMTIME_R
 	gmtime_r (&when, &tm);
 #else
-	tm = *gmtime (when);
+	tm = *gmtime (&when);
 #endif
 
 	return soup_date_new (tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,

Modified: trunk/libsoup/soup-headers.c
==============================================================================
--- trunk/libsoup/soup-headers.c	(original)
+++ trunk/libsoup/soup-headers.c	Thu Jan 24 09:44:38 2008
@@ -245,7 +245,8 @@
 		/* Shoutcast not-quite-HTTP format */
 		*ver = SOUP_HTTP_1_0;
 		p = (char *)status_line + 3;
-	}
+	} else
+		return FALSE;
 
 	code_start = p;
 	while (*code_start == ' ' || *code_start == '\t')

Modified: trunk/libsoup/soup-socket.c
==============================================================================
--- trunk/libsoup/soup-socket.c	(original)
+++ trunk/libsoup/soup-socket.c	Thu Jan 24 09:44:38 2008
@@ -90,6 +90,7 @@
 #define SOUP_IS_SOCKET_ERROR(status) ((status) == SOCKET_ERROR)
 #define SOUP_IS_INVALID_SOCKET(socket) ((socket) == INVALID_SOCKET)
 #define SOUP_IS_CONNECT_STATUS_INPROGRESS() (WSAGetLastError () == WSAEWOULDBLOCK)
+#define SHUT_RDWR SD_BOTH
 #else
 #define SOUP_IS_SOCKET_ERROR(status) ((status) == -1)
 #define SOUP_IS_INVALID_SOCKET(socket) ((socket) < 0)
@@ -298,7 +299,7 @@
 #ifndef G_OS_WIN32
 	int flags;
 #else
-	u_log val;
+	u_long val;
 #endif
 
 	if (priv->sockfd == -1)

Modified: trunk/tests/continue-test.c
==============================================================================
--- trunk/tests/continue-test.c	(original)
+++ trunk/tests/continue-test.c	Thu Jan 24 09:44:38 2008
@@ -3,7 +3,6 @@
  * Copyright (C) 2007 Novell, Inc.
  */
 
-#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>