#
# Makefile for the Squid Object Cache server
#
-# $Id: Makefile.in,v 1.412 2006/11/06 05:15:27 adrian Exp $
+# $Id: Makefile.in,v 1.413 2007/02/25 11:32:28 hno Exp $
#
# Uncomment and customize the following to suit your needs:
#
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/autoconf.h
CONFIG_CLEAN_FILES =
LIBRARIES = $(noinst_LIBRARIES)
StoreSwapLogData.cc StoreSwapLogData.h Server.cc Server.h \
structs.h SwapDir.cc SwapDir.h time.cc tools.cc tunnel.cc \
typedefs.h unlinkd.cc url.cc URL.h URLScheme.cc URLScheme.h \
- urn.cc useragent.cc wais.cc wccp.cc wccp2.cc whois.cc \
- wordlist.cc wordlist.h win32.cc WinSvc.cc
+ urn.cc useragent.cc wccp.cc wccp2.cc whois.cc wordlist.cc \
+ wordlist.h win32.cc WinSvc.cc
am__objects_4 = ACLARP.$(OBJEXT)
@ENABLE_ARP_ACL_TRUE@am__objects_5 = $(am__objects_4)
am__objects_6 = $(am__objects_5) ACLASN.$(OBJEXT) ACLBrowser.$(OBJEXT) \
StoreSwapLogData.$(OBJEXT) Server.$(OBJEXT) SwapDir.$(OBJEXT) \
time.$(OBJEXT) tools.$(OBJEXT) tunnel.$(OBJEXT) \
$(am__objects_24) url.$(OBJEXT) URLScheme.$(OBJEXT) \
- urn.$(OBJEXT) useragent.$(OBJEXT) wais.$(OBJEXT) \
- wccp.$(OBJEXT) wccp2.$(OBJEXT) whois.$(OBJEXT) \
- wordlist.$(OBJEXT) $(am__objects_25) $(am__objects_26)
+ urn.$(OBJEXT) useragent.$(OBJEXT) wccp.$(OBJEXT) \
+ wccp2.$(OBJEXT) whois.$(OBJEXT) wordlist.$(OBJEXT) \
+ $(am__objects_25) $(am__objects_26)
nodist_squid_OBJECTS = repl_modules.$(OBJEXT) globals.$(OBJEXT) \
string_arrays.$(OBJEXT)
squid_OBJECTS = $(am_squid_OBJECTS) $(nodist_squid_OBJECTS)
URLScheme.h \
urn.cc \
useragent.cc \
- wais.cc \
wccp.cc \
wccp2.cc \
whois.cc \
+++ /dev/null
-
-/*
- * $Id: wais.cc,v 1.163 2006/09/19 07:56:57 adrian Exp $
- *
- * DEBUG: section 24 WAIS Relay
- * AUTHOR: Harvest Derived
- *
- * SQUID Web Proxy Cache http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- * Squid is the result of efforts by numerous individuals from
- * the Internet community; see the CONTRIBUTORS file for full
- * details. Many organizations have provided support for Squid's
- * development; see the SPONSORS file for full details. Squid is
- * Copyrighted (C) 2001 by the Regents of the University of
- * California; see the COPYRIGHT file for full details. Squid
- * incorporates software developed and/or copyrighted by other
- * sources; see the CREDITS file for full details.
- *
- * This program 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 of the License, or
- * (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
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- */
-
-#include "squid.h"
-#include "errorpage.h"
-#include "Store.h"
-#include "HttpRequest.h"
-#if DELAY_POOLS
-#include "DelayPools.h"
-#include "MemObject.h"
-#endif
-#include "comm.h"
-#include "MemBuf.h"
-#include "forward.h"
-#include "SquidTime.h"
-
-class WaisStateData
-{
-
-public:
- int fd;
- StoreEntry *entry;
- method_t method;
- const HttpHeader *request_hdr;
- char url[MAX_URL];
- HttpRequest *request;
- FwdState::Pointer fwd;
- char buf[BUFSIZ];
- bool dataWritten;
-};
-
-static PF waisStateFree;
-static PF waisTimeout;
-static IOCB waisReadReply;
-static IOCB waisSendComplete;
-static PF waisSendRequest;
-
-static void
-waisStateFree(int fdnotused, void *data)
-{
- WaisStateData *waisState = (WaisStateData *)data;
-
- if (waisState == NULL)
- return;
-
- waisState->entry->unlock();
-
- HTTPMSGUNLOCK(waisState->request);
-
- waisState->fwd = NULL; // refcounted
-
- cbdataFree(waisState);
-}
-
-/* This will be called when socket lifetime is expired. */
-static void
-waisTimeout(int fd, void *data)
-{
- WaisStateData *waisState = (WaisStateData *)data;
- StoreEntry *entry = waisState->entry;
- debug(24, 4) ("waisTimeout: FD %d: '%s'\n", fd, storeUrl(entry));
-
- if (entry->store_status == STORE_PENDING) {
- waisState->fwd->fail(errorCon(ERR_READ_TIMEOUT, HTTP_GATEWAY_TIMEOUT, waisState->fwd->request));
- }
-
- comm_close(fd);
-}
-
-/* This will be called when data is ready to be read from fd. Read until
- * error or connection closed. */
-static void
-waisReadReply(int fd, char *buf, size_t len, comm_err_t flag, int xerrno, void *data)
-{
- WaisStateData *waisState = (WaisStateData *)data;
- StoreEntry *entry = waisState->entry;
- int clen;
- int bin;
- size_t read_sz;
-#if DELAY_POOLS
-
- DelayId delayId = entry->mem_obj->mostBytesAllowed();
-#endif
-
- /* Bail out early on COMM_ERR_CLOSING - close handlers will tidy up for us */
-
- if (flag == COMM_ERR_CLOSING) {
- return;
- }
-
- if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) {
- comm_close(fd);
- return;
- }
-
- errno = 0;
- read_sz = BUFSIZ;
-
- if (flag == COMM_OK && len > 0) {
-#if DELAY_POOLS
- delayId.bytesIn(len);
-#endif
-
- kb_incr(&statCounter.server.all.kbytes_in, len);
- kb_incr(&statCounter.server.other.kbytes_in, len);
- }
-
-#if DELAY_POOLS
- read_sz = delayId.bytesWanted(1, read_sz);
-
-#endif
-
- debug(24, 5) ("waisReadReply: FD %d read len:%d\n", fd, (int)len);
-
- if (flag == COMM_OK && len > 0) {
- commSetTimeout(fd, Config.Timeout.read, NULL, NULL);
- IOStats.Wais.reads++;
-
- for (clen = len - 1, bin = 0; clen; bin++)
- clen >>= 1;
-
- IOStats.Wais.read_hist[bin]++;
- }
-
- if (flag != COMM_OK || len < 0) {
- debug(50, 1) ("waisReadReply: FD %d: read failure: %s.\n",
- fd, xstrerror());
-
- if (ignoreErrno(xerrno)) {
- /* reinstall handlers */
- /* XXX This may loop forever */
- comm_read(fd, waisState->buf, read_sz, waisReadReply, waisState);
- } else {
- ErrorState *err;
- err = errorCon(ERR_READ_ERROR, HTTP_INTERNAL_SERVER_ERROR, waisState->fwd->request);
- err->xerrno = errno;
- waisState->fwd->fail(err);
- comm_close(fd);
- }
- } else if (flag == COMM_OK && len == 0 && !waisState->dataWritten) {
- waisState->fwd->fail(errorCon(ERR_ZERO_SIZE_OBJECT, HTTP_SERVICE_UNAVAILABLE, waisState->fwd->request));
- comm_close(fd);
- } else if (flag == COMM_OK && len == 0) {
- /* Connection closed; retrieval done. */
- entry->expires = squid_curtime;
- waisState->fwd->complete();
- comm_close(fd);
- } else {
- waisState->dataWritten = 1;
- storeAppend(entry, buf, len);
- comm_read(fd, waisState->buf, read_sz, waisReadReply, waisState);
- }
-}
-
-/* This will be called when request write is complete. Schedule read of
- * reply. */
-static void
-waisSendComplete(int fd, char *bufnotused, size_t size, comm_err_t errflag, int xerrno, void *data)
-{
- WaisStateData *waisState = (WaisStateData *)data;
- StoreEntry *entry = waisState->entry;
- debug(24, 5) ("waisSendComplete: FD %d size: %d errflag: %d\n",
- fd, (int) size, errflag);
-
- if (size > 0) {
- fd_bytes(fd, size, FD_WRITE);
- kb_incr(&statCounter.server.all.kbytes_out, size);
- kb_incr(&statCounter.server.other.kbytes_out, size);
- }
-
- if (errflag == COMM_ERR_CLOSING)
- return;
-
- if (errflag) {
- ErrorState *err;
- err = errorCon(ERR_WRITE_ERROR, HTTP_SERVICE_UNAVAILABLE, waisState->fwd->request);
- err->xerrno = xerrno;
- waisState->fwd->fail(err);
- comm_close(fd);
- } else {
- /* Schedule read reply. */
- entry->delayAwareRead(fd, waisState->buf, BUFSIZ, waisReadReply, waisState);
- }
-}
-
-/* This will be called when connect completes. Write request. */
-static void
-waisSendRequest(int fd, void *data)
-{
- WaisStateData *waisState = (WaisStateData *)data;
- MemBuf mb;
- const char *Method = RequestMethodStr[waisState->method];
- debug(24, 5) ("waisSendRequest: FD %d\n", fd);
- mb.init();
- mb.Printf("%s %s HTTP/1.0\r\n", Method, waisState->url);
-
- if (waisState->request_hdr) {
- Packer p;
- packerToMemInit(&p, &mb);
- waisState->request_hdr->packInto(&p);
- packerClean(&p);
- }
-
- mb.Printf("\r\n");
- debug(24, 6) ("waisSendRequest: buf: %s\n", mb.buf);
- comm_write_mbuf(fd, &mb, waisSendComplete, waisState);
-
- if (EBIT_TEST(waisState->entry->flags, ENTRY_CACHABLE))
- storeSetPublicKey(waisState->entry); /* Make it public */
-
- EBIT_CLR(waisState->entry->flags, ENTRY_FWD_HDR_WAIT);
-}
-
-CBDATA_TYPE(WaisStateData);
-void
-waisStart(FwdState * fwd)
-{
- WaisStateData *waisState = NULL;
- HttpRequest *request = fwd->request;
- StoreEntry *entry = fwd->entry;
- int fd = fwd->server_fd;
- const char *url = storeUrl(entry);
- method_t method = request->method;
- debug(24, 3) ("waisStart: \"%s %s\"\n", RequestMethodStr[method], url);
- statCounter.server.all.requests++;
- statCounter.server.other.requests++;
- CBDATA_INIT_TYPE(WaisStateData);
- waisState = cbdataAlloc(WaisStateData);
- waisState->method = method;
- waisState->request_hdr = &request->header;
- waisState->fd = fd;
- waisState->entry = entry;
- waisState->dataWritten = 0;
- xstrncpy(waisState->url, url, MAX_URL);
- waisState->request = HTTPMSGLOCK(request);
- waisState->fwd = fwd;
- comm_add_close_handler(waisState->fd, waisStateFree, waisState);
-
- entry->lock()
-
- ;
- commSetTimeout(fd, Config.Timeout.read, waisTimeout, waisState);
-
- waisSendRequest(fd, waisState);
-}
projects / thirdparty / squid.git / commitdiff
