projects
/
yazproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug #195: YAZ proxy removes otherInfo.
[yazproxy-moved-to-github.git]
/
src
/
yaz-proxy-main.cpp
diff --git
a/src/yaz-proxy-main.cpp
b/src/yaz-proxy-main.cpp
index
839f2e4
..
6a99e7d
100644
(file)
--- a/
src/yaz-proxy-main.cpp
+++ b/
src/yaz-proxy-main.cpp
@@
-1,14
+1,14
@@
-/* $Id: yaz-proxy-main.cpp,v 1.3 2004-04-11 12:25:01 adam Exp $
+/* $Id: yaz-proxy-main.cpp,v 1.5 2004-10-23 23:15:48 adam Exp $
Copyright (c) 1998-2004, Index Data.
This file is part of the yaz-proxy.
Copyright (c) 1998-2004, Index Data.
This file is part of the yaz-proxy.
-Zebra is free software; you can redistribute it and/or modify it under
+YAZ proxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2, or (at your option) any later
version.
the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2, or (at your option) any later
version.
-Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+YAZ proxy 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 General Public License
for more details.
WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
@@
-41,6
+41,13
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <yaz++/pdu-assoc.h>
#include <yazproxy/proxy.h>
#include <yaz++/pdu-assoc.h>
#include <yazproxy/proxy.h>
+#if HAVE_XSLT
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxslt/xsltutils.h>
+#include <libxslt/transform.h>
+#endif
+
void usage(char *prog)
{
fprintf (stderr, "%s: [-c config] [-l log] [-a log] [-v level] [-t target] "
void usage(char *prog)
{
fprintf (stderr, "%s: [-c config] [-l log] [-a log] [-v level] [-t target] "
@@
-203,8
+210,8
@@
static void child_run(Yaz_SocketManager *m, int run)
limit_data.rlim_cur = no_limit_files;
limit_data.rlim_max = no_limit_files;
limit_data.rlim_cur = no_limit_files;
limit_data.rlim_max = no_limit_files;
- yaz_log(LOG_LOG, "0 setrlimit NOFILE cur=%d max=%d",
- limit_data.rlim_cur, limit_data.rlim_max);
+ yaz_log(LOG_LOG, "0 setrlimit NOFILE cur=%ld max=%ld",
+ (long) limit_data.rlim_cur, (long) limit_data.rlim_max);
if (setrlimit(RLIMIT_NOFILE, &limit_data))
yaz_log(LOG_ERRNO|LOG_WARN, "setrlimit");
#else
if (setrlimit(RLIMIT_NOFILE, &limit_data))
yaz_log(LOG_ERRNO|LOG_WARN, "setrlimit");
#else
@@
-250,8
+257,8
@@
static void child_run(Yaz_SocketManager *m, int run)
#if HAVE_GETRLIMIT
struct rlimit limit_data;
getrlimit(RLIMIT_NOFILE, &limit_data);
#if HAVE_GETRLIMIT
struct rlimit limit_data;
getrlimit(RLIMIT_NOFILE, &limit_data);
- yaz_log(LOG_LOG, "0 getrlimit NOFILE cur=%d max=%d",
- limit_data.rlim_cur, limit_data.rlim_max);
+ yaz_log(LOG_LOG, "0 getrlimit NOFILE cur=%ld max=%ld",
+ (long) limit_data.rlim_cur, (long) limit_data.rlim_max);
#endif
while (m->processEvent() > 0)
#endif
while (m->processEvent() > 0)