Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv15656/runtime
Modified Files:
Makefile.ag shredder.mx shttpd.c xrpc_server.mx
Log Message:
propagated changes of Thursday Mar 01 2007 - Friday Mar 02 2007
from the XQuery_0-16 branch to the development trunk
Index: shttpd.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/shttpd.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- shttpd.c 22 Feb 2007 11:34:46 -0000 1.21
+++ shttpd.c 2 Mar 2007 12:35:43 -0000 1.22
@@ -2938,7 +2938,7 @@
elog(ERR_DEBUG, "select: %s", strerror(errno));
} else {
/* If listening socket is ready, accept new connection */
- if (listen_socket != -1 && FD_ISSET(listen_socket, &rset) &&
+ if (listen_socket != -1 && FD_ISSET(listen_socket,
&rset) &&
(sock = accept(listen_socket, &sa.u.sa, &sa.len)) != 0)
newconnection(ctx, sock, &sa);
@@ -2954,10 +2954,11 @@
* If the connection is removed, keep the previous
* connection in chain (pc) unchanged.
*/
- if ((c->flags & FLAG_FINISHED) || c->expire < now)
- disconnect(c, pc);
- else
- pc = c;
+ if ( (c->io != do_embedded) &&
+ ((c->flags & FLAG_FINISHED) || c->expire < now) )
+ disconnect(c, pc);
+ else
+ pc = c;
}
}
}
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/Makefile.ag,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- Makefile.ag 1 Mar 2007 14:43:25 -0000 1.73
+++ Makefile.ag 2 Mar 2007 12:35:42 -0000 1.74
@@ -103,7 +103,7 @@
SOURCES = xrpc_client.mx
LIBS = \
libserialize $(PF_LIBS) $(SOCKET_LIBS)
./lib_pf_support ./lib_pathfinder \
- $(MONETDB_LIBS) -lbat -lstream $(MONETDB4_LIBS)
-lmonet -lpthread \
+ $(MONETDB_LIBS) -lbat -lstream $(MONETDB4_LIBS)
-lmonet \
$(MONETDB4_MODS) -l_streams -l_builtin -l_ascii_io
}
@@ -128,7 +128,7 @@
../compiler/libcompiler2 \
../compiler/sql/libsql \
$(PF_LIBS) $(SOCKET_LIBS) ./lib_pf_support
./lib_pathfinder \
- $(MONETDB_LIBS) -lbat -lstream $(MONETDB4_LIBS)
-lmonet -lpthread \
+ $(MONETDB_LIBS) -lbat -lstream $(MONETDB4_LIBS)
-lmonet $(PTHREAD_LIBS) \
$(MONETDB4_MODS) -l_mapi -l_streams -l_builtin
-l_ascii_io
}
Index: xrpc_server.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc_server.mx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- xrpc_server.mx 28 Feb 2007 14:45:43 -0000 1.16
+++ xrpc_server.mx 2 Mar 2007 12:35:43 -0000 1.17
@@ -1179,9 +1179,6 @@
xrpc_port = rpcd_running = *port;
- /* Initialize with specific config file, pass NULL to use default
- * values */
- shttpd_init(NULL);
/* find 'datadir' (often datadir = <prefix>/share), otherwise use
* "/usr/share", hence, httpd serves out <datadir>/MonetDB/xrpc */
if( !(s = GDKgetenv("datadir")) ){
@@ -1191,6 +1188,12 @@
snprintf(datadir, 1024, "%s%cMonetDB%cxrpc", s, DIR_SEP, DIR_SEP);
}
shttpd_setopt("document_root", datadir);
+/*
+ shttpd_setopt("error_log", "c:\\tmp\\err.txt");
+ shttpd_setopt("debug", "1");
+ */
+
+ shttpd_init(NULL); /* Initialize httpsd thread */
if (option && strstr(option, "timing") != NULL)
timing = 1;
Index: shredder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/shredder.mx,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- shredder.mx 28 Feb 2007 14:45:43 -0000 1.118
+++ shredder.mx 2 Mar 2007 12:35:42 -0000 1.119
@@ -77,8 +77,6 @@
#define DOCUMENT 4
#define COLLECTION 5
-#include <strings.h>
-
/* SAX parser interface(libxml2) */
#include "libxml/parser.h"
#include "libxml/parserInternals.h"
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
