From 786fcc90f74add6fa084c68d0db37a0b412505ea Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 20 Sep 2004 09:26:44 +0000 Subject: [PATCH] fixed OGo bug 915, adaptor is now always called mod_ngobjweb.so git-svn-id: http://svn.opengroupware.org/SOPE/trunk@138 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/mod_ngobjweb/ChangeLog | 7 ++++++ sope-appserver/mod_ngobjweb/GNUmakefile | 15 +----------- sope-appserver/mod_ngobjweb/common.h | 5 ++-- sope-appserver/mod_ngobjweb/scanhttp.c | 31 ++++++++++++++----------- 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/sope-appserver/mod_ngobjweb/ChangeLog b/sope-appserver/mod_ngobjweb/ChangeLog index 0a3ab42a..ba7428f0 100644 --- a/sope-appserver/mod_ngobjweb/ChangeLog +++ b/sope-appserver/mod_ngobjweb/ChangeLog @@ -1,3 +1,10 @@ +2004-09-20 Helge Hess + + * scanhttp.c (NGScanResponseLine): changed char types to unsigned char + + * GNUmakefile: remove version and EAPI marker from generated module, + the result is now called mod_ngobjweb.so + 2004-09-08 Helge Hess * handler.c: fixed some log text diff --git a/sope-appserver/mod_ngobjweb/GNUmakefile b/sope-appserver/mod_ngobjweb/GNUmakefile index fdef5b74..0a725213 100644 --- a/sope-appserver/mod_ngobjweb/GNUmakefile +++ b/sope-appserver/mod_ngobjweb/GNUmakefile @@ -2,13 +2,10 @@ -include $(GNUSTEP_MAKEFILES)/common.make -# Note: to build on Debian, specify "HTTPD=/usr/sbin/apache" in the make call - # config APACHE = /usr APXS = $(APACHE)/sbin/apxs -HTTPD = $(APACHE)/sbin/httpd ifneq ($(apxs),no) ifneq ($(apxs),yes) @@ -24,10 +21,6 @@ else APXS= endif -APACHE_VERSION = $(shell ./apversion.sh -v ${HTTPD} | head -n 1) -#APACHE_SSL = $(shell ./apversion.sh -iseapi ${HTTPD}) -APACHE_SSL = - ifneq ($(APXS),) ifneq ($(shared),no) APXS_CFLAGS = $(shell $(APXS) -q CFLAGS_SHLIB) $(shell $(APXS) -q CFLAGS) @@ -69,13 +62,7 @@ OFILES = \ config.o \ ngobjweb_module.o \ -ifeq ($(APACHE_SSL),yes) -APACHE_SSL=ssl -else -APACHE_SSL= -endif - -product = ngobjweb$(APACHE_SSL)_$(APACHE_VERSION)$(SHARED_LIBEXT) +product = mod_ngobjweb$(SHARED_LIBEXT) all : $(product) diff --git a/sope-appserver/mod_ngobjweb/common.h b/sope-appserver/mod_ngobjweb/common.h index 9640e096..97005830 100644 --- a/sope-appserver/mod_ngobjweb/common.h +++ b/sope-appserver/mod_ngobjweb/common.h @@ -104,9 +104,10 @@ _sendSNSQuery(request_rec *_rq, const char *_line, const char *_cookie, /* HTTP */ -extern char +extern unsigned char NGScanResponseLine(NGBufferedDescriptor *_in, - char *_version, int *_status, char *_text); + unsigned char *_version, int *_status, + unsigned char *_text); extern apr_table_t *NGScanHeaders(apr_pool_t *_pool, NGBufferedDescriptor *_in); /* handlers */ diff --git a/sope-appserver/mod_ngobjweb/scanhttp.c b/sope-appserver/mod_ngobjweb/scanhttp.c index 8ff7928b..6b90a264 100644 --- a/sope-appserver/mod_ngobjweb/scanhttp.c +++ b/sope-appserver/mod_ngobjweb/scanhttp.c @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2003 SKYRIX Software AG + Copyright (C) 2000-2004 SKYRIX Software AG - This file is part of OGo + This file is part of SOPE. OGo is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -18,13 +18,14 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include "common.h" #include "NGBufferedDescriptor.h" -char NGScanResponseLine(NGBufferedDescriptor *_in, - char *_version, int *_status, char *_text) { +unsigned char NGScanResponseLine(NGBufferedDescriptor *_in, + unsigned char *_version, int *_status, + unsigned char *_text) +{ if (_in == NULL) return 0; if (_version) *_version = '\0'; @@ -35,7 +36,7 @@ char NGScanResponseLine(NGBufferedDescriptor *_in, int c; int i; - // scan HTTP Version + /* scan HTTP Version */ { c = NGBufferedDescriptor_readChar(_in); i = 0; @@ -48,16 +49,17 @@ char NGScanResponseLine(NGBufferedDescriptor *_in, if (c < 1) return 0; // read error } - // skip spaces + /* skip spaces */ while ((c > 0) && apr_isspace(c)) c = NGBufferedDescriptor_readChar(_in); if (c < 1) return 0; // read error - // scan code + /* scan code */ { char buf[10]; i = 0; - while ((c > 0) && !apr_isspace(c) && (c != '\r') && (c != '\n') && (i < 6)) { + while ((c > 0) && !apr_isspace(c) && (c != '\r') && (c != '\n') && + (i < 6)) { buf[i] = c; i++; c = NGBufferedDescriptor_readChar(_in); @@ -66,22 +68,23 @@ char NGScanResponseLine(NGBufferedDescriptor *_in, if (_status) *_status = atoi(buf); } - // skip spaces + /* skip spaces */ while ((c > 0) && apr_isspace(c)) c = NGBufferedDescriptor_readChar(_in); if (c < 1) return 0; // read error - // check for EOL + /* check for EOL */ if (c == '\n') return 1; // response without reason if (c == '\r') { // response without reason c = NGBufferedDescriptor_readChar(_in); // c=='\n' return 1; } - // scan reason + /* scan reason */ { i = 0; - while ((c > 0) && !apr_isspace(c) && (c != '\r') && (c != '\n') && (i < 6)) { + while ((c > 0) && !apr_isspace(c) && (c != '\r') && (c != '\n') && + (i < 6)) { if (_text) _text[i] = c; i++; c = NGBufferedDescriptor_readChar(_in); @@ -90,7 +93,7 @@ char NGScanResponseLine(NGBufferedDescriptor *_in, if (c < 1) return 0; // read error } - // scan until line end + /* scan until line end */ while ((c > 0) && (c != '\n')) c = NGBufferedDescriptor_readChar(_in); -- 2.39.5