Index: head/www/apache13-modssl/Makefile =================================================================== --- head/www/apache13-modssl/Makefile (revision 93303) +++ head/www/apache13-modssl/Makefile (revision 93304) @@ -1,211 +1,233 @@ # New ports collection makefile for: Apache + mod_ssl # Date created: Sat Aug 22 12:00:00 CDT 1998 # Whom: rse@engelschall.com # # $FreeBSD$ # PORTNAME= apache+mod_ssl PORTVERSION= ${VERSION_APACHE}+${VERSION_MODSSL} -PORTREVISION= 2 CATEGORIES= www security MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITES_MODSSL:S/$/:modssl/} DISTNAME= apache_${VERSION_APACHE} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}:modssl +.if defined(APACHE_WITH_MODSNMP) +PATCH_SITES= http://www.simpleweb.org/software/packages/mod-snmp/distr/ +PATCHFILES= mod_snmp_${VERSION_MODSNMP}.tar.gz +EXTRA_PATCH= ${WRKSRC}/src/module/snmp_agt/mod_snmp.patch +.endif + MAINTAINER= dinoex@FreeBSD.org COMMENT= The Apache 1.3 webserver with SSL/TLS functionality LIB_DEPENDS= mm.13:${PORTSDIR}/devel/mm PATCH_DEPENDS= ${BUILD_DEPENDS} CONFLICTS?= apache+ipv6-1.* apache+ssl-1.* apache-1.* apache-2.* \ apache_fp-1.* caudium-devel-1.* caudium10-1.* caudium12-* \ ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* w3c-httpd-3.* -VERSION_APACHE= 1.3.28 -VERSION_MODSSL= 2.8.15 +VERSION_APACHE= 1.3.29 +VERSION_MODSSL= 2.8.16 +VERSION_MODSNMP= 1.3.14.12 USE_OPENSSL= yes HAS_CONFIGURE= yes USE_PERL5_BUILD= yes MASTER_SITES_MODSSL= http://www.modssl.org/source/ \ ftp://ftp.modssl.org/source/ \ ftp://ftp.blatzheim.com/pub/mod_ssl/ \ ftp://ftp.fu-berlin.de/unix/security/mod_ssl/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/mod_ssl/source,} .include DATADIR= ${PREFIX}/www DOCSDIR= ${PREFIX}/share/doc/apache DOCUMENT_ROOT= ${DATADIR}/data .if defined(WITH_APACHE_SUEXEC) && ${WITH_APACHE_SUEXEC} == yes APACHE_SUEXEC_CALLER?=www APACHE_SUEXEC_DOCROOT?=${DOCUMENT_ROOT} APACHE_SUEXEC_LOG?=/var/log/httpd-suexec.log APACHE_SUEXEC_USERDIR?=public_html APACHE_SUEXEC_UIDMIN?=1000 APACHE_SUEXEC_GIDMIN?=1000 APACHE_SUEXEC_SAFE_PATH?=/bin:/usr/bin:${PREFIX}/bin SUEXEC_CONF= --enable-suexec \ --suexec-caller=${APACHE_SUEXEC_CALLER} \ --suexec-docroot=${APACHE_SUEXEC_DOCROOT} \ --suexec-logfile=${APACHE_SUEXEC_LOG} \ --suexec-userdir=${APACHE_SUEXEC_USERDIR} \ --suexec-uidmin=${APACHE_SUEXEC_UIDMIN} \ --suexec-gidmin=${APACHE_SUEXEC_GIDMIN} \ --suexec-safepath=${APACHE_SUEXEC_SAFE_PATH} .if defined(APACHE_SUEXEC_UMASK) SUEXEC_CONF+= --suexec-umask=${APACHE_SUEXEC_UMASK} .endif PLIST_SUB+= SUB_SUEXEC="" SUEXEC_MAN= suexec.8 .else # !SUEXEC SUEXEC_CONF= PLIST_SUB+= SUB_SUEXEC="@comment " SUEXEC_MAN= .endif # !SUEXEC CONFIGURE_ARGS+=--prefix=${PREFIX} \ --server-uid=www \ --server-gid=www \ --with-perl=${PERL} \ --with-layout=FreeBSD \ --without-confadjust \ --enable-module=most \ --enable-module=auth_db \ --enable-module=mmap_static \ --disable-module=auth_dbm \ --enable-shared=max \ --enable-module=ssl \ --enable-module=define \ ${SUEXEC_CONF} .if defined(APACHE_HARD_SERVER_LIMIT) HARD_SERVER_LIMIT=-DHARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT} .else HARD_SERVER_LIMIT=-DHARD_SERVER_LIMIT=512 .endif OPTIM= ${HARD_SERVER_LIMIT} \ -DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \ -DDEFAULT_PATH=\\"${PREFIX}/bin:/bin:/usr/bin\\" \ -DACCEPT_FILTER_NAME=\\"httpready\\" .if defined(APACHE_FD_SETSIZE) OPTIM+= -DFD_SETSIZE=${APACHE_FD_SETSIZE} .else OPTIM+= -DFD_SETSIZE=1024 .endif .if defined(APACHE_BUFFERED_LOGS) && ${APACHE_BUFFERED_LOGS} == yes OPTIM+= -DBUFFERED_LOGS .endif .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == yes CFLAGS+= -O3 .endif +.if defined(APACHE_WITH_MODSNMP) +CONFIGURE_ARGS+= --activate-module=src/modules/snmp_agt/libsnmp_agt.a +CFLAGS+= -DSNMP -DUSE_DB -DSNMP_CONFIG_H -DHARD_VIRTUAL_HOST_MAX=1000 \ + -DSNMPLOCALONLY +PLIST_SUB+= WITHSNMP="" +.else +PLIST_SUB+= WITHSNMP="@comment " +.endif + CONFIGURE_ENV= CFLAGS='${CFLAGS}' \ OPTIM='${OPTIM}' \ SSL_BASE='${OPENSSLBASE}' \ EAPI_MM='SYSTEM' \ PATH="${PREFIX}/bin:${PATH}" INSTALL_TARGET= install-quiet MAN1= dbmmanage.1 htdigest.1 htpasswd.1 MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \ ${SUEXEC_MAN} TYPE= test CRT= KEY= pre-fetch: @${ECHO_MSG} "" @${ECHO_MSG} "You may use the following build options:" @${ECHO_MSG} "" @${ECHO_MSG} " WITH_APACHE_SUEXEC=yes enable the suEXEC feature" @${ECHO_MSG} " [default is no]" @${ECHO_MSG} " APACHE_SUEXEC_CALLER=user set the suEXEC username of the allowed caller" @${ECHO_MSG} " [default is www]" @${ECHO_MSG} " APACHE_SUEXEC_DOCROOT=dir set the suEXEC root directory" @${ECHO_MSG} " [default is ${DOCUMENT_ROOT}]" @${ECHO_MSG} " APACHE_SUEXEC_LOG=file set the suEXEC logfile" @${ECHO_MSG} " [default is /var/log/httpd-suexec.log]" @${ECHO_MSG} " APACHE_SUEXEC_USERDIR=dir set the suEXEC user subdirectory" @${ECHO_MSG} " [default is public_html]" @${ECHO_MSG} " APACHE_SUEXEC_UIDMIN=uid set the suEXEC minimal allowed UID" @${ECHO_MSG} " [default is 1000]" @${ECHO_MSG} " APACHE_SUEXEC_GIDMIN=gid set the suEXEC minimal allowed GID" @${ECHO_MSG} " [default is 1000]" @${ECHO_MSG} " APACHE_SUEXEC_SAFE_PATH=path set the suEXEC safe PATH" @${ECHO_MSG} " [default is /bin:/usr/bin:${PREFIX}/bin]" @${ECHO_MSG} " APACHE_SUEXEC_UMASK=umask set the umask for the suEXEC'd script" @${ECHO_MSG} " [default is inherited from the Apache process]" @${ECHO_MSG} "" @${ECHO_MSG} " APACHE_HARD_SERVER_LIMIT=nr Maximum number of Apache processes." @${ECHO_MSG} " [default is 512]" @${ECHO_MSG} " APACHE_FD_SETSIZE=nr Maximum number of descriptors." @${ECHO_MSG} " [default is 1024]" @${ECHO_MSG} "" @${ECHO_MSG} " APACHE_BUFFERED_LOGS=yes Log entries are buffered before writing." @${ECHO_MSG} " Writes may not be atomic, entries from multiple" @${ECHO_MSG} " children could become mixed together and your" @${ECHO_MSG} " web stats may be inaccurate." @${ECHO_MSG} " [default is no]" @${ECHO_MSG} " APACHE_PERF_TUNING=yes CFLAGS optimization." @${ECHO_MSG} " This setting may produce broken code and thus" @${ECHO_MSG} " is not recommended for production servers." @${ECHO_MSG} " [default is no]" @${ECHO_MSG} "" post-extract: @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/apache.sh \ > ${WRKSRC}/apache.sh +.if defined(APACHE_WITH_MODSNMP) + (cd ${WRKSRC}; ${TAR} xfz ${DISTDIR}/${PATCHFILES}) +.endif pre-patch: @cd ${WRKDIR}/mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE} \ && ${ECHO_MSG} "===> Applying mod_ssl-${VERSION_MODSSL} extension" \ && ./configure --with-apache=../${DISTNAME} --expert post-patch: @${PERL} -pi -e 's|-print|-print0|;s|xargs|xargs -0|' \ ${WRKSRC}/Makefile.tmpl @${PERL} -pi -e "s|SSL_LDFLAGS=''|SSL_LDFLAGS='${OPENSSL_LDFLAGS}'|" \ ${WRKSRC}/src/modules/ssl/libssl.module @cd ${WRKSRC} \ && ${FIND} . -type f -name "*.orig" -print | ${XARGS} ${RM} -f post-build: @cd ${WRKSRC} \ && ${ECHO_MSG} "===> Creating Dummy Certificate for Server (SnakeOil)" \ && ${ECHO_MSG} " [use 'make certificate' to create a real one]" \ && ${MAKE} certificate TYPE=dummy >/dev/null 2>&1 certificate: @cd ${WRKSRC} \ && ${ECHO_MSG} "===> Creating Test Certificate for Server" \ && ${MAKE} certificate TYPE=${TYPE} CRT=${CRT} KEY=${KEY} pre-install: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: ${INSTALL_DATA} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh-dist @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ ${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ ${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \ fi +.if defined(APACHE_WITH_MODSNMP) + @${MKDIR} ${DATADIR}/buckets + @${CHOWN} www:www ${DATADIR}/buckets +.endif .include Property changes on: head/www/apache13-modssl/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.134 \ No newline at end of property +1.135 \ No newline at end of property Index: head/www/apache13-modssl/distinfo =================================================================== --- head/www/apache13-modssl/distinfo (revision 93303) +++ head/www/apache13-modssl/distinfo (revision 93304) @@ -1,2 +1,3 @@ -MD5 (apache_1.3.28.tar.gz) = 2cdece7b4881d541e072de6a2b65db77 -MD5 (mod_ssl-2.8.15-1.3.28.tar.gz) = 0f37d6efd51128f696000d73624f5aff +MD5 (apache_1.3.29.tar.gz) = e97fe9bf51dc2c9c233d53f63b1347e3 +MD5 (mod_ssl-2.8.16-1.3.29.tar.gz) = 4f6c580ffa07d33e8584406132b98e86 +MD5 (mod_snmp_1.3.14.12.tar.gz) = b0bddbb4e5ff4c6a46d114998f12740a Property changes on: head/www/apache13-modssl/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.70 \ No newline at end of property +1.71 \ No newline at end of property Index: head/www/apache13-modssl/files/patch-alloc.c =================================================================== --- head/www/apache13-modssl/files/patch-alloc.c (revision 93303) +++ head/www/apache13-modssl/files/patch-alloc.c (nonexistent) @@ -1,20 +0,0 @@ -RCS file: /e/apache/cvs/apache-1.3/src/main/alloc.c,v -retrieving revision 1.145 -diff -u -d -r1.145 alloc.c ---- src/main/alloc.c 20 Jun 2003 15:05:40 -0000 1.145 -+++ src/main/alloc.c 29 Jul 2003 19:07:46 -0000 -@@ -2859,12 +2859,8 @@ - if ((p->kill_how == kill_after_timeout) - || (p->kill_how == kill_only_once)) { - /* Subprocess may be dead already. Only need the timeout if not. */ -- if (ap_os_kill(p->pid, SIGTERM) == -1) { -- p->kill_how = kill_never; -- } -- else { -- need_timeout = 1; -- } -+ ap_os_kill(p->pid, SIGTERM); -+ need_timeout = 1; - } - else if (p->kill_how == kill_always) { - kill(p->pid, SIGKILL); Property changes on: head/www/apache13-modssl/files/patch-alloc.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/apache13-modssl/files/patch-cvs =================================================================== --- head/www/apache13-modssl/files/patch-cvs (revision 93303) +++ head/www/apache13-modssl/files/patch-cvs (nonexistent) @@ -1,595 +0,0 @@ -diff -urN src/include/httpd.h apache_1.3.29/src/include/httpd.h ---- src/include/httpd.h Wed Jul 16 22:20:26 2003 -+++ apache_1.3.29/src/include/httpd.h Fri Oct 24 18:11:40 2003 -@@ -274,6 +274,9 @@ - /* The size of the server's internal read-write buffers */ - #define IOBUFSIZE 8192 - -+/* The max number of regex captures that can be expanded by ap_pregsub */ -+#define AP_MAX_REG_MATCH 10 -+ - /* Number of servers to spawn off by default --- also, if fewer than - * this free when the caretaker checks, it will spawn more. - */ -diff -urN src/main/buff.c apache_1.3.29/src/main/buff.c ---- src/main/buff.c Mon Feb 3 18:13:20 2003 -+++ apache_1.3.29/src/main/buff.c Sun Oct 19 20:00:35 2003 -@@ -1497,7 +1497,6 @@ - rc1 = ap_bflush(fb); - else - rc1 = 0; --#if defined(WIN32) || defined(NETWARE) || defined(CYGWIN_WINSOCK) - if (fb->flags & B_SOCKET) { - rc2 = ap_pclosesocket(fb->pool, fb->fd); - if (fb->fd_in != fb->fd) { -@@ -1506,24 +1505,13 @@ - else { - rc3 = 0; - } -- } --#if !defined(NETWARE) && !defined(CYGWIN_WINSOCK) -- else if (fb->hFH != INVALID_HANDLE_VALUE) { -+ } else { -+#if defined(WIN32) -+ if (fb->hFH != INVALID_HANDLE_VALUE) { - rc2 = ap_pcloseh(fb->pool, fb->hFH); - rc3 = 0; - } --#endif - else { --#elif defined(BEOS) -- if (fb->flags & B_SOCKET) { -- rc2 = ap_pclosesocket(fb->pool, fb->fd); -- if (fb->fd_in != fb->fd) { -- rc3 = ap_pclosesocket(fb->pool, fb->fd_in); -- } -- else { -- rc3 = 0; -- } -- } else { - #endif - rc2 = ap_pclosef(fb->pool, fb->fd); - if (fb->fd_in != fb->fd) { -@@ -1532,7 +1520,8 @@ - else { - rc3 = 0; - } --#if defined(WIN32) || defined (BEOS) || defined(NETWARE) || defined(CYGWIN_WINSOCK) -+ } -+#if defined(WIN32) - } - #endif - -diff -urN src/main/http_core.c apache_1.3.29/src/main/http_core.c ---- src/main/http_core.c Mon Jul 7 15:02:28 2003 -+++ apache_1.3.29/src/main/http_core.c Sun Oct 19 15:20:57 2003 -@@ -1276,7 +1276,7 @@ - if (error_number == 401 && - line[0] != '/' && line[0] != '"') { /* Ignore it... */ - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, cmd->server, -- "cannot use a full or relative URL in a 401 ErrorDocument " -+ "cannot use a full URL in a 401 ErrorDocument " - "directive --- ignoring!"); - } - else { /* Store it... */ -diff -urN src/main/http_request.c apache_1.3.29/src/main/http_request.c ---- src/main/http_request.c Mon Jul 7 02:34:10 2003 -+++ apache_1.3.29/src/main/http_request.c Sat Oct 18 16:15:58 2003 -@@ -1117,7 +1117,15 @@ - * apache code, and continue with the usual REDIRECT handler. - * But note that the client will ultimately see the wrong - * status... -+ * -+ * Also, before updating r->status, we may need to ensure that -+ * the connection is dropped. For example, there may be -+ * unread request body that would confuse us if we try -+ * to read another request. - */ -+ if (ap_status_drops_connection(r->status)) { -+ r->connection->keepalive = -1; -+ } - r->status = REDIRECT; - ap_table_setn(r->headers_out, "Location", custom_response); - } -diff -urN src/main/rfc1413.c apache_1.3.29/src/main/rfc1413.c ---- src/main/rfc1413.c Mon Feb 3 18:13:23 2003 -+++ apache_1.3.29/src/main/rfc1413.c Thu Sep 18 23:13:17 2003 -@@ -99,6 +99,38 @@ - - int ap_rfc1413_timeout = RFC1413_TIMEOUT; /* Global so it can be changed */ - -+#if (defined (NETWARE) || defined (WIN32)) -+#define write(a,b,c) send(a,b,c,0) -+#define read(a,b,c) recv(a,b,c,0) -+#endif -+ -+#ifdef MULTITHREAD -+#define RFC_USER_STATIC -+ -+static int setsocktimeout (int sock, int timeout) -+{ -+#if (defined (NETWARE) || defined (WIN32)) -+ u_long msec = 0; -+ -+ /* Make sure that we are in blocking mode */ -+ if (ioctlsocket(sock, FIONBIO, &msec) == SOCKET_ERROR) { -+ return h_errno; -+ } -+ -+ /* Win32 timeouts are in msec, represented as int */ -+ msec = timeout * 1000; -+ setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, -+ (char *) &msec, sizeof(msec)); -+ setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, -+ (char *) &msec, sizeof(msec)); -+#else -+ /* XXX Needs to be implemented for non-winsock platforms */ -+#endif -+ return 0; -+} -+#else /* MULTITHREAD */ -+ -+#define RFC_USER_STATIC static - static JMP_BUF timebuf; - - /* ident_timeout - handle timeouts */ -@@ -106,6 +138,7 @@ - { - ap_longjmp(timebuf, sig); - } -+#endif - - /* bind_connect - bind both ends of a socket */ - /* Ambarish fix this. Very broken */ -@@ -237,22 +270,28 @@ - /* rfc1413 - return remote user name, given socket structures */ - API_EXPORT(char *) ap_rfc1413(conn_rec *conn, server_rec *srv) - { -- static char user[RFC1413_USERLEN + 1]; /* XXX */ -- static char *result; -- static int sock; -+ RFC_USER_STATIC char user[RFC1413_USERLEN + 1]; /* XXX */ -+ RFC_USER_STATIC char *result; -+ RFC_USER_STATIC int sock; - - result = FROM_UNKNOWN; - - sock = ap_psocket_ex(conn->pool, AF_INET, SOCK_STREAM, IPPROTO_TCP, 1); - if (sock < 0) { -- ap_log_error(APLOG_MARK, APLOG_CRIT, srv, -- "socket: rfc1413: error creating socket"); -- conn->remote_logname = result; -+ ap_log_error(APLOG_MARK, APLOG_CRIT, srv, -+ "socket: rfc1413: error creating socket"); -+ conn->remote_logname = result; - } - - /* - * Set up a timer so we won't get stuck while waiting for the server. - */ -+#ifdef MULTITHREAD -+ if (setsocktimeout(sock, ap_rfc1413_timeout) == 0) { -+ if (get_rfc1413(sock, &conn->local_addr, &conn->remote_addr, user, srv) >= 0) -+ result = ap_pstrdup (conn->pool, user); -+ } -+#else - if (ap_setjmp(timebuf) == 0) { - ap_set_callback_and_alarm(ident_timeout, ap_rfc1413_timeout); - -@@ -260,8 +299,10 @@ - result = user; - } - ap_set_callback_and_alarm(NULL, 0); -+#endif - ap_pclosesocket(conn->pool, sock); - conn->remote_logname = result; - - return conn->remote_logname; - } -+ -diff -urN src/modules/proxy/proxy_ftp.c apache_1.3.29/src/modules/proxy/proxy_ftp.c ---- src/modules/proxy/proxy_ftp.c Mon Feb 3 18:13:26 2003 -+++ apache_1.3.29/src/modules/proxy/proxy_ftp.c Thu Jul 17 18:05:51 2003 -@@ -547,13 +547,14 @@ - */ - int ap_proxy_ftp_handler(request_rec *r, cache_req *c, char *url) - { -- char *host, *path, *strp, *parms; -+ char *desthost, *path, *strp, *parms; -+ char *strp2; - char *cwd = NULL; - char *user = NULL; - /* char *account = NULL; how to supply an account in a URL? */ - const char *password = NULL; - const char *err; -- int port, i, j, len, rc, nocache = 0; -+ int destport, i, j, len, rc, nocache = 0; - int csd = 0, sock = -1, dsock = -1; - struct sockaddr_in server; - struct hostent server_hp; -@@ -562,6 +563,8 @@ - BUFF *ctrl = NULL; - BUFF *data = NULL; - pool *p = r->pool; -+ char *destportstr = NULL; -+ const char *urlptr = NULL; - int one = 1; - NET_SIZE_T clen; - char xfer_type = 'A'; /* after ftp login, the default is ASCII */ -@@ -593,17 +596,34 @@ - - /* We break the URL into host, port, path-search */ - -- host = r->parsed_uri.hostname; -- port = (r->parsed_uri.port != 0) -- ? r->parsed_uri.port -- : ap_default_port_for_request(r); -- path = ap_pstrdup(p, r->parsed_uri.path); -- if (path == NULL) -- path = ""; -- else -- while (*path == '/') -- ++path; -- -+ urlptr = strstr(url, "://"); -+ if (urlptr == NULL) -+ return HTTP_BAD_REQUEST; -+ urlptr += 3; -+ destport = 21; -+ strp = strchr(urlptr, '/'); -+ if (strp == NULL) { -+ desthost = ap_pstrdup(p, urlptr); -+ urlptr = "/"; -+ } -+ else { -+ char *q = ap_palloc(p, strp - urlptr + 1); -+ memcpy(q, urlptr, strp - urlptr); -+ q[strp - urlptr] = '\0'; -+ urlptr = strp; -+ desthost = q; -+ } -+ -+ strp2 = strchr(desthost, ':'); -+ if (strp2 != NULL) { -+ *(strp2++) = '\0'; -+ if (ap_isdigit(*strp2)) { -+ destport = atoi(strp2); -+ destportstr = strp2; -+ } -+ } -+ path = strchr(urlptr, '/')+1; -+ - /* - * The "Authorization:" header must be checked first. We allow the user - * to "override" the URL-coded user [ & password ] in the Browsers' -@@ -643,25 +663,25 @@ - } - - /* check if ProxyBlock directive on this host */ -- destaddr.s_addr = ap_inet_addr(host); -+ destaddr.s_addr = ap_inet_addr(desthost); - for (i = 0; i < conf->noproxies->nelts; i++) { - if (destaddr.s_addr == npent[i].addr.s_addr || - (npent[i].name != NULL && -- (npent[i].name[0] == '*' || strstr(host, npent[i].name) != NULL))) -+ (npent[i].name[0] == '*' || strstr(desthost, npent[i].name) != NULL))) - return ap_proxyerror(r, HTTP_FORBIDDEN, - "Connect to remote machine blocked"); - } - -- ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, r->server, "FTP: connect to %s:%d", host, port); -+ ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, r->server, "FTP: connect to %s:%d", desthost, destport); - -- parms = strchr(path, ';'); -+ parms = strchr(url, ';'); - if (parms != NULL) - *(parms++) = '\0'; - - memset(&server, 0, sizeof(struct sockaddr_in)); - server.sin_family = AF_INET; -- server.sin_port = htons((unsigned short)port); -- err = ap_proxy_host2addr(host, &server_hp); -+ server.sin_port = htons((unsigned short)destport); -+ err = ap_proxy_host2addr(desthost, &server_hp); - if (err != NULL) - return ap_proxyerror(r, HTTP_INTERNAL_SERVER_ERROR, err); - -@@ -1293,7 +1313,7 @@ - if (destaddr.s_addr == ncent[i].addr.s_addr || - (ncent[i].name != NULL && - (ncent[i].name[0] == '*' || -- strstr(host, ncent[i].name) != NULL))) { -+ strstr(desthost, ncent[i].name) != NULL))) { - nocache = 1; - break; - } -diff -urN src/modules/standard/mod_alias.c apache_1.3.29/src/modules/standard/mod_alias.c ---- src/modules/standard/mod_alias.c Thu Apr 24 18:08:21 2003 -+++ apache_1.3.29/src/modules/standard/mod_alias.c Fri Oct 24 18:11:41 2003 -@@ -299,7 +299,7 @@ - static char *try_alias_list(request_rec *r, array_header *aliases, int doesc, int *status) - { - alias_entry *entries = (alias_entry *) aliases->elts; -- regmatch_t regm[10]; -+ regmatch_t regm[AP_MAX_REG_MATCH]; - char *found = NULL; - int i; - -@@ -308,10 +308,10 @@ - int l; - - if (p->regexp) { -- if (!ap_regexec(p->regexp, r->uri, p->regexp->re_nsub + 1, regm, 0)) { -+ if (!ap_regexec(p->regexp, r->uri, AP_MAX_REG_MATCH, regm, 0)) { - if (p->real) { - found = ap_pregsub(r->pool, p->real, r->uri, -- p->regexp->re_nsub + 1, regm); -+ AP_MAX_REG_MATCH, regm); - if (found && doesc) { - found = ap_escape_uri(r->pool, found); - } -diff -urN src/modules/standard/mod_include.c apache_1.3.29/src/modules/standard/mod_include.c ---- src/modules/standard/mod_include.c Mon Feb 3 18:13:28 2003 -+++ apache_1.3.29/src/modules/standard/mod_include.c Sun Sep 21 23:32:12 2003 -@@ -1506,6 +1506,7 @@ - } - else { - new->left = current->right; -+ new->left->parent = new; - current->right = new; - new->parent = current; - } -@@ -1609,6 +1610,7 @@ - } - else { - new->left = current->right; -+ new->left->parent = new; - current->right = new; - new->parent = current; - } -diff -urN src/modules/standard/mod_mime.c apache_1.3.29/src/modules/standard/mod_mime.c ---- src/modules/standard/mod_mime.c Mon Feb 3 18:13:29 2003 -+++ apache_1.3.29/src/modules/standard/mod_mime.c Sun Aug 31 22:41:41 2003 -@@ -347,7 +347,7 @@ - - if (!(f = ap_pcfg_openfile(p, types_confname))) { - ap_log_error(APLOG_MARK, APLOG_ERR, s, -- "could not open mime types log file %s.", types_confname); -+ "could not open mime types config file %s.", types_confname); - exit(1); - } - -diff -urN src/modules/standard/mod_rewrite.c apache_1.3.29/src/modules/standard/mod_rewrite.c ---- src/modules/standard/mod_rewrite.c Mon May 19 04:35:31 2003 -+++ apache_1.3.29/src/modules/standard/mod_rewrite.c Fri Oct 24 18:11:41 2003 -@@ -1834,7 +1834,7 @@ - const char *vary; - char newuri[MAX_STRING_LEN]; - regex_t *regexp; -- regmatch_t regmatch[MAX_NMATCH]; -+ regmatch_t regmatch[AP_MAX_REG_MATCH]; - backrefinfo *briRR = NULL; - backrefinfo *briRC = NULL; - int prefixstrip; -@@ -1891,7 +1891,7 @@ - rewritelog(r, 3, "[per-dir %s] applying pattern '%s' to uri '%s'", - perdir, p->pattern, uri); - } -- rc = (ap_regexec(regexp, uri, regexp->re_nsub+1, regmatch, 0) == 0); -+ rc = (ap_regexec(regexp, uri, AP_MAX_REG_MATCH, regmatch, 0) == 0); - if (! (( rc && !(p->flags & RULEFLAG_NOTMATCH)) || - (!rc && (p->flags & RULEFLAG_NOTMATCH)) ) ) { - return 0; -@@ -2179,7 +2179,7 @@ - char input[MAX_STRING_LEN]; - struct stat sb; - request_rec *rsub; -- regmatch_t regmatch[MAX_NMATCH]; -+ regmatch_t regmatch[AP_MAX_REG_MATCH]; - int rc; - - /* -@@ -2283,8 +2283,7 @@ - } - else { - /* it is really a regexp pattern, so apply it */ -- rc = (ap_regexec(p->regexp, input, -- p->regexp->re_nsub+1, regmatch,0) == 0); -+ rc = (ap_regexec(p->regexp, input, AP_MAX_REG_MATCH, regmatch,0) == 0); - - /* if it isn't a negated pattern and really matched - we update the passed-through regex subst info structure */ -@@ -2442,7 +2441,7 @@ - bri = briRC; - } - /* see ap_pregsub() in src/main/util.c */ -- if (bri && n <= bri->nsub && -+ if (bri && n < AP_MAX_REG_MATCH && - bri->regmatch[n].rm_eo > bri->regmatch[n].rm_so) { - span = bri->regmatch[n].rm_eo - bri->regmatch[n].rm_so; - if (span > space) { -diff -urN src/modules/standard/mod_rewrite.h apache_1.3.29/src/modules/standard/mod_rewrite.h ---- src/modules/standard/mod_rewrite.h Mon May 19 04:35:31 2003 -+++ apache_1.3.29/src/modules/standard/mod_rewrite.h Fri Oct 24 18:11:41 2003 -@@ -253,8 +253,6 @@ - - #define MAX_ENV_FLAGS 15 - --#define MAX_NMATCH 10 -- - /* default maximum number of internal redirects */ - #define REWRITE_REDIRECT_LIMIT 10 - -@@ -368,7 +366,7 @@ - typedef struct backrefinfo { - char *source; - int nsub; -- regmatch_t regmatch[10]; -+ regmatch_t regmatch[AP_MAX_REG_MATCH]; - } backrefinfo; - - -diff -urN src/modules/standard/mod_usertrack.c apache_1.3.29/src/modules/standard/mod_usertrack.c ---- src/modules/standard/mod_usertrack.c Mon Feb 3 18:13:30 2003 -+++ apache_1.3.29/src/modules/standard/mod_usertrack.c Thu Oct 16 19:23:26 2003 -@@ -126,6 +126,8 @@ - char *cookie_name; - char *cookie_domain; - char *prefix_string; -+ char *regexp_string; /* used to compile regexp; save for debugging */ -+ regex_t *regexp; /* used to find usertrack cookie in cookie header */ - } cookie_dir_rec; - - /* Define this to allow post-2000 cookies. Cookies use two-digit dates, -@@ -284,35 +286,48 @@ - return; - } - -+/* dcfg->regexp is "^cookie_name=([^;]+)|;[ \t]+cookie_name=([^;]+)", -+ * which has three subexpressions, $0..$2 */ -+#define NUM_SUBS 3 -+ - static int spot_cookie(request_rec *r) - { - cookie_dir_rec *dcfg = ap_get_module_config(r->per_dir_config, - &usertrack_module); -- const char *cookie; -- char *value; -+ const char *cookie_header; -+ regmatch_t regm[NUM_SUBS]; -+ int i; - - if (!dcfg->enabled) { - return DECLINED; - } - -- if ((cookie = ap_table_get(r->headers_in, -- (dcfg->style == CT_COOKIE2 -- ? "Cookie2" -- : "Cookie")))) -- if ((value = strstr(cookie, dcfg->cookie_name))) { -- char *cookiebuf, *cookieend; -- -- value += strlen(dcfg->cookie_name) + 1; /* Skip over the '=' */ -- cookiebuf = ap_pstrdup(r->pool, value); -- cookieend = strchr(cookiebuf, ';'); -- if (cookieend) -- *cookieend = '\0'; /* Ignore anything after a ; */ -- -- /* Set the cookie in a note, for logging */ -- ap_table_setn(r->notes, "cookie", cookiebuf); -+ if ((cookie_header = ap_table_get(r->headers_in, -+ (dcfg->style == CT_COOKIE2 -+ ? "Cookie2" -+ : "Cookie")))) { -+ if (!ap_regexec(dcfg->regexp, cookie_header, NUM_SUBS, regm, 0)) { -+ char *cookieval = NULL; -+ /* Our regexp, -+ * ^cookie_name=([^;]+)|;[ \t]+cookie_name=([^;]+) -+ * only allows for $1 or $2 to be available. ($0 is always -+ * filled with the entire matched expression, not just -+ * the part in parentheses.) So just check for either one -+ * and assign to cookieval if present. */ -+ if (regm[1].rm_so != -1) { -+ cookieval = ap_pregsub(r->pool, "$1", cookie_header, -+ NUM_SUBS, regm); -+ } -+ if (regm[2].rm_so != -1) { -+ cookieval = ap_pregsub(r->pool, "$2", cookie_header, -+ NUM_SUBS, regm); -+ } -+ /* Set the cookie in a note, for logging */ -+ ap_table_setn(r->notes, "cookie", cookieval); - -- return DECLINED; /* There's already a cookie, no new one */ -- } -+ return DECLINED; /* There's already a cookie, no new one */ -+ } -+ } - make_cookie(r); - return OK; /* We set our cookie */ - } -@@ -422,7 +437,26 @@ - { - cookie_dir_rec *dcfg = (cookie_dir_rec *) mconfig; - -+ /* The goal is to end up with this regexp, -+ * ^cookie_name=([^;]+)|;[ \t]+cookie_name=([^;]+) -+ * with cookie_name -+ * obviously substituted with the real cookie name set by the -+ * user in httpd.conf. */ -+ dcfg->regexp_string = ap_pstrcat(cmd->pool, "^", name, -+ "=([^;]+)|;[ \t]+", name, -+ "=([^;]+)", NULL); -+ - dcfg->cookie_name = ap_pstrdup(cmd->pool, name); -+ -+ dcfg->regexp = ap_pregcomp(cmd->pool, dcfg->regexp_string, REG_EXTENDED); -+ if (dcfg->regexp == NULL) { -+ return "Regular expression could not be compiled."; -+ } -+ if (dcfg->regexp->re_nsub + 1 != NUM_SUBS) { -+ return ap_pstrcat(cmd->pool, "Invalid cookie name \"", -+ name, "\"", NULL); -+ } -+ - return NULL; - } - -diff -urN src/support/ab.c apache_1.3.29/src/support/ab.c ---- src/support/ab.c Sun Jul 6 19:52:27 2003 -+++ apache_1.3.29/src/support/ab.c Thu Jul 31 22:30:26 2003 -@@ -1358,14 +1358,14 @@ - static void copyright(void) - { - if (!use_html) { -- printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.69 $> apache-1.3"); -+ printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.70 $> apache-1.3"); - printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n"); - printf("Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/\n"); - printf("\n"); - } - else { - printf("

