[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_1-22-g
|
From: |
Giuseppe Scrivano |
|
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_1-22-g9271f7e |
|
Date: |
Fri, 05 Feb 2010 22:09:11 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".
The branch, master has been updated
via 9271f7e34f89746ca5b5b8bc896e2d957b8c8c16 (commit)
via 11886e84467af717660cd6eed326bd1e2b367662 (commit)
from 552edb32dbb25ee790eab53b2ec50af8711b633e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9271f7e34f89746ca5b5b8bc896e2d957b8c8c16
Author: Giuseppe Scrivano <address@hidden>
Date: Fri Feb 5 23:02:22 2010 +0100
Use new gnulib modules for Win32 sockets functions.
diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index 2a7c753..23e9241 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -23,18 +23,31 @@ SKIP_PO=t
# gnulib modules used by this package.
gnulib_modules="
+accept
+argp
+bind
chdir-long
crypto/md5
crypto/sha1
+connect
getcwd
gethostname
+getsockname
gettext
gettimeofday
+listen
mktime
nproc
pipe
+recv
regex
+select
+send
+setsockopt
+shutdown
snprintf
+socket
+sysexits
unlink
"
diff --git a/myserver/configure.ac b/myserver/configure.ac
index 3d5c77b..5300208 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -48,7 +48,6 @@ AC_PROG_RANLIB
AC_PROG_LIBTOOL
AC_CANONICAL_HOST
-AC_LIBTOOL_WIN32_DLL
PACKAGE_STRING="m4_esyscmd([cat version])"
MYSERVER_VERSION="${PACKAGE_STRING}"
@@ -95,7 +94,7 @@ AC_CHECK_LIB(gcrypt, gcry_control)
case "${host}" in
*-*-mingw32*)
- LDFLAGS="-lwsock32 -lgdi32 -lole32 -luuid -luserenv $LDFLAGS"
+ LDFLAGS="-lwsock32 -lws2_32 -lgdi32 -lole32 -luuid -luserenv $LDFLAGS"
MAKE_MSCGI=yes
;;
*)
@@ -156,16 +155,6 @@ AC_SEARCH_LIBS([event_add], [event event_core event_extra])
AC_CHECK_FUNCS(event_loopbreak, AC_DEFINE(EVENT_LOOPBREAK, 1,
[Define if the event_loopbreak function is present]))
-dnl check for Unix98 socklen_t
- AC_MSG_CHECKING(if socklen_t is defined)
- AC_TRY_COMPILE(
- [#include <sys/socket.h>],
- [socklen_t len = 10; return len;],
- [AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)
- AC_DEFINE(socklen_t, int, define this where socklen_t is not
present)])
-
-
# Libidn checks
# -------------
AC_CHECK_HEADER(idna.h,,
diff --git a/myserver/include/base/socket/socket.h
b/myserver/include/base/socket/socket.h
index f34bcef..9c3c9bc 100644
--- a/myserver/include/base/socket/socket.h
+++ b/myserver/include/base/socket/socket.h
@@ -20,27 +20,24 @@
#ifndef SOCKET_H
# define SOCKET_H
-# include "myserver.h"
-# include <include/filter/stream.h>
+# define GNULIB_SOCKET 1
-# include <string>
-using namespace std;
+# include "myserver.h"
-# ifdef WIN32
-# ifndef SOCKETLIBINCLUDED
extern "C"
{
-# include <winsock2.h>
+# include <sys/types.h>
+# include <sys/socket.h>
}
-# define SOCKETLIBINCLUDED
-# endif
-# endif
+
+# include <include/filter/stream.h>
+
+# include <string>
+using namespace std;
# ifndef WIN32
extern "C"
{
-# include <sys/types.h>
-# include <sys/socket.h>
# include <sys/ioctl.h>
# include <netinet/in.h>
# include <netdb.h>
diff --git a/myserver/include/base/socket/ssl_socket.h
b/myserver/include/base/socket/ssl_socket.h
index 75eaecb..909cbe4 100644
--- a/myserver/include/base/socket/ssl_socket.h
+++ b/myserver/include/base/socket/ssl_socket.h
@@ -21,6 +21,13 @@
# define SSL_SOCKET_H
# include "myserver.h"
+
+extern "C"
+{
+# include <sys/types.h>
+# include <sys/socket.h>
+}
+
# include <include/base/socket/socket.h>
# include <include/base/ssl/ssl.h>
@@ -32,8 +39,6 @@ using namespace std;
# ifndef WIN32
extern "C" {
-# include <sys/types.h>
-# include <sys/socket.h>
# include <sys/ioctl.h>
# include <netinet/in.h>
# include <netdb.h>
diff --git a/myserver/lib/Makefile.am b/myserver/lib/Makefile.am
index 9286877..03c83fb 100644
--- a/myserver/lib/Makefile.am
+++ b/myserver/lib/Makefile.am
@@ -9,13 +9,29 @@
## (at your option) any later version.
##
## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## but WITHOUT ANY WARRANTY
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
+GNULIB_SOCKET=1
+GNULIB_CONNECT=1
+GNULIB_ACCEPT=1
+GNULIB_BIND=1
+GNULIB_GETPEERNAME=1
+GNULIB_GETSOCKNAME=1
+GNULIB_GETSOCKOPT=1
+GNULIB_LISTEN=1
+GNULIB_RECV=1
+GNULIB_SEND=1
+GNULIB_RECVFROM=1
+GNULIB_SENDTO=1
+GNULIB_SETSOCKOPT=1
+GNULIB_SHUTDOWN=1
+GNULIB_ACCEPT4=1
+
include gnulib.mk
# Dirty hack. FIXME!
diff --git a/myserver/myserver.h b/myserver/myserver.h
index a95f286..92b94e9 100644
--- a/myserver/myserver.h
+++ b/myserver/myserver.h
@@ -19,24 +19,26 @@
#ifndef STDAFX_H
#define STDAFX_H
+extern "C"
+{
#ifndef WIN32
# include "config.h"
#endif
#ifdef HAVE_CONFIG_H
# include <cstdlib>
-# include "time.h"
+/*# include "time.h"*/
# include <config.h>
#endif
#ifdef HAVE_PTHREAD
# include <pthread.h>
#endif
+}
#ifdef WIN32
extern "C"
{
-# include <winsock2.h>
# include <tchar.h>
# include <process.h>
}
@@ -71,9 +73,12 @@ typedef void* HANDLE;
#endif
+extern "C"
+{
#ifdef HAVE_GETTEXT
# include <libintl.h>
# define _(X) gettext (X)
#else
# define _(X) X
#endif
+}
diff --git a/myserver/src/base/socket/socket.cpp
b/myserver/src/base/socket/socket.cpp
index bdfc934..f7d9dff 100644
--- a/myserver/src/base/socket/socket.cpp
+++ b/myserver/src/base/socket/socket.cpp
@@ -18,12 +18,12 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#include "myserver.h"
-#include <include/base/utility.h>
+
#include <include/base/socket/socket.h>
+#include <include/base/utility.h>
+
extern "C"
{
-#include <string.h>
-#include <stdio.h>
#ifndef WIN32
# include <sys/types.h>
# include <sys/socket.h>
@@ -34,6 +34,7 @@ extern "C"
# include <arpa/inet.h>
#endif
+#include <sys/select.h>
#include <errno.h>
}
@@ -181,7 +182,7 @@ int Socket::bind (MYSERVER_SOCKADDR* sa,int namelen)
return -1;
#ifdef WIN32
- return ::bind (socketHandle, (const struct sockaddr*)sa, namelen);
+ return ::bind (socketHandle, (struct sockaddr*) sa, namelen);
#else
return ::bind (socketHandle, (const struct sockaddr*)sa, namelen);
#endif
@@ -567,7 +568,7 @@ int Socket::connect (MYSERVER_SOCKADDR* sa, int na)
return -1;
#ifdef WIN32
- return ::connect (socketHandle,(const sockaddr *)sa, na);
+ return ::connect (socketHandle,(sockaddr *)sa, na);
#else
return ::connect (socketHandle,(const sockaddr *)sa,na);
#endif
diff --git a/myserver/src/base/socket/ssl_socket.cpp
b/myserver/src/base/socket/ssl_socket.cpp
index 60610bf..0b4c9cf 100644
--- a/myserver/src/base/socket/ssl_socket.cpp
+++ b/myserver/src/base/socket/ssl_socket.cpp
@@ -125,7 +125,7 @@ int SslSocket::connect (MYSERVER_SOCKADDR* sa, int na)
return -1;
/*! Do the TCP connection. */
- if (::connect ((int)socketHandle,(const sockaddr *)sa, na))
+ if (::connect ((int) socketHandle,(sockaddr *) sa, na))
{
SSL_CTX_free (sslContext);
sslContext = 0;
diff --git a/myserver/src/base/socket_pair/socket_pair.cpp
b/myserver/src/base/socket_pair/socket_pair.cpp
index c8d574f..ec26eff 100644
--- a/myserver/src/base/socket_pair/socket_pair.cpp
+++ b/myserver/src/base/socket_pair/socket_pair.cpp
@@ -97,7 +97,7 @@ int SocketPair::create ()
addr.sin_addr.s_addr = htonl (0x7f000001);
addr.sin_port = 0;
- e = ::bind (listener, (const struct sockaddr*) &addr, sizeof (addr));
+ e = ::bind (listener, (struct sockaddr*) &addr, sizeof (addr));
if (e == SOCKET_ERROR)
{
closesocket (listener);
@@ -117,7 +117,8 @@ int SocketPair::create ()
break;
if ((handles[0] = ::socket (AF_INET, type, 0)) == INVALID_SOCKET)
break;
- if (::connect (handles[0], (const struct sockaddr*) &addr, sizeof
(addr)) == SOCKET_ERROR)
+ if (::connect (handles[0], (struct sockaddr*) &addr, sizeof (addr))
+ == SOCKET_ERROR)
break;
if ((handles[1] = ::accept (listener, NULL, NULL)) == INVALID_SOCKET)
break;
commit 11886e84467af717660cd6eed326bd1e2b367662
Author: Giuseppe Scrivano <address@hidden>
Date: Fri Feb 5 15:15:32 2010 +0100
Remove EVENT_LIB variable definition
diff --git a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
index c002fa7..b68d923 100644
--- a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
+++ b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
@@ -9,7 +9,9 @@ libmath_sum.a :
math_sum.mscgi : $(libmath_sum_a_OBJECTS) $(libmath_sum_a_DEPENDENCIES)
-rm -f math_sum.mscgi
- $(CXX) $(libmath_sum_a_OBJECTS) ../../../../src/libmyserver.a
../../../../lib/libgnu.a $(libmath_sum_a_LIBADD) $(PTHREAD_LIB) $(IDN_LIB)
$(XNET_LIB) $(EVENT_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) $(XML_LIBS)
$(LDFLAGS) -o math_sum.mscgi -shared $(CXXFLAGS) $(XML_CFLAGS)
+ $(CXX) $(libmath_sum_a_OBJECTS) ../../../../src/libmyserver.a
../../../../lib/libgnu.a $(libmath_sum_a_LIBADD) \
+ $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB)
$(XML_LIBS) $(LDFLAGS) -o math_sum.mscgi \
+ -shared $(CXXFLAGS) $(XML_CFLAGS)
install : math_sum.mscgi
$(INSTALL) -D 'math_sum.mscgi'
'$(DESTDIR)$(prefix)/var/web/cgi-bin/math_sum.mscgi'
diff --git a/myserver/binaries/web/cgi-src/post/Makefile.am
b/myserver/binaries/web/cgi-src/post/Makefile.am
index a397eed..0f10994 100644
--- a/myserver/binaries/web/cgi-src/post/Makefile.am
+++ b/myserver/binaries/web/cgi-src/post/Makefile.am
@@ -10,7 +10,9 @@ libpost.a :
post.mscgi : $(libpost_a_OBJECTS) $(libpost_a_DEPENDENCIES)
-rm -f post.mscgi
- $(CXX) $(libpost_a_OBJECTS) ../../../../src/libmyserver.a
../../../../lib/libgnu.a $(libpost_a_LIBADD) $(PTHREAD_LIB) $(IDN_LIB)
$(XNET_LIB) $(EVENT_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) $(XML_LIBS)
$(LDFLAGS) -o post.mscgi -shared $(CXXFLAGS) $(XML_CFLAGS)
+ $(CXX) $(libpost_a_OBJECTS) ../../../../src/libmyserver.a
../../../../lib/libgnu.a $(libpost_a_LIBADD) \
+ $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB)
$(XML_LIBS) $(LDFLAGS) \
+ -o post.mscgi -shared $(CXXFLAGS) $(XML_CFLAGS)
install : post.mscgi
$(INSTALL) -D 'post.mscgi'
'$(DESTDIR)$(prefix)/var/web/cgi-bin/post.mscgi'
diff --git a/myserver/configure.ac b/myserver/configure.ac
index 8cb05ca..3d5c77b 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -151,19 +151,7 @@ else
fi
AC_SUBST(XNET_LIB)
-AC_SEARCH_LIBS([event_add], [event event_core event_extra], have_event=yes)
-AC_CHECK_LIB([event], [event_add], have_event=yes)
-if test x$have_event = xyes; then
- EVENT_LIB="-levent"
-else
- EVENT_LIB=""
-
- AC_MSG_ERROR([
-*** This system appears to have no libevent
-*** Libevent is required by MyServer
- ])
-fi
-AC_SUBST(EVENT_LIB)
+AC_SEARCH_LIBS([event_add], [event event_core event_extra])
AC_CHECK_FUNCS(event_loopbreak, AC_DEFINE(EVENT_LOOPBREAK, 1,
[Define if the event_loopbreak function is present]))
diff --git a/myserver/src/Makefile.am b/myserver/src/Makefile.am
index ffa999a..d1244c8 100644
--- a/myserver/src/Makefile.am
+++ b/myserver/src/Makefile.am
@@ -7,7 +7,7 @@ myserver_SOURCES = myserver.cpp
myserver_CXXFLAGS = $(CXXFLAGS) $(XML_CFLAGS) -DHOST_STR=\"$(build)\"
-DPREFIX=\"$(prefix)\"
myserver_LDFLAGS = -rdynamic
myserver_LDADD = libmyserver.a $(PTHREAD_LIB) $(IDN_LIB) \
- $(XNET_LIB) $(EVENT_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) \
+ $(XNET_LIB) $(DL_LIB) $(SSL_LIB) $(ZLIB_LIB) \
$(XML_LIBS) ../lib/libgnu.a $(LDFLAGS)
clean-libmyserver.a:
diff --git a/myserver/tests/Makefile.am b/myserver/tests/Makefile.am
index 6f82483..441b048 100644
--- a/myserver/tests/Makefile.am
+++ b/myserver/tests/Makefile.am
@@ -65,7 +65,7 @@ test_suite_SOURCES = main.cpp
\
test_xml_validator.cpp
test_suite_LDADD = ../src/libmyserver.a ../lib/libgnu.a $(CPPUNIT_LDFLAGS) \
- $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(EVENT_LIB) $(DL_LIB)
$(SSL_LIB) \
+ $(PTHREAD_LIB) $(IDN_LIB) $(XNET_LIB) $(DL_LIB) $(SSL_LIB) \
$(ZLIB_LIB) $(XML_LIBS) $(LDFLAGS)
install:
-----------------------------------------------------------------------
Summary of changes:
myserver/binaries/web/cgi-src/math_sum/Makefile.am | 4 ++-
myserver/binaries/web/cgi-src/post/Makefile.am | 4 ++-
myserver/bootstrap.conf | 13 +++++++++
myserver/configure.ac | 27 +------------------
myserver/include/base/socket/socket.h | 21 ++++++---------
myserver/include/base/socket/ssl_socket.h | 9 +++++-
myserver/lib/Makefile.am | 18 ++++++++++++-
myserver/myserver.h | 9 +++++-
myserver/src/Makefile.am | 2 +-
myserver/src/base/socket/socket.cpp | 11 ++++---
myserver/src/base/socket/ssl_socket.cpp | 2 +-
myserver/src/base/socket_pair/socket_pair.cpp | 5 ++-
myserver/tests/Makefile.am | 2 +-
13 files changed, 73 insertions(+), 54 deletions(-)
hooks/post-receive
--
GNU MyServer
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_1-22-g9271f7e,
Giuseppe Scrivano <=