head 1.12; access; symbols pkgsrc-2014Q1:1.11.0.28 pkgsrc-2014Q1-base:1.11 pkgsrc-2013Q4:1.11.0.26 pkgsrc-2013Q4-base:1.11 pkgsrc-2013Q3:1.11.0.24 pkgsrc-2013Q3-base:1.11 pkgsrc-2013Q2:1.11.0.22 pkgsrc-2013Q2-base:1.11 pkgsrc-2013Q1:1.11.0.20 pkgsrc-2013Q1-base:1.11 pkgsrc-2012Q4:1.11.0.18 pkgsrc-2012Q4-base:1.11 pkgsrc-2012Q3:1.11.0.16 pkgsrc-2012Q3-base:1.11 pkgsrc-2012Q2:1.11.0.14 pkgsrc-2012Q2-base:1.11 pkgsrc-2012Q1:1.11.0.12 pkgsrc-2012Q1-base:1.11 pkgsrc-2011Q4:1.11.0.10 pkgsrc-2011Q4-base:1.11 pkgsrc-2011Q3:1.11.0.8 pkgsrc-2011Q3-base:1.11 pkgsrc-2011Q2:1.11.0.6 pkgsrc-2011Q2-base:1.11 pkgsrc-2011Q1:1.11.0.4 pkgsrc-2011Q1-base:1.11 pkgsrc-2010Q4:1.11.0.2 pkgsrc-2010Q4-base:1.11 pkgsrc-2010Q3:1.10.0.10 pkgsrc-2010Q3-base:1.10 pkgsrc-2010Q2:1.10.0.8 pkgsrc-2010Q2-base:1.10 pkgsrc-2010Q1:1.10.0.6 pkgsrc-2010Q1-base:1.10 pkgsrc-2009Q4:1.10.0.4 pkgsrc-2009Q4-base:1.10 pkgsrc-2009Q3:1.10.0.2 pkgsrc-2009Q3-base:1.10 pkgsrc-2008Q4:1.9.0.28 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.26 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.24 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.22 pkgsrc-2008Q2-base:1.9 pkgsrc-2008Q1:1.9.0.20 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.18 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.16 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.14 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.12 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.10 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.8 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.9.0.6 pkgsrc-2006Q2-base:1.9 pkgsrc-2006Q1:1.9.0.4 pkgsrc-2006Q1-base:1.9 pkgsrc-2005Q4:1.9.0.2 pkgsrc-2005Q4-base:1.9 pkgsrc-2005Q3:1.8.0.2 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.7.0.8 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.6 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.4 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.2 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.6.0.8 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.6 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.4 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.6.0.2 netbsd-1-6-1-base:1.6 netbsd-1-6:1.5.0.6 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.2 pkgviews-base:1.5 buildlink2:1.3.0.2 buildlink2-base:1.5 netbsd-1-5-PATCH003:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.12 date 2014.06.10.15.22.18; author joerg; state dead; branches; next 1.11; commitid djgMkPoOrhNxnZDx; 1.11 date 2010.11.01.18.03.04; author adam; state Exp; branches; next 1.10; 1.10 date 2009.09.04.18.55.34; author wiz; state Exp; branches; next 1.9; 1.9 date 2005.10.17.10.37.11; author tron; state dead; branches; next 1.8; 1.8 date 2005.08.28.08.36.55; author tron; state Exp; branches 1.8.2.1; next 1.7; 1.7 date 2004.09.20.17.19.34; author adrianp; state dead; branches 1.7.8.1; next 1.6; 1.6 date 2002.08.25.21.51.57; author jlam; state Exp; branches; next 1.5; 1.5 date 2002.06.18.23.58.07; author itojun; state Exp; branches; next 1.4; 1.4 date 2002.06.01.13.18.02; author itojun; state Exp; branches; next 1.3; 1.3 date 2002.04.13.21.35.53; author jlam; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 2002.03.05.23.56.24; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.03.05.23.24.07; author jlam; state Exp; branches 1.1.1.1; next ; 1.8.2.1 date 2005.10.18.21.21.27; author seb; state dead; branches; next ; 1.7.8.1 date 2005.08.29.09.26.03; author salo; state Exp; branches; next ; 1.3.2.1 date 2002.06.23.19.03.32; author jlam; state Exp; branches; next ; 1.1.1.1 date 2002.03.05.23.24.07; author jlam; state Exp; branches; next ; desc @@ 1.12 log @Retire Apache 1.3 and 2.0. @ text @$NetBSD: patch-ah,v 1.11 2010/11/01 18:03:04 adam Exp $ --- modules/ssl/ssl_engine_kernel.c.orig 2010-09-28 15:59:13.000000000 +0000 +++ modules/ssl/ssl_engine_kernel.c @@@@ -573,7 +573,7 @@@@ int ssl_hook_Access(request_rec *r) * sk_X509_shift-ed the peer cert out of the chain. * we put it back here for the purpose of quick_renegotiation. */ - cert_stack = sk_new_null(); + cert_stack = sk_X509_new_null(); sk_X509_push(cert_stack, MODSSL_PCHAR_CAST cert); } @ 1.11 log @Changes 2.0.64: * SECURITY: CVE-2010-1452 (cve.mitre.org) mod_dav: Fix Handling of requests without a path segment. * SECURITY: CVE-2009-1891 (cve.mitre.org) Fix a potential Denial-of-Service attack against mod_deflate or other modules, by forcing the server to consume CPU time in compressing a large file after a client disconnects. * SECURITY: CVE-2009-3095 (cve.mitre.org) mod_proxy_ftp: sanity check authn credentials. * SECURITY: CVE-2009-3094 (cve.mitre.org) mod_proxy_ftp: NULL pointer dereference on error paths. * SECURITY: CVE-2009-3555 (cve.mitre.org) mod_ssl: Comprehensive fix of the TLS renegotiation prefix injection attack when compiled against OpenSSL version 0.9.8m or later. Introduces the 'SSLInsecureRenegotiation' directive to reopen this vulnerability and offer unsafe legacy renegotiation with clients which do not yet support the new secure renegotiation protocol, RFC 5746. * SECURITY: CVE-2009-3555 (cve.mitre.org) mod_ssl: A partial fix for the TLS renegotiation prefix injection attack for OpenSSL versions prior to 0.9.8l; reject any client-initiated renegotiations. Forcibly disable keepalive for the connection if there is any buffered data readable. Any configuration which requires renegotiation for per-directory/location access control is still vulnerable, unless using openssl 0.9.8l or later. * SECURITY: CVE-2010-0434 (cve.mitre.org) Ensure each subrequest has a shallow copy of headers_in so that the parent request headers are not corrupted. Elimiates a problematic optimization in the case of no request body. * SECURITY: CVE-2008-2364 (cve.mitre.org) mod_proxy_http: Better handling of excessive interim responses from origin server to prevent potential denial of service and high memory usage. * SECURITY: CVE-2010-0425 (cve.mitre.org) mod_isapi: Do not unload an isapi .dll module until the request processing is completed, avoiding orphaned callback pointers. * SECURITY: CVE-2008-2939 (cve.mitre.org) mod_proxy_ftp: Prevent XSS attacks when using wildcards in the path of the FTP URL. Discovered by Marc Bevand of Rapid7. * Fix recursive ErrorDocument handling. * mod_ssl: Do not do overlapping memcpy. * Add Set-Cookie and Set-Cookie2 to the list of headers allowed to pass through on a 304 response. * apxs: Fix -A and -a options to ignore whitespace in httpd.conf @ text @d1 1 a1 1 $NetBSD$ @ 1.10 log @Build fixes for openssl-1.0. @ text @d3 1 a3 1 --- modules/ssl/ssl_engine_kernel.c.orig 2007-05-08 23:08:47.000000000 +0000 d5 1 a5 1 @@@@ -550,7 +550,7 @@@@ int ssl_hook_Access(request_rec *r) @ 1.9 log @Update "apache2" package to version 2.0.55. Patches supplied by Ben Collver. Addresses PR pkg/31817 by Zafer Aydogan. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.8 2005/08/28 08:36:55 tron Exp $ d3 10 a12 53 --- srclib/pcre/pcre.c.orig Wed Nov 24 20:31:09 2004 +++ srclib/pcre/pcre.c Thu Aug 25 22:14:56 2005 @@@@ -714,7 +714,18 @@@@ int min = 0; int max = -1; +/* Read the minimum value and do a paranoid check: a negative value indicates +an integer overflow. */ + while ((cd->ctypes[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0'; +if (min < 0 || min > 65535) + { + *errorptr = ERR5; + return p; + } + +/* Read the maximum value if there is one, and again do a paranoid on its size. +Also, max must not be less than min. */ if (*p == '}') max = min; else { @@@@ -722,6 +733,11 @@@@ { max = 0; while((cd->ctypes[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0'; + if (max < 0 || max > 65535) + { + *errorptr = ERR5; + return p; + } if (max < min) { *errorptr = ERR4; @@@@ -730,16 +746,11 @@@@ } } -/* Do paranoid checks, then fill in the required variables, and pass back the -pointer to the terminating '}'. */ +/* Fill in the required variables, and pass back the pointer to the terminating +'}'. */ -if (min > 65535 || max > 65535) - *errorptr = ERR5; -else - { - *minp = min; - *maxp = max; - } +*minp = min; +*maxp = max; return p; } @ 1.8 log @- Add security patch for CAN-2005-2491 from Apache SVN repository. - Add patch for high memory usage caused by "Byterange" support from Apache SVN repository. Bump package revision because of the above changes. @ text @d1 1 a1 1 $NetBSD$ @ 1.8.2.1 log @Pullup ticket 838 - requested by Matthias Scheler sync devel/apr and www/apache2 with HEAD as precautionary/preventive step Revisions pulled up: - devel/apr/Makefile 1.37 - devel/apr/distinfo 1.16 - devel/apr/patches/patch-ao 1.3 - www/apache2/Makefile 1.84 - www/apache2/Makefile.common 1.19 - www/apache2/PLIST 1.31 - www/apache2/distinfo 1.43,1.44 - www/apache2/patches/patch-ac 1.6 - www/apache2/patches/patch-ae removed - www/apache2/patches/patch-af removed - www/apache2/patches/patch-ah removed - www/apache2/patches/patch-aj removed - www/apache2/patches/patch-ao 1.7 Module Name: pkgsrc Committed By: joerg Date: Tue Oct 11 20:10:35 UTC 2005 Modified Files: pkgsrc/www/apache2: distinfo Added Files: pkgsrc/www/apache2/patches: patch-ao Log Message: Allow mod_ssl to build with OpenSSL 0.9.8. The patch is from Georg v. Zezschwitz on dev@@httpd.apache.org. --- Module Name: pkgsrc Committed By: tron Date: Mon Oct 17 10:28:46 UTC 2005 Modified Files: pkgsrc/devel/apr: Makefile distinfo pkgsrc/devel/apr/patches: patch-ao pkgsrc/www/apache2: Makefile Log Message: Update "apr" package to version 0.9.7. Changes since version 0.9.6: - Fix crash in apr_dir_make_recursive() for relative path when the working directory has been deleted. [Joe Orton] - Win32: fix apr_proc_mutex_trylock() to handle WAIT_TIMEOUT, returning APR_EBUSY. [Ronen Mizrahi ] - Fix apr_file_read() to catch write failures when flushing pending writes for a buffered file. [Joe Orton] - Fix apr_file_write() infinite loop on write failure for buffered files. [Erik Huelsmann ] - Fix error handling where apr_uid_* and apr_gid_* could segfault or return APR_SUCCESS in failure cases. Bug 34053. [Joe Orton, Paul Querna] - Refactor Win32 condition variables code to address bugs 27654, 34336. [Henry Jen , E Holyat ] - Support APR_SO_SNDBUF and APR_SO_RCVBUF on Windows. Bug 32177. [Sim , Jeff Trawick] - Fix detection of rwlocks on Mac OS X. [Aaron Bannert] - Fix issue with poll() followed by net I/O yielding EAGAIN on Mac OS 10.4 (Darwin 8). [Wilfredo Sanchez] Update based on patches supplied by Ben Collver. Addresses first part of PR pkg/31817 by Zafer Aydogan. --- Module Name: pkgsrc Committed By: tron Date: Mon Oct 17 10:37:11 UTC 2005 Modified Files: pkgsrc/www/apache2: Makefile.common PLIST distinfo pkgsrc/www/apache2/patches: patch-ac Removed Files: pkgsrc/www/apache2/patches: patch-ae patch-af patch-ah patch-aj Log Message: Update "apache2" package to version 2.0.55. Changes since version 2.0.54: - worker MPM: Fix a memory leak which can occur after an aborted connection in some limited circumstances. [Greg Ames] - mod_ldap: Fix Bug 36563. Keep track of the number of attributes retrieved from LDAP so that all of the values can be properly cached even if the value is NULL. [Brad Nicholes, Ondrej Sury ] - Added TraceEnable [on|off|extended] per-server directive to alter the behavior of the TRACE method. This addresses a flaw in proxy conformance to RFC 2616 - previously the proxy server would accept a TRACE request body although the RFC prohibited it. The default remains 'TraceEnable on'. [William Rowe] - Add ap_log_cerror() for logging messages associated with particular client connections. [Jeff Trawick] - Correct mod_cgid's argv[0] so that the full path can be delved by the invoked cgi application, to conform to the behavior of mod_cgi. [Pradeep Kumar S ] - mod_include: Fix possible environment variable corruption when using nested includes. Bug 12655. [Joe Orton] - Support the suppress-error-charset setting, as with Apache 1.3.x. Bug 31274. [Jeff Trawick] - EBCDIC: Handle chunked input from client or, with proxy, origin server. [Jeff Trawick] - Fix bad globbing comparison which could result in getting a directory listing when a file was requested. Bug 34512. [sean ] - Fix core dump if mod_auth_ldap's mod_auth_ldap_auth_checker() was called even if mod_auth_ldap_check_user_id() was not (or if it didn't succeed) for non-authoritative cases. [Jim Jagielski] - mod_proxy: Fix over-eager handling of '%' for reverse proxies. Bug 15207. [Jim Jagielski] - mod_ldap: Fix various shared memory cache handling bugs. Bug 34209. [Joe Orton] - Fix a file descriptor leak when starting piped loggers. Bug 33748. [Joe Orton] - mod_ldap: Avoid segfaults when opening connections if using a version of OpenLDAP older than 2.2.21. Bug 34618. [Brad Nicholes] - mod_ssl: Fix build with OpenSSL 0.9.8. Bug 35757. [William Rowe] - proxy HTTP: If a response contains both Transfer-Encoding and a Content-Length, remove the Content-Length and don't reuse the connection, mitigating some HTTP Response Splitting attacks. [Jeff Trawick] - Prevent hangs of child processes when writing to piped loggers at the time of graceful restart. Bug 26467. [Jeff Trawick] - SECURITY: CAN-2005-1268 (cve.mitre.org) mod_ssl: Fix off-by-one overflow whilst printing CRL information at "LogLevel debug" which could be triggered if configured to use a "malicious" CRL. Bug 35081. [Marc Stern ] - mod_userdir: Fix possible memory corruption issue. Bug 34588. [David Leonard ] - worker mpm: don't take down the whole server for a transient thread creation failure. Bug 34514 [Greg Ames] - mod_rewrite: use buffered I/O to improve performance with large RewriteMap txt: files. [Greg Ames] - proxy HTTP: Rework the handling of request bodies to handle chunked input and input filters which modify content length, and avoid spooling arbitrary-sized request bodies in memory. Bug 15859. [Jeff Trawick] Patches supplied by Ben Collver. Addresses PR pkg/31817 by Zafer Aydogan. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.8 2005/08/28 08:36:55 tron Exp $ @ 1.7 log @- Update apache to 2.0.51 - Remove patch-as and patch-ah as they are now outdated and included in the src - ok'ed snj@@, wiz@@ - Thanks to epg@@ for final check This version of Apache is principally a bug fix release. Of particular note is that 2.0.51 addresses five security vulnerabilities: An input validation issue in IPv6 literal address parsing which can result in a negative length parameter being passed to memcpy. [CAN-2004-0786] A buffer overflow in configuration file parsing could allow a local user to gain the privileges of a httpd child if the server can be forced to parse a carefully crafted .htaccess file. [CAN-2004-0747] A segfault in mod_ssl which can be triggered by a malicious remote server, if proxying to SSL servers has been configured. [CAN-2004-0751] A potential infinite loop in mod_ssl which could be triggered given particular timing of a connection abort. [CAN-2004-0748] A segfault in mod_dav_fs which can be remotely triggered by an indirect lock refresh request. [CAN-2004-0809] For further details, see http://www.apache.org/dist/httpd/Announcement2.html and http://apache.rmplc.co.uk/httpd/CHANGES_2.0. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.6 2002/08/25 21:51:57 jlam Exp $ d3 54 a56 13 --- support/apachectl.in.orig Mon May 27 20:46:01 2002 +++ support/apachectl.in Wed Jun 19 07:40:07 2002 @@@@ -31,8 +31,8 @@@@ HTTPD='@@exp_sbindir@@/@@progname@@' # # pick up any necessary environment variables -if test -f @@exp_bindir@@/envvars; then - . @@exp_bindir@@/envvars +if test -f @@exp_sbindir@@/envvars; then + . @@exp_sbindir@@/envvars fi # # a command that outputs a formatted text version of the HTML at the @ 1.7.8.1 log @Pullup ticket 721 - requested by Adrian Portelli security fix for apache2 Revisions pulled up: - pkgsrc/www/apache2/Makefile 1.81 - pkgsrc/www/apache2/distinfo 1.40 - pkgsrc/www/apache2/patches/patch-ah 1.8 - pkgsrc/www/apache2/patches/patch-aj 1.3 Module Name: pkgsrc Committed By: tron Date: Sun Aug 28 08:36:55 UTC 2005 Modified Files: pkgsrc/www/apache2: Makefile distinfo Added Files: pkgsrc/www/apache2/patches: patch-ah patch-aj Log Message: - Add security patch for CAN-2005-2491 from Apache SVN repository. - Add patch for high memory usage caused by "Byterange" support from Apache SVN repository. Bump package revision because of the above changes. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.8 2005/08/28 08:36:55 tron Exp $ d3 13 a15 54 --- srclib/pcre/pcre.c.orig Wed Nov 24 20:31:09 2004 +++ srclib/pcre/pcre.c Thu Aug 25 22:14:56 2005 @@@@ -714,7 +714,18 @@@@ int min = 0; int max = -1; +/* Read the minimum value and do a paranoid check: a negative value indicates +an integer overflow. */ + while ((cd->ctypes[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0'; +if (min < 0 || min > 65535) + { + *errorptr = ERR5; + return p; + } + +/* Read the maximum value if there is one, and again do a paranoid on its size. +Also, max must not be less than min. */ if (*p == '}') max = min; else { @@@@ -722,6 +733,11 @@@@ { max = 0; while((cd->ctypes[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0'; + if (max < 0 || max > 65535) + { + *errorptr = ERR5; + return p; + } if (max < min) { *errorptr = ERR4; @@@@ -730,16 +746,11 @@@@ } } -/* Do paranoid checks, then fill in the required variables, and pass back the -pointer to the terminating '}'. */ +/* Fill in the required variables, and pass back the pointer to the terminating +'}'. */ -if (min > 65535 || max > 65535) - *errorptr = ERR5; -else - { - *minp = min; - *maxp = max; - } +*minp = min; +*maxp = max; return p; } @ 1.6 log @Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.3.2.1 2002/06/23 19:03:32 jlam Exp $ @ 1.5 log @upgrade to 2.0.39, which should correct chunk encoding security issue. Changes with Apache 2.0.39 *) Fixed a build problem in htpasswd.c on Win32. [Guenter Knauf , Cliff Woolley] Changes with Apache 2.0.38 *) Rewrite htpasswd to use APR. The removes the annoying warning about tmpnam being unsafe. [Ryan Bloom] *) We must set the MIME-type for .shtml files to text/html if we want them to be parsed for SSI tags. Add the config for that to the default config file so that it is easier to enable .shtml parsing. [Dave Dyer ] *) Fixed a problem with 'make install' on ReliantUnix. [Jean-frederic Clere ] *) Make the default_handler catch all requests that aren't served by another handler. This also gets us to return a 404 if a directory is requested, there is no DirectoryIndex, and mod_autoindex isn't loaded. [Justin Erenkrantz] *) Fixed the handling of nested if-statements in shtml files. PR 9866 [Brian Pane] *) Allow 'make install DESTDIR=/path'. This allows packagers to install into a directory different from the one that was configured. This also mirrors the root= feature from 1.3. We cannot use prefix=, because both APR and APR-util resolve their installation paths at configuration time. This means that there is no variable prefix to replace. [Andreas Hasenack ] *) AIX 4.3.2 and above: Define SINGLE_LISTEN_UNSERIALIZED_ACCEPT. These levels of AIX don't have a thundering herd problem with accept(). [Jeff Trawick] *) prefork MPM: Ignore mutex errors during graceful restart. For certain types of mutexes (particularly SysV semaphores), we should expect to occasionally fail to obtain or release the mutex during restart processing. [Jeff Trawick] *) Fix install-bindist.sh so that it finds any perl instead of just early perl 5.x versions. This is consistent with a build/install from source, and it allows the perl scripts installed by a bindist to work on systems with perl 5.6. [Jeff Trawick] *) Fix apxs so that the makefile created by "apxs -g" works on AIX and Tru64 (and probably some other platforms). [Jeff Trawick] *) Allow CGI scripts to return their Content-Length. This also fixes a hang on HEAD requests seen on certain platforms (such as FreeBSD). [Justin Erenkrantz] *) Added log rotation based on file size to the RotateLog support utility. [Brad Nicholes] *) Fix some casting in mod_rewrite which broke random maps. PR 9770 [Allan Edwards, Greg Ames, Jeff Trawick] Changes with Apache 2.0.37 *) allow POST method over SSL when per-directory client cert authentication is used with 'SSLOptions +OptRenegotiate' enabled and a client cert was found in the ssl session cache. *) 'SSLOptions +OptRengotiate' will use client cert in from the ssl session cache when there is no cert chain in the cache. prior to the fix this situation would result in a FORBIDDEN response and error message "Cannot find peer certificate chain" [Doug MacEachern] *) ap_finalize_sub_req_protocol() shouldn't send an EOS bucket if one was already sent. PR 9644 [Jeff Trawick] *) Fix the display of the default name for the mime types config file. PR 9729 [Matthew Brecknell ] *) Fix the working directory *for WinNT/2K/XP services only* to change to the Apache directory (one level above the location of Apache.exe, in the case that Apache.exe resides in bin/.) Solves the case of ServerRoot /foo paths where /foo was not on the same drive as /winnt/system32. [William Rowe] *) Make 2.0's "AcceptMutex" startup message now "completely" match how 1.3 does it. [Jim Jagielski] *) Implement a fixed size memory cache using a priority queue [Ian Holsman] *) Fix apxs to allow "apxs -q installbuilddir" and to allow querying certain other variables from config_vars.mk. PR 9316 [Jeff Trawick] *) Added the "detached" attribute to the cgi_exec_info_t internals so that Win32 and Netware won't create a new window or console for each CGI invoked. PR 8387 [Brad Nicholes, William Rowe] *) Consolidated the command line parameters and attributes that are manipulated by the optional function ap_cgi_build_command() in mod_cgi into a single structure. [Brad Nicholes] *) Get rid of uninitialized value errors with "apxs -q" on certain variables. [Stas Bekman ] *) Fix apxs to allow it to work when the build directory is somewhere besides server-root/build. PR 8453 [Jeff Trawick and a host of others] *) Allow ap_discard_request_body to be called multiple times in the same request. Essentially, ap_http_filter keeps track of whether it has sent an EOS bucket up the stack, if so, it will only ever send an EOS bucket for this request. [Ryan Bloom, Justin Erenkrantz, Greg Stein] *) Remove all special mod_ssl URIs. This also fixes the bug where redirecting (.*) will allow an SSL protected page to be viewed without SSL. [Ryan Bloom] *) Fix the binary build install script so that the build logic created by "apxs -g" will work when the user has a binary build. [Jeff Trawick] *) Allow instdso.sh to work with full paths to the shared module. [Justin Erenkrantz] *) NetWare: Enabled CGI functionality and added mod_cgi as a built in module for NetWare [Brad Nicholes] *) Changed cgi and piped log behavior to accept 65536 characters on Win32 (matching Linux) before deadlocking between outputing client stdin, slurping the output from stdout and then the stderr stream. PR 8179 [William Rowe] *) Fixed Win32 wintty.exe support to assure the window title is valid. Elimiates possible gpfault or garbage title without the -t option. [William Rowe] *) Rewrite mod_cgi, mod_cgid, and mod_proxy input handling to use brigades and input filters. [Justin Erenkrantz] *) Allow ap_http_filter (HTTP_IN) to return EOS when there is no request body. [Justin Erenkrantz] *) NetWare: Piping log entries through RotateLogs using the CustomLogs directive is finally supported now that we have the pipes and spawning functionality working. [Brad Nicholes] *) Detect overflow when reading the hex bytes forming a chunk line. [Aaron Bannert] *) Allow RewriteMap prg:'s to take command-line arguments. PR 8464. [James Tait ] *) Correctly return 413 when an invalid chunk size is given on input. Also modify ap_discard_request_body to not do anything on sub-requests or when the connection will be dropped. [Justin Erenkrantz] *) Fix the TIME_* SSL var lookups to be threadsafe. PR 9469. [Cliff Woolley] *) Ensure that apr_brigade_write() flushes in all of the cases that it should to avoid conditions in some modules that could cause large amounts of data to be buffered. [Cliff Woolley] *) Fix problem where mod_cache/mod_disk_cache was incorrectly stripping the content_type from cached responses. [Bill Stoddard] *) apachectl passes through any httpd options. Note: apachectl should be used in preference to httpd since it ensures that any appropriate environment variables have been set up. [Jeff Trawick] *) Fix the combination of mod_cgid, mod_setuexec, and mod_userdir. PR 7810 [Colm MacCarthaigh ] *) Fix suexec execution of CGI scripts from mod_include. PR 7791, 8291 [Colm MacCarthaigh ] *) Fix segfaults at startup on some platforms when mod_auth_digest, mod_suexec, or mod_ssl were used as DSO's due to the way they were tracking the current init phase since DSO's get completely unloaded and reloaded between phases. PR 9413. [Tsuyoshi Sasamoto , Brad Nicholes] *) Fix mod_include's handling of regular expressions in " and directives *) Implement SSLSessionCache shmht and shmcb. *) New directive ProxyIOBufferSize. Sets the size of the buffer used when reading from a remote HTTP server in proxy. *) Scrap CacheMaxExpireMin and CacheDefaultExpireMin. Change CacheMaxExpire and CacheDefaultExpire to use seconds rather than hours. *) New Directive SSIUndefinedEcho. to change the '(none)' echoed for a undefined variable. *) Introduce PassPhraseDialog "|/path/to/pipe" mechanism to mod_ssl. *) New Directive for mod_proxy: ProxyRemoteMatch. *) Fix IPv6 name-based virtual hosts. *) Introduce AddOutputFilterByType directive. @ text @d3 1 a3 1 --- support/apachectl.in.orig Thu Apr 4 04:15:44 2002 d5 2 a6 6 @@@@ -29,11 +29,11 @@@@ PIDFILE=@@exp_runtimedir@@/@@progname@@.pid # # the path to your httpd binary, including options if necessary -HTTPD='@@exp_bindir@@/@@progname@@' +HTTPD='@@exp_sbindir@@/@@progname@@' @ 1.3.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.5 2002/06/18 23:58:07 itojun Exp $ d3 8 a10 4 --- support/apachectl.in.orig Mon May 27 20:46:01 2002 +++ support/apachectl.in Wed Jun 19 07:40:07 2002 @@@@ -31,8 +31,8 @@@@ HTTPD='@@exp_sbindir@@/@@progname@@' @ 1.2 log @Update www/apache2 to 2.0.32 beta. Pkgsrc changes from the previous version include: *) Move the binaries back into ${PREFIX}/sbin to match the locations for www/apache. *) Build the Apache modules (including mod_ssl) so that apache2 has the same functionality as apache. *) Support shared modules on platforms that support them. Otherwise, link the modules statically into the server. *) Support suEXEC in the same way as for www/apache. *) Honor PKG_SYSCONFDIR. *) Add a rc.d-style control script based on www/apache/files/apache.sh. *) Strongly buildlinkify again after previous changes broke it. Relevant changes from version 2.0.28 beta include: *) A ton of bug fixes in both the main server code and the module code (it _is_ a beta release following a previous beta release). *) Several performance and memory optimizations. *) The Location: response header field, used for external redirect, *must* be an absoluteURI. The Redirect directive tested for that, but RedirectMatch didn't -- it would allow almost anything through. Now it will try to turn an abs_path into an absoluteURI, but it will correctly varf like Redirect if the final redirection target isn't an absoluteURI. *) Add several new mod_proxy directives: ProxyTimeout, ProxyPreserveHost, ProxyPass. *) FTP directory listings are now always retrieved in ASCII mode. The FTP proxy properly escapes URI's and HTML in the generated listing, and escapes the path components when talking to the FTP server. *) Add FileETag directive to allow configurable control of what data are used to form ETag values for file-based URIs. *) Introduced the ForceLanguagePriority directive, to prevent returning MULTIPLE_CHOICES or NONE_ACCEPTABLE in some cases, when using Multiviews. @ text @d3 4 a6 8 --- support/apachectl.sh.in.orig Sat Dec 15 08:56:36 2001 +++ support/apachectl.sh.in @@@@ -26,14 +26,14 @@@@ # -------------------- -------------------- # # the path to your PID file -PIDFILE=@@prefix@@/logs/@@progname@@.pid +PIDFILE=%runtimedir%/@@progname@@.pid d9 2 a10 2 -HTTPD='@@prefix@@/bin/@@progname@@' +HTTPD='%sbindir%/@@progname@@' d13 4 a16 4 -if test -f @@prefix@@/bin/envvars; then - . @@prefix@@/bin/envvars +if test -f %sbindir%/envvars; then + . %sbindir%/envvars @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.2 2002/01/04 09:45:10 martti Exp $ d3 21 a23 20 --- configure.orig Mon Nov 12 19:07:39 2001 +++ configure Thu Jan 3 19:24:24 2002 @@@@ -2608,7 +2608,7 @@@@ for var in prefix exec_prefix bindir sbindir libexecdir mandir \ sysconfdir datadir errordir iconsdir htdocsdir cgidir \ includedir localstatedir runtimedir logfiledir \ - proxycachedir installbuilddir; do + proxycachedir installbuilddir manualdir; do eval "val=\"\$$var\"" case $val in *+) @@@@ -10508,7 +10508,7 @@@@ EOF cat >> confdefs.h <> confdefs.h <