\n"); -- printf(" This is ApacheBench, Version %s <%s> apache-1.3
\n", VERSION, "$Revision: 1.69 $"); -+ printf(" This is ApacheBench, Version %s <%s> apache-1.3
\n", VERSION, "$Revision: 1.70 $"); - printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/
\n"); - printf(" Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/
\n"); - printf("

\n

\n"); -@@ -1593,7 +1593,12 @@ - */ - while (isspace((int)*optarg)) - optarg++; -- l = ap_base64encode(tmp, optarg, strlen(optarg)); -+ if (ap_base64encode_len(strlen(optarg)) > sizeof(tmp)) { -+ fprintf(stderr, "%s: Authentication credentials too long\n", -+ argv[0]); -+ exit(1); -+ } -+ l = ap_base64encode(tmp, optarg, strlen(optarg)); - tmp[l] = '\0'; - - strncat(auth, "Authorization: Basic ", sizeof(auth)-strlen(auth)-1); -@@ -1606,6 +1611,10 @@ - */ - while (isspace((int)*optarg)) - optarg++; -+ if (ap_base64encode_len(strlen(optarg)) > sizeof(tmp)) { -+ fprintf(stderr, "%s: Proxy credentials too long\n", argv[0]); -+ exit(1); -+ } - l = ap_base64encode(tmp, optarg, strlen(optarg)); - tmp[l] = '\0'; - -diff -urN src/support/dbmmanage apache_1.3.29/src/support/dbmmanage ---- src/support/dbmmanage Mon Feb 3 18:13:36 2003 -+++ apache_1.3.29/src/support/dbmmanage Thu Sep 4 16:01:19 2003 -@@ -211,7 +211,7 @@ - srand (time ^ $$ or time ^ ($$ + ($$ << 15))); - } - else { -- for (qw(-xlwwa -le)) { -+ for (qw(xlwwa -le)) { - `ps $_ 2>/dev/null`; - $psf = $_, last unless $?; - } Property changes on: head/www/apache13-modssl/files/patch-cvs ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/apache13-modssl/pkg-descr =================================================================== --- head/www/apache13-modssl/pkg-descr (revision 93303) +++ head/www/apache13-modssl/pkg-descr (revision 93304) @@ -1,37 +1,40 @@ This is Apache version 1.3 plus mod_ssl which provides strong cryptography via the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols by the help of the SSL/TLS implementation toolkit OpenSSL which is based on SSLeay from Eric A. Young and Tim J. Hudson. The mod_ssl package was created in April 1998 by Ralf S. Engelschall and was originally derived from software developed by Ben Laurie for use in the Apache-SSL HTTP server project. As a summary, here are its main SSL/TLS-related features: o Open-Source software (BSD-style license) o Useable for both commercial and non-commercial use o Available for both Unix and Win32 (Windows 95/98/NT) platforms o 128-bit strong cryptography world-wide o Support for SSLv2, SSLv3 and TLSv1 protocols o Support for both RSA and Diffie-Hellman ciphers o Clean reviewable ANSI C source code o Clean Apache module architecture o Integrates seamlessly into Apache through an Extended API (EAPI) o Full Dynamic Shared Object (DSO) support o Advanced pass-phrase handling for private keys o X.509 certificate based authentication for both client and server o X.509 certificate revocation list (CRL) support o Support for per-URL renegotiation of SSL handshake parameters o Support for explicit seeding of the PRNG from external sources o Additional boolean-expression based access control facility o Backward compatibility to other Apache SSL solutions o Inter-process SSL session cache (DBM and Shared Memory based) o Powerful dedicated SSL engine logging facility o Simple and robust application to Apache source trees o Fully integrated into the Apache 1.3 configuration mechanism o Additional integration into the Apache Autoconf-style Interface (APACI) o Assistance in X.509v3 certificate generation (both RSA and DSA) o Experimental support for external Crypto Devices (OpenSSL ENGINE) +mod_snmp is a plug-in for apche-1.3.x to take apache status by SNMP + WWW: http://www.apache.org/ WWW: http://www.modssl.org/ WWW: http://www.openssl.org/ +WWW: http://www.simpleweb.org/software/packages/mod-snmp/ Property changes on: head/www/apache13-modssl/pkg-descr ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property Index: head/www/apache13-modssl/pkg-plist =================================================================== --- head/www/apache13-modssl/pkg-plist (revision 93303) +++ head/www/apache13-modssl/pkg-plist (revision 93304) @@ -1,757 +1,769 @@ bin/checkgid bin/dbmmanage bin/htdigest bin/htpasswd @unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf-dist; then rm -f %D/etc/apache/access.conf; fi etc/apache/access.conf-dist @exec [ ! -f %B/access.conf ] && cp %B/%f %B/access.conf @unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf-dist; then rm -f %D/etc/apache/httpd.conf; fi etc/apache/httpd.conf-dist @exec [ ! -f %B/httpd.conf ] && cp %B/%f %B/httpd.conf @unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic-dist; then rm -f %D/etc/apache/magic; fi etc/apache/magic-dist @exec [ ! -f %B/magic ] && cp %B/%f %B/magic @unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types-dist; then rm -f %D/etc/apache/mime.types; fi etc/apache/mime.types-dist @exec [ ! -f %B/mime.types ] && cp %B/%f %B/mime.types @unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf-dist; then rm -f %D/etc/apache/srm.conf; fi etc/apache/srm.conf-dist @exec [ ! -f %B/srm.conf ] && cp %B/%f %B/srm.conf etc/apache/ssl.crl/Makefile etc/apache/ssl.crl/README.CRL etc/apache/ssl.crt/Makefile etc/apache/ssl.crt/README.CRT etc/apache/ssl.crt/ca-bundle.crt etc/apache/ssl.crt/server.crt etc/apache/ssl.crt/snakeoil-ca-dsa.crt etc/apache/ssl.crt/snakeoil-ca-rsa.crt etc/apache/ssl.crt/snakeoil-dsa.crt etc/apache/ssl.crt/snakeoil-rsa.crt etc/apache/ssl.csr/README.CSR etc/apache/ssl.csr/server.csr etc/apache/ssl.key/README.KEY etc/apache/ssl.key/server.key etc/apache/ssl.key/snakeoil-ca-dsa.key etc/apache/ssl.key/snakeoil-ca-rsa.key etc/apache/ssl.key/snakeoil-dsa.key etc/apache/ssl.key/snakeoil-rsa.key etc/apache/ssl.prm/README.PRM etc/apache/ssl.prm/snakeoil-ca-dsa.prm etc/apache/ssl.prm/snakeoil-dsa.prm @unexec if cmp -s %D/etc/rc.d/apache.sh %D/etc/rc.d/apache.sh-dist; then rm -f %D/etc/rc.d/apache.sh; fi etc/rc.d/apache.sh-dist include/apache/ap.h include/apache/ap_alloc.h include/apache/ap_compat.h include/apache/ap_config.h include/apache/ap_config_auto.h include/apache/ap_ctx.h include/apache/ap_ctype.h include/apache/ap_ebcdic.h include/apache/ap_hook.h include/apache/ap_md5.h include/apache/ap_mm.h include/apache/ap_mmn.h include/apache/ap_sha1.h include/apache/buff.h include/apache/compat.h include/apache/conf.h include/apache/explain.h include/apache/fnmatch.h include/apache/hsregex.h include/apache/http_conf_globals.h include/apache/http_config.h include/apache/http_core.h include/apache/http_log.h include/apache/http_main.h include/apache/http_protocol.h include/apache/http_request.h include/apache/http_vhost.h include/apache/httpd.h include/apache/multithread.h include/apache/os-inline.c include/apache/os.h include/apache/rfc1413.h include/apache/scoreboard.h include/apache/util_date.h include/apache/util_md5.h include/apache/util_script.h include/apache/util_uri.h include/apache/xml/asciitab.h include/apache/xml/hashtable.h include/apache/xml/iasciitab.h include/apache/xml/latin1tab.h include/apache/xml/nametab.h include/apache/xml/utf8tab.h include/apache/xml/xmldef.h include/apache/xml/xmlparse.h include/apache/xml/xmlrole.h include/apache/xml/xmltok.h include/apache/xml/xmltok_impl.h libexec/apache/httpd.exp libexec/apache/libproxy.so libexec/apache/libssl.so libexec/apache/mod_access.so libexec/apache/mod_actions.so libexec/apache/mod_alias.so libexec/apache/mod_asis.so libexec/apache/mod_auth.so libexec/apache/mod_auth_anon.so libexec/apache/mod_auth_db.so libexec/apache/mod_autoindex.so libexec/apache/mod_cern_meta.so libexec/apache/mod_cgi.so libexec/apache/mod_define.so libexec/apache/mod_digest.so libexec/apache/mod_dir.so libexec/apache/mod_env.so libexec/apache/mod_expires.so libexec/apache/mod_headers.so libexec/apache/mod_imap.so libexec/apache/mod_include.so libexec/apache/mod_info.so libexec/apache/mod_log_config.so libexec/apache/mod_mime.so libexec/apache/mod_mime_magic.so libexec/apache/mod_mmap_static.so libexec/apache/mod_negotiation.so libexec/apache/mod_rewrite.so libexec/apache/mod_setenvif.so libexec/apache/mod_speling.so libexec/apache/mod_status.so libexec/apache/mod_unique_id.so libexec/apache/mod_userdir.so libexec/apache/mod_usertrack.so libexec/apache/mod_vhost_alias.so sbin/ab sbin/apachectl sbin/apxs sbin/httpd sbin/logresolve sbin/rotatelogs %%SUB_SUEXEC%%sbin/suexec www/data-dist/apache_pb.gif @exec [ -d %D/www/data/ ] || ln -fs %B %D/www/data www/data-dist/index.html.ca www/data-dist/index.html.cz www/data-dist/index.html.de www/data-dist/index.html.dk www/data-dist/index.html.ee www/data-dist/index.html.el www/data-dist/index.html.en www/data-dist/index.html.es www/data-dist/index.html.fr www/data-dist/index.html.he.iso8859-8 www/data-dist/index.html.it www/data-dist/index.html.ja.jis www/data-dist/index.html.kr.iso-kr www/data-dist/index.html.lb.utf8 www/data-dist/index.html.nl www/data-dist/index.html.nn www/data-dist/index.html.no www/data-dist/index.html.po.iso-pl www/data-dist/index.html.pt www/data-dist/index.html.pt-br www/data-dist/index.html.ru.cp-1251 www/data-dist/index.html.ru.cp866 www/data-dist/index.html.ru.iso-ru www/data-dist/index.html.ru.koi8-r www/data-dist/index.html.ru.ucs2 www/data-dist/index.html.ru.ucs4 www/data-dist/index.html.ru.utf8 www/data-dist/index.html.se www/data-dist/index.html.zh-tw.big5 +%%DOCSDIR%%/FAQ.html %%DOCSDIR%%/LICENSE %%DOCSDIR%%/bind.html.en %%DOCSDIR%%/bind.html.fr %%DOCSDIR%%/bind.html.html %%DOCSDIR%%/bind.html.ja.jis %%DOCSDIR%%/cgi_path.html.en %%DOCSDIR%%/cgi_path.html.fr %%DOCSDIR%%/cgi_path.html.html %%DOCSDIR%%/cgi_path.html.ja.jis %%DOCSDIR%%/configuring.html.fr %%DOCSDIR%%/configuring.html.en %%DOCSDIR%%/configuring.html.ja.jis %%DOCSDIR%%/content-negotiation.html.en %%DOCSDIR%%/content-negotiation.html.html %%DOCSDIR%%/content-negotiation.html.ja.jis %%DOCSDIR%%/custom-error.html.en %%DOCSDIR%%/custom-error.html.ja.jis %%DOCSDIR%%/cygwin.html %%DOCSDIR%%/dns-caveats.html.en %%DOCSDIR%%/dns-caveats.html.fr %%DOCSDIR%%/dns-caveats.html.html %%DOCSDIR%%/dso.html %%DOCSDIR%%/ebcdic.html %%DOCSDIR%%/env.html.en %%DOCSDIR%%/env.html.html %%DOCSDIR%%/env.html.ja.jis %%DOCSDIR%%/footer.html %%DOCSDIR%%/handler.html.en %%DOCSDIR%%/handler.html.ja.jis %%DOCSDIR%%/header.html %%DOCSDIR%%/howto/auth.html %%DOCSDIR%%/howto/cgi.html.en %%DOCSDIR%%/howto/cgi.html.ja.jis %%DOCSDIR%%/howto/footer.html %%DOCSDIR%%/howto/header.html %%DOCSDIR%%/howto/htaccess.html %%DOCSDIR%%/images/apache_pb.gif %%DOCSDIR%%/images/apache_header.gif %%DOCSDIR%%/images/custom_errordocs.gif %%DOCSDIR%%/images/feather.jpg %%DOCSDIR%%/images/home.gif %%DOCSDIR%%/images/index.gif %%DOCSDIR%%/images/mod_rewrite_fig1.fig %%DOCSDIR%%/images/mod_rewrite_fig1.gif %%DOCSDIR%%/images/mod_rewrite_fig2.fig %%DOCSDIR%%/images/mod_rewrite_fig2.gif %%DOCSDIR%%/images/mod_ssl_sb.gif %%DOCSDIR%%/images/openssl_ics.gif %%DOCSDIR%%/images/pixel.gif %%DOCSDIR%%/images/sub.gif %%DOCSDIR%%/index.html.en %%DOCSDIR%%/index.html.ja.jis %%DOCSDIR%%/install-tpf.html %%DOCSDIR%%/install.html.es %%DOCSDIR%%/install.html.en %%DOCSDIR%%/install.html.ja.jis %%DOCSDIR%%/invoking.html.en %%DOCSDIR%%/invoking.html.html %%DOCSDIR%%/keepalive.html.en %%DOCSDIR%%/keepalive.html.html %%DOCSDIR%%/keepalive.html.ja.jis %%DOCSDIR%%/location.html %%DOCSDIR%%/logs.html %%DOCSDIR%%/man-template.html %%DOCSDIR%%/misc/API.html %%DOCSDIR%%/misc/FAQ.html %%DOCSDIR%%/misc/HTTP_Features.tsv %%DOCSDIR%%/misc/client_block_api.html %%DOCSDIR%%/misc/compat_notes.html %%DOCSDIR%%/misc/custom_errordocs.html %%DOCSDIR%%/misc/descriptors.html %%DOCSDIR%%/misc/fin_wait_2.html %%DOCSDIR%%/misc/footer.html %%DOCSDIR%%/misc/header.html %%DOCSDIR%%/misc/howto.html %%DOCSDIR%%/misc/index.html %%DOCSDIR%%/misc/known_client_problems.html %%DOCSDIR%%/misc/nopgp.html %%DOCSDIR%%/misc/perf-bsd44.html %%DOCSDIR%%/misc/perf-dec.html %%DOCSDIR%%/misc/perf-hp.html %%DOCSDIR%%/misc/perf-tuning.html %%DOCSDIR%%/misc/perf.html %%DOCSDIR%%/misc/rewriteguide.html %%DOCSDIR%%/misc/security_tips.html %%DOCSDIR%%/misc/tutorials.html %%DOCSDIR%%/misc/vif-info.html %%DOCSDIR%%/misc/windoz_keepalive.html %%DOCSDIR%%/mod/core.html.en %%DOCSDIR%%/mod/core.html.fr %%DOCSDIR%%/mod/core.html.html %%DOCSDIR%%/mod/core.html.ja.jis %%DOCSDIR%%/mod/directive-dict.html.en %%DOCSDIR%%/mod/directive-dict.html.fr %%DOCSDIR%%/mod/directive-dict.html.ja.jis %%DOCSDIR%%/mod/directives.html.de %%DOCSDIR%%/mod/directives.html.en %%DOCSDIR%%/mod/directives.html.fr %%DOCSDIR%%/mod/directives.html.html %%DOCSDIR%%/mod/directives.html.ja.jis %%DOCSDIR%%/mod/footer.html %%DOCSDIR%%/mod/header.html %%DOCSDIR%%/mod/index-bytype.html.en %%DOCSDIR%%/mod/index-bytype.html.fr %%DOCSDIR%%/mod/index-bytype.html.html %%DOCSDIR%%/mod/index-bytype.html.ja.jis %%DOCSDIR%%/mod/index.html.en %%DOCSDIR%%/mod/index.html.fr %%DOCSDIR%%/mod/index.html.html %%DOCSDIR%%/mod/index.html.ja.jis %%DOCSDIR%%/mod/mod_access.html.en %%DOCSDIR%%/mod/mod_access.html.html %%DOCSDIR%%/mod/mod_access.html.ja.jis %%DOCSDIR%%/mod/mod_actions.html.en %%DOCSDIR%%/mod/mod_actions.html.html %%DOCSDIR%%/mod/mod_actions.html.ja.jis %%DOCSDIR%%/mod/mod_alias.html.en %%DOCSDIR%%/mod/mod_alias.html.html %%DOCSDIR%%/mod/mod_alias.html.ja.jis %%DOCSDIR%%/mod/mod_asis.html.en %%DOCSDIR%%/mod/mod_asis.html.html %%DOCSDIR%%/mod/mod_asis.html.ja.jis %%DOCSDIR%%/mod/mod_auth.html.en %%DOCSDIR%%/mod/mod_auth.html.html %%DOCSDIR%%/mod/mod_auth.html.ja.jis %%DOCSDIR%%/mod/mod_auth_anon.html %%DOCSDIR%%/mod/mod_auth_db.html %%DOCSDIR%%/mod/mod_auth_dbm.html %%DOCSDIR%%/mod/mod_auth_digest.html %%DOCSDIR%%/mod/mod_autoindex.html %%DOCSDIR%%/mod/mod_browser.html %%DOCSDIR%%/mod/mod_cern_meta.html %%DOCSDIR%%/mod/mod_cgi.html.en %%DOCSDIR%%/mod/mod_cgi.html.html %%DOCSDIR%%/mod/mod_cgi.html.ja.jis %%DOCSDIR%%/mod/mod_cookies.html %%DOCSDIR%%/mod/mod_define.html %%DOCSDIR%%/mod/mod_digest.html %%DOCSDIR%%/mod/mod_dir.html.en %%DOCSDIR%%/mod/mod_dir.html.html %%DOCSDIR%%/mod/mod_dir.html.ja.jis %%DOCSDIR%%/mod/mod_dld.html %%DOCSDIR%%/mod/mod_env.html.en %%DOCSDIR%%/mod/mod_env.html.html %%DOCSDIR%%/mod/mod_env.html.ja.jis %%DOCSDIR%%/mod/mod_example.html %%DOCSDIR%%/mod/mod_expires.html %%DOCSDIR%%/mod/mod_headers.html %%DOCSDIR%%/mod/mod_imap.html %%DOCSDIR%%/mod/mod_include.html %%DOCSDIR%%/mod/mod_info.html.en %%DOCSDIR%%/mod/mod_info.html.html %%DOCSDIR%%/mod/mod_info.html.ja.jis %%DOCSDIR%%/mod/mod_isapi.html %%DOCSDIR%%/mod/mod_log_agent.html %%DOCSDIR%%/mod/mod_log_common.html %%DOCSDIR%%/mod/mod_log_config.html.en %%DOCSDIR%%/mod/mod_log_config.html.html %%DOCSDIR%%/mod/mod_log_config.html.ja.jis %%DOCSDIR%%/mod/mod_log_referer.html %%DOCSDIR%%/mod/mod_mime.html.en %%DOCSDIR%%/mod/mod_mime.html.html %%DOCSDIR%%/mod/mod_mime.html.ja.jis %%DOCSDIR%%/mod/mod_mime_magic.html %%DOCSDIR%%/mod/mod_mmap_static.html %%DOCSDIR%%/mod/mod_negotiation.html.en %%DOCSDIR%%/mod/mod_negotiation.html.ja.jis %%DOCSDIR%%/mod/mod_proxy.html -%%DOCSDIR%%/mod/mod_rewrite.html +%%DOCSDIR%%/mod/mod_rewrite.html.en +%%DOCSDIR%%/mod/mod_rewrite.html.html +%%DOCSDIR%%/mod/mod_rewrite.html.ja.jis %%DOCSDIR%%/mod/mod_setenvif.html.en %%DOCSDIR%%/mod/mod_setenvif.html.html %%DOCSDIR%%/mod/mod_setenvif.html.ja.jis %%DOCSDIR%%/mod/mod_so.html.en %%DOCSDIR%%/mod/mod_so.html.html %%DOCSDIR%%/mod/mod_so.html.ja.jis %%DOCSDIR%%/mod/mod_speling.html.en %%DOCSDIR%%/mod/mod_speling.html.html %%DOCSDIR%%/mod/mod_speling.html.ja.jis %%DOCSDIR%%/mod/mod_ssl/index.html %%DOCSDIR%%/mod/mod_ssl/ssl_compat.gfont000.gif %%DOCSDIR%%/mod/mod_ssl/ssl_compat.html %%DOCSDIR%%/mod/mod_ssl/ssl_compat.wml %%DOCSDIR%%/mod/mod_ssl/ssl_cover.wml %%DOCSDIR%%/mod/mod_ssl/ssl_cover_logo.jpg %%DOCSDIR%%/mod/mod_ssl/ssl_cover_title.jpg %%DOCSDIR%%/mod/mod_ssl/ssl_faq.gfont000.gif %%DOCSDIR%%/mod/mod_ssl/ssl_faq.html %%DOCSDIR%%/mod/mod_ssl/ssl_faq.wml %%DOCSDIR%%/mod/mod_ssl/ssl_glossary.html %%DOCSDIR%%/mod/mod_ssl/ssl_glossary.wml %%DOCSDIR%%/mod/mod_ssl/ssl_howto.gfont000.gif %%DOCSDIR%%/mod/mod_ssl/ssl_howto.html %%DOCSDIR%%/mod/mod_ssl/ssl_howto.wml %%DOCSDIR%%/mod/mod_ssl/ssl_intro.gfont000.gif %%DOCSDIR%%/mod/mod_ssl/ssl_intro.html %%DOCSDIR%%/mod/mod_ssl/ssl_intro.wml %%DOCSDIR%%/mod/mod_ssl/ssl_intro_fig1.gif %%DOCSDIR%%/mod/mod_ssl/ssl_intro_fig2.gif %%DOCSDIR%%/mod/mod_ssl/ssl_intro_fig3.gif %%DOCSDIR%%/mod/mod_ssl/ssl_overview.gfont000.gif %%DOCSDIR%%/mod/mod_ssl/ssl_overview.html %%DOCSDIR%%/mod/mod_ssl/ssl_overview.wml %%DOCSDIR%%/mod/mod_ssl/ssl_overview_fig1.gif %%DOCSDIR%%/mod/mod_ssl/ssl_reference.gfont000.gif %%DOCSDIR%%/mod/mod_ssl/ssl_reference.html %%DOCSDIR%%/mod/mod_ssl/ssl_reference.wml %%DOCSDIR%%/mod/mod_ssl/ssl_template.head-chapter.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-1.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-2.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-3.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-4.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-5.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-6.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.head-num-7.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.inc %%DOCSDIR%%/mod/mod_ssl/ssl_template.navbut-next-n.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.navbut-next-s.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.navbut-prev-n.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.navbut-prev-s.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.title-abstract.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.title-compat.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.title-faq.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.title-gloss.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.title-howto.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.title-intro.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.title-over.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.title-preface.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.title-ref.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.title-toc.gif %%DOCSDIR%%/mod/mod_ssl/ssl_template.title-tutor.gif %%DOCSDIR%%/mod/mod_status.html %%DOCSDIR%%/mod/mod_unique_id.html.en %%DOCSDIR%%/mod/mod_unique_id.html.html %%DOCSDIR%%/mod/mod_unique_id.html.ja.jis %%DOCSDIR%%/mod/mod_userdir.html.en %%DOCSDIR%%/mod/mod_userdir.html.html %%DOCSDIR%%/mod/mod_userdir.html.ja.jis %%DOCSDIR%%/mod/mod_usertrack.html %%DOCSDIR%%/mod/mod_vhost_alias.html %%DOCSDIR%%/mod/module-dict.html.en %%DOCSDIR%%/mod/module-dict.html.ja.jis %%DOCSDIR%%/mpeix.html %%DOCSDIR%%/multilogs.html %%DOCSDIR%%/netware.html %%DOCSDIR%%/new_features_1_0.html %%DOCSDIR%%/new_features_1_1.html %%DOCSDIR%%/new_features_1_2.html %%DOCSDIR%%/new_features_1_3.html.en %%DOCSDIR%%/new_features_1_3.html.ja.jis %%DOCSDIR%%/new_features_2_0.html %%DOCSDIR%%/process-model.html.en %%DOCSDIR%%/process-model.html.html %%DOCSDIR%%/process-model.html.ja.jis %%DOCSDIR%%/programs/ab.html %%DOCSDIR%%/programs/apachectl.html.en %%DOCSDIR%%/programs/apachectl.html.html %%DOCSDIR%%/programs/apachectl.html.ja.jis %%DOCSDIR%%/programs/apxs.html %%DOCSDIR%%/programs/dbmmanage.html %%DOCSDIR%%/programs/footer.html %%DOCSDIR%%/programs/header.html %%DOCSDIR%%/programs/htdigest.html %%DOCSDIR%%/programs/htpasswd.html.en %%DOCSDIR%%/programs/htpasswd.html.html %%DOCSDIR%%/programs/htpasswd.html.ja.jis %%DOCSDIR%%/programs/httpd.html.en %%DOCSDIR%%/programs/httpd.html.html %%DOCSDIR%%/programs/httpd.html.ja.jis %%DOCSDIR%%/programs/index.html.en %%DOCSDIR%%/programs/index.html.html %%DOCSDIR%%/programs/index.html.ja.jis %%DOCSDIR%%/programs/logresolve.html %%DOCSDIR%%/programs/other.html %%DOCSDIR%%/programs/rotatelogs.html %%DOCSDIR%%/programs/suexec.html.en %%DOCSDIR%%/programs/suexec.html.html %%DOCSDIR%%/programs/suexec.html.ja.jis %%DOCSDIR%%/readme-tpf.html %%DOCSDIR%%/search/manual-index.cgi %%DOCSDIR%%/server-wide.html.en %%DOCSDIR%%/server-wide.html.ja.jis %%DOCSDIR%%/sections.html.en %%DOCSDIR%%/sections.html.html %%DOCSDIR%%/sections.html.ja.jis %%DOCSDIR%%/sitemap.html %%DOCSDIR%%/sourcereorg.html %%DOCSDIR%%/stopping.html.en %%DOCSDIR%%/stopping.html.fr %%DOCSDIR%%/stopping.html.html %%DOCSDIR%%/suexec.html.en %%DOCSDIR%%/suexec.html.html %%DOCSDIR%%/suexec.html.ja.jis %%DOCSDIR%%/suexec_1_2.html %%DOCSDIR%%/unixware.html %%DOCSDIR%%/upgrading_to_1_3.html %%DOCSDIR%%/vhosts/details.html %%DOCSDIR%%/vhosts/details_1_2.html %%DOCSDIR%%/vhosts/examples.html %%DOCSDIR%%/vhosts/fd-limits.html.en %%DOCSDIR%%/vhosts/fd-limits.html.html %%DOCSDIR%%/vhosts/fd-limits.html.ja.jis %%DOCSDIR%%/vhosts/footer.html %%DOCSDIR%%/vhosts/header.html %%DOCSDIR%%/vhosts/host.html %%DOCSDIR%%/vhosts/index.html.en %%DOCSDIR%%/vhosts/index.html.ja.jis %%DOCSDIR%%/vhosts/ip-based.html %%DOCSDIR%%/vhosts/mass.html %%DOCSDIR%%/vhosts/name-based.html.en %%DOCSDIR%%/vhosts/name-based.html.html %%DOCSDIR%%/vhosts/name-based.html.ja.jis %%DOCSDIR%%/vhosts/vhosts-in-depth.html %%DOCSDIR%%/vhosts/virtual-host.html %%DOCSDIR%%/win_compiling.html.en %%DOCSDIR%%/win_compiling.html.html %%DOCSDIR%%/win_compiling.html.ja.jis %%DOCSDIR%%/win_service.html.en %%DOCSDIR%%/win_service.html.html %%DOCSDIR%%/win_service.html.ja.jis %%DOCSDIR%%/windows.html.en %%DOCSDIR%%/windows.html.ja.jis %%DOCSDIR%%/mod/directive-dict.html.html %%DOCSDIR%%/mod/mod_negotiation.html.html %%DOCSDIR%%/mod/module-dict.html.html %%DOCSDIR%%/configuring.html.html %%DOCSDIR%%/custom-error.html.fr %%DOCSDIR%%/custom-error.html.html %%DOCSDIR%%/handler.html.html %%DOCSDIR%%/index.html.fr %%DOCSDIR%%/index.html.html %%DOCSDIR%%/install.html.fr %%DOCSDIR%%/install.html.html %%DOCSDIR%%/invoking.html.fr %%DOCSDIR%%/new_features_1_3.html.html %%DOCSDIR%%/server-wide.html.fr %%DOCSDIR%%/server-wide.html.html %%DOCSDIR%%/howto/cgi.html.html %%DOCSDIR%%/howto/ssi.html.en %%DOCSDIR%%/howto/ssi.html.html %%DOCSDIR%%/howto/ssi.html.ja.jis %%DOCSDIR%%/urlmapping.html %%DOCSDIR%%/vhosts/index.html.html +%%WITHSNMP%%%%DOCSDIR%%/mod/mod_snmp.html +%%WITHSNMP%%%%DOCSDIR%%/snmp_agt/index.html +%%WITHSNMP%%%%DOCSDIR%%/snmp_agt/www-mib.txt +%%WITHSNMP%%%%DOCSDIR%%/snmp_agt/snmpv2-mib.txt +%%WITHSNMP%%%%DOCSDIR%%/snmp_agt/rfc2594.txt +%%WITHSNMP%%%%DOCSDIR%%/snmp_agt/apache-scoreboard-mib.txt +%%WITHSNMP%%%%DOCSDIR%%/snmp_agt/apache-config-mib.txt www/cgi-bin-dist/printenv @exec [ -d %D/www/cgi-bin/ ] || ln -fs %B %D/www/cgi-bin www/cgi-bin-dist/test-cgi www/icons/README www/icons/a.gif www/icons/alert.black.gif www/icons/alert.red.gif www/icons/apache_pb.gif www/icons/back.gif www/icons/ball.gray.gif www/icons/ball.red.gif www/icons/binary.gif www/icons/binhex.gif www/icons/blank.gif www/icons/bomb.gif www/icons/box1.gif www/icons/box2.gif www/icons/broken.gif www/icons/burst.gif www/icons/c.gif www/icons/comp.blue.gif www/icons/comp.gray.gif www/icons/compressed.gif www/icons/continued.gif www/icons/dir.gif www/icons/diskimg.gif www/icons/diskimg.png www/icons/down.gif www/icons/dvi.gif www/icons/f.gif www/icons/folder.gif www/icons/folder.open.gif www/icons/folder.sec.gif www/icons/forward.gif www/icons/generic.gif www/icons/generic.red.gif www/icons/generic.sec.gif www/icons/hand.right.gif www/icons/hand.up.gif www/icons/icon.sheet.gif www/icons/image1.gif www/icons/image2.gif www/icons/image3.gif www/icons/index.gif www/icons/layout.gif www/icons/left.gif www/icons/link.gif www/icons/movie.gif www/icons/p.gif www/icons/patch.gif www/icons/pdf.gif www/icons/pie0.gif www/icons/pie1.gif www/icons/pie2.gif www/icons/pie3.gif www/icons/pie4.gif www/icons/pie5.gif www/icons/pie6.gif www/icons/pie7.gif www/icons/pie8.gif www/icons/portal.gif www/icons/ps.gif www/icons/quill.gif www/icons/right.gif www/icons/screw1.gif www/icons/screw2.gif www/icons/script.gif www/icons/small/README.txt www/icons/small/back.gif www/icons/small/binary.gif www/icons/small/binhex.gif www/icons/small/blank.gif www/icons/small/broken.gif www/icons/small/burst.gif www/icons/small/comp1.gif www/icons/small/comp2.gif www/icons/small/compressed.gif www/icons/small/continued.gif www/icons/small/dir.gif www/icons/small/dir2.gif www/icons/small/doc.gif www/icons/small/forward.gif www/icons/small/generic.gif www/icons/small/generic2.gif www/icons/small/generic3.gif www/icons/small/image.gif www/icons/small/image2.gif www/icons/small/index.gif www/icons/small/key.gif www/icons/small/movie.gif www/icons/small/patch.gif www/icons/small/ps.gif www/icons/small/rainbow.gif www/icons/small/sound.gif www/icons/small/sound2.gif www/icons/small/tar.gif www/icons/small/text.gif www/icons/small/transfer.gif www/icons/small/unknown.gif www/icons/small/uu.gif www/icons/sound1.gif www/icons/sound2.gif www/icons/sphere1.gif www/icons/sphere2.gif www/icons/tar.gif www/icons/tex.gif www/icons/text.gif www/icons/transfer.gif www/icons/unknown.gif www/icons/up.gif www/icons/uu.gif www/icons/uuencoded.gif www/icons/world1.gif www/icons/world2.gif www/icons/a.png www/icons/alert.black.png www/icons/alert.red.png www/icons/apache_pb.png www/icons/back.png www/icons/ball.gray.png www/icons/ball.red.png www/icons/binary.png www/icons/binhex.png www/icons/blank.png www/icons/bomb.png www/icons/box1.png www/icons/box2.png www/icons/broken.png www/icons/burst.png www/icons/c.png www/icons/comp.blue.png www/icons/comp.gray.png www/icons/compressed.png www/icons/continued.png www/icons/dir.png www/icons/down.png www/icons/dvi.png www/icons/f.png www/icons/folder.png www/icons/folder.open.png www/icons/folder.sec.png www/icons/forward.png www/icons/generic.png www/icons/generic.red.png www/icons/generic.sec.png www/icons/hand.right.png www/icons/hand.up.png www/icons/icon.sheet.png www/icons/image1.png www/icons/image2.png www/icons/image3.png www/icons/index.png www/icons/layout.png www/icons/left.png www/icons/link.png www/icons/movie.png www/icons/p.png www/icons/patch.png www/icons/pdf.png www/icons/pie0.png www/icons/pie1.png www/icons/pie2.png www/icons/pie3.png www/icons/pie4.png www/icons/pie5.png www/icons/pie6.png www/icons/pie7.png www/icons/pie8.png www/icons/portal.png www/icons/ps.png www/icons/quill.png www/icons/right.png www/icons/screw1.png www/icons/screw2.png www/icons/script.png www/icons/small/back.png www/icons/small/binary.png www/icons/small/binhex.png www/icons/small/blank.png www/icons/small/broken.png www/icons/small/burst.png www/icons/small/comp1.png www/icons/small/comp2.png www/icons/small/compressed.png www/icons/small/continued.png www/icons/small/dir.png www/icons/small/dir2.png www/icons/small/doc.png www/icons/small/forward.png www/icons/small/generic.png www/icons/small/generic2.png www/icons/small/generic3.png www/icons/small/image.png www/icons/small/image2.png www/icons/small/index.png www/icons/small/key.png www/icons/small/movie.png www/icons/small/patch.png www/icons/small/ps.png www/icons/small/rainbow.png www/icons/small/sound.png www/icons/small/sound2.png www/icons/small/tar.png www/icons/small/text.png www/icons/small/transfer.png www/icons/small/unknown.png www/icons/small/uu.png www/icons/sound1.png www/icons/sound2.png www/icons/sphere1.png www/icons/sphere2.png www/icons/tar.png www/icons/tex.png www/icons/text.png www/icons/transfer.png www/icons/unknown.png www/icons/up.png www/icons/uu.png www/icons/uuencoded.png www/icons/world1.png www/icons/world2.png @exec mkdir -p %D/www/proxy @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi @exec cd %D/etc/apache/ssl.crt && make >/dev/null 2>&1 @unexec for i in %D/etc/apache/ssl.crt/[0-9a-fA-F]*.[0-9]*; do if [ -L $i ]; then rm -f $i; fi; done @dirrm etc/apache/ssl.crt @dirrm etc/apache/ssl.crl @dirrm etc/apache/ssl.csr @dirrm etc/apache/ssl.prm @dirrm etc/apache/ssl.key @dirrm etc/apache @dirrm include/apache/xml @dirrm include/apache @dirrm libexec/apache @dirrm %%DOCSDIR%%/vhosts @dirrm %%DOCSDIR%%/search @dirrm %%DOCSDIR%%/mod/mod_ssl @dirrm %%DOCSDIR%%/mod @dirrm %%DOCSDIR%%/misc @dirrm %%DOCSDIR%%/images @dirrm %%DOCSDIR%%/howto @dirrm %%DOCSDIR%%/programs +%%WITHSNMP%%@dirrm %%DOCSDIR%%/snmp_agt @dirrm %%DOCSDIR%% @unexec rmdir %D/www/data-dist 2>/dev/null || true @unexec rmdir %D/www/cgi-bin-dist 2>/dev/null || true @dirrm www/icons/small @dirrm www/icons @dirrm www/proxy +%%WITHSNMP%%@dirrm www/buckets @unexec rmdir %D/www 2>/dev/null || true Property changes on: head/www/apache13-modssl/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.35 \ No newline at end of property +1.36 \ No newline at end of property