head 1.4; access; symbols pkgsrc-2014Q1:1.3.0.90 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.88 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.86 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.84 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.82 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.80 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.78 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.76 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.74 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.72 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.70 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.68 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.66 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.64 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.62 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.60 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.58 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.56 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.54 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.52 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.50 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.48 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.46 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.44 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.42 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.40 pkgsrc-2008Q1:1.3.0.38 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.36 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.34 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.32 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.30 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.28 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.26 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.24 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.22 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.20 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.18 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.16 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.14 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.12 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.10 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.8 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.6 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.4 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 netbsd-1-6:1.2.0.6 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.2 pkgviews-base:1.2 buildlink2:1.1.0.2 buildlink2-base:1.2; locks; strict; comment @# @; 1.4 date 2014.06.10.15.22.18; author joerg; state dead; branches; next 1.3; commitid djgMkPoOrhNxnZDx; 1.3 date 2002.08.25.21.51.57; author jlam; state Exp; branches; next 1.2; 1.2 date 2002.06.01.13.18.02; author itojun; state Exp; branches; next 1.1; 1.1 date 2002.04.13.21.35.54; author jlam; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2002.06.23.19.03.32; author jlam; state Exp; branches; next ; desc @@ 1.4 log @Retire Apache 1.3 and 2.0. @ text @$NetBSD: patch-ak,v 1.3 2002/08/25 21:51:57 jlam Exp $ --- docs/conf/httpd-std.conf.in.orig Wed Apr 24 16:24:35 2002 +++ docs/conf/httpd-std.conf.in @@@@ -24,9 +24,9 @@@@ # Configuration and logfile names: If the filenames you specify for many # of the server's control files begin with "/" (or "drive:/" for Win32), the # server will use that explicit path. If the filenames do *not* begin -# with "/", the value of ServerRoot is prepended -- so "@@rel_logfiledir@@/foo.log" +# with "/", the value of ServerRoot is prepended -- so "logs/foo.log" # with ServerRoot set to "@@@@ServerRoot@@@@" will be interpreted by the -# server as "@@@@ServerRoot@@@@/@@rel_logfiledir@@/foo.log". +# server as "@@@@ServerRoot@@@@/logs/foo.log". # ### Section 1: Global Environment @@@@ -54,7 +54,7 @@@@ # -#LockFile @@rel_logfiledir@@/accept.lock +#LockFile @@rel_runtimedir@@/accept.lock @@@@ -68,7 +68,7 @@@@ # -#ScoreBoardFile @@rel_logfiledir@@/apache_runtime_status +#ScoreBoardFile @@rel_runtimedir@@/apache_runtime_status @ 1.3 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-ak,v 1.1.2.1 2002/06/23 19:03:32 jlam Exp $ @ 1.2 log @upgrade to 2.0.36. (this is still a leaf package so it shouldn't affect others) Changes with Apache 2.0.36 *) Close sockets on worker MPM when doing a graceless restart. [Aaron Bannert] *) Reverted a minor optimization in mod_ssl.c that used the vhost ID as the session id context rather that a MD5 hash of that vhost ID, because it caused very long vhost id's to be unusable with mod_ssl. PR 8572. [Cliff Woolley] *) Fix the link to the description of the CoredumpDirectory directive in the server-wide document. PR 8643. [Jeff Trawick] *) Fixed SHMCB session caching. [Aaron Bannert, Cliff Woolley] *) Synced with remaining changes from mod_ssl 2.8.8-1.3.24: - Avoid SIGBUS on sparc machines with SHMCB session caches - Allow whitespace between the pipe and the name of the program in SSLLog "| /path/to/program". [Cliff Woolley] *) Introduce mod_ext_filter and mod_deflate experimental modules to the Win32 build (zlib sources must be in srclib\zlib.) [William Rowe] *) Changes to the worker MPM's queue management and thread synchronization code to reduce mutex contention [Brian Pane] *) Don't install *.in configuration files since we already install *-std.conf files. [Aaron Bannert] *) Many improvements to the threadpool MPM. [Aaron Bannert] *) Fix subreqs that are promoted via fast_redirect from having invalid frec->r structures. This would cause subtle errors later on in request processing such as seen in PR 7966. [Justin Erenkrantz] *) More efficient pool recycling logic for the worker MPM [Brian Pane] *) Modify the worker MPM to not accept() new connections until there is an available worker thread. This prevents queued connections from starving for processing time while long-running connections were hogging all the available threads. [Aaron Bannert] *) Convert the worker MPM's fdqueue from a LIFO back into a FIFO. [Aaron Bannert] *) Get basic HTTP proxy working on EBCDIC machines. [Jeff Trawick] *) Allow mod_unique_id to work on systems with no IPv4 address corresponding to their host name. [Jeff Trawick] *) Fix suexec behavior with user directories. PR 7810. [Colm ] *) Reject a blank UserDir directive since it is ambiguous. PR 8472. [Justin Erenkrantz] *) Make mod_mime use case-insensitive matching when examining extensions on all platforms. PR 8223. [Justin Erenkrantz] *) Add an intelligent error message should no proxy submodules be valid to handle a request. PR 8407 [Graham Leggett] *) Major improvements in concurrent processing for AB by enabling non-blocking connect()s and preventing APR from doing blocking read()s. Also implement fatal error checking for apr_recv(). [Aaron Bannert] *) Fix Win32 NTFS Junctions (symlinks). PR 8014 [William Rowe] *) Fix Win32 'short name' aliases in httpd.conf directives. PR 8009 [William Rowe] *) Fix generation of default httpd.conf when the layout paths are disjoint. PR 7979, 8227. [Justin Erenkrantz] *) Swap downgrade-1.0 and force-response-1.0 conditional checks so that downgraded responses can have force-response. PR 8357. [Justin Erenkrantz] *) Fix perchild MPM so that it can be configured with the move to the experimental directory. [Scott Lamb ] *) Fix perchild MPM so that it uses ap_gname2id for groups instead of ap_uname2id. [Scott Lamb ] *) Fix AcceptPathInfo. PR 8234 [Cliff Woolley] *) [Security] Added the APLOG_TOCLIENT flag to ap_log_rerror() to explicitly tell the server that warning messages should be sent to the client in addition to being recorded in the error log. Prior to this change, ap_log_rerror() always sent warning messages to the client. In one case, a faulty CGI script caused the server to send a warning message to the client that contained the full path to the CGI script. This could be considered a minor security exposure. [Bill Stoddard] *) mod_autoindex output when SuppressRules was specified would omit the first carriage return so the first item in the list would appear to the right of the column headings instead of underneath them. PR 8016 [David Shane Holden ] *) Moved the call to apr_mmap_dup outside the error branch so that it would actually get called. This fixes a core dump at init everytime you use the MMapFile directive. PR 8314 [Paul J. Reder] *) Trigger an error when a LoadModule directive attempts to load a module which is built-in. This is a common error when switching from a DSO build to a static build. [Jeff Trawick] *) Change instdso.sh to use libtool --install everywhere and then clean up some stray files and symlinks that libtool leaves around on some platforms. This gets subversion building properly since it needed a re-link to be performed by libtool at install time, and the old instdso.sh logic to simply cp the DSO didn't handle that requirement. [Sander Striker] *) Allow VPATH builds to succeed when configured from an empty directory. [Thom May ] *) Fix 'control reaches end of non-void function' warning in server/log.c. [Ben Collins-Sussman ] *) Perchild MPM is now correctly deemed as experimental and is now located in server/mpm/experimental. [Justin Erenkrantz] *) Fix segfault in mod_mem_cache when garabge collecting an expired cache entry. [Bill Stoddard] *) Introduced -E startup_logfile_name option to httpd to allow admins to begin logging errors immediately. This provides Win32 users an alternative to sending startup errors to the event viewer, and allows other daemon tool authors an alternative to logging to stderr. [William Rowe] *) Fix subreqs with non-defined Content-Types being served improperly. [Justin Erenkrantz] *) Merge in latest GNU config.guess and config.sub files. PR 7818. [Justin Erenkrantz] *) Move 100 - Continue support to the HTTP_IN filter so that filters are guaranteed to support 100 - Continue logic without any intervention. [Justin Erenkrantz] *) Add HTTP chunked input trailer support. [Justin Erenkrantz] *) Rename and export get_mime_headers as ap_get_mime_headers. [Justin Erenkrantz] *) Allow empty Host: header arguments. PR 7441. [Justin Erenkrantz] *) Properly substitute sbindir as httpd's location in apachectl. PR 7840. [Andreas Hasenack ] *) Allow Win32 shebang scripts to follow the path (or omit the .exe suffix from the shebang command), and allow ScriptInterpreterSource Registry or RegistryStrict to override shebang lines, as 1.3 did. PR 8004 [William Rowe] *) worker MPM: Fix a situation where a child exited without releasing the accept mutex. Depending on the OS and mutex mechanism this could result in a hang. [Jeff Trawick] *) Update the instructions for how to get started with mod_example. [Stas Bekman] *) Fix PidFile to default to rel_runtimedir instead of rel_logfiledir. PR 7841. [Andreas Hasenack ] *) Win32: Fix problem that caused rapid performance degradation when number of connecting clients exceeded ThreadsPerChild. [Bill Stoddard] *) Fixed a segfault parsing large SSIs on non-mmap systems. [Brian Havard] *) Proxy was bombing out every second keepalive request, caused by a stray CRLF before the second response's status line. Proxy now tries to read one more line if it encounters a CRLF where it expected a status. PR 10010 [Graham Leggett] *) Deprecated the apr_lock.h API. Please see the following files for the improved thread and process locking and signaling: apr_proc_mutex.h, apr_thread_mutex.h, apr_thread_rwlock.h, apr_thread_cond.h, and apr_global_mutex.h. [Aaron Bannert] *) Change mod_status to use scoreboard accessor functions so it can be used in any MPM without having to be recompiled. [Ryan Morgan ] *) Fix parsing of some AP_DECLARE_DATA declarations so that the filter handle declarations are recognized. This fixes problems loading mod_autoindex on some platforms. [Brian Havard] *) add optional fixup hook to proxy [Daniel Lopez ] *) Remind the admin about the User and Group directives when we are unable to set permissions on a semaphore. PR 7812 [Jeff Trawick] *) fix possible compilation problem in ssl_engine_kernel.c. PR 7802 [Doug MacEachern] *) fix possible infinite loop in mod_ssl triggered by certain netscape clients [Doug MacEachern] *) fix ProxyPass when frontend is https and backend is http [Doug MacEachern] *) Add DASL support to mod_dav [Sung Kim ] @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @-------------------------------------------------------------------------------- Update www/apache2 to 2.0.35, the first stable release of Apache 2.x. Pkgsrc changes include: *) Compiling the included modules statically. Add-ons will be built dynamically. *) Match improvements to www/apache rc.d script. *) Automatically add "Listen 0.0.0.0:80" to the sample config files as the default install of NetBSD is IPv4/IPv6 and we want the default install of Apache to work out-of-the-box. *) Automatically reset the User and Group directives to match the ones for suEXEC in the config files to ease the use of suEXEC in Apache. Changes from version 2.0.32 beta include: *) Small bug fixes across the board. *) Bug fixes to the various MPMs. *) Performance improvements. *) Fixes for mod_include errors on boundary conditions *) Bug fixes for mod_proxy to prevent hangs and for RFC2616 compliance. *) Improvements to mod_dav for improved API and for RFC 3253 compliance *) Improvemants to mod_ssl to support SSL proxy and RSA SSLC 1.x/2.x *) Greatly improve mod_cache (disk/mem) [this is disabled in pkgsrc] *) New scoreboard file implementation that is readable by 3rd-party apps. *) Allow all Perchild directives to accept either numerical UID/GID or logical user/group names. *) Add support for macro expansion within the variable names 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 --- docs/conf/httpd-std.conf.in.orig Thu Apr 4 04:15:43 2002 a34 101 @@@@ -78,7 +78,7 @@@@ # identification number when it starts. # -PidFile @@rel_logfiledir@@/httpd.pid +PidFile @@rel_runtimedir@@/httpd.pid # @@@@ -290,7 +290,7 @@@@ # documents. By default, all requests are taken from this directory, but # symbolic links and aliases may be used to point to other locations. # -DocumentRoot "@@@@ServerRoot@@@@/@@rel_htdocsdir@@" +DocumentRoot "@@exp_htdocsdir@@" # # Each directory to which Apache has access can be configured with respect @@@@ -315,7 +315,7 @@@@ # # This should be changed to whatever you set DocumentRoot to. # - + # # Possible values for the Options directive are "None", "All", @@@@ -499,9 +499,9 @@@@ # We include the /icons/ alias for FancyIndexed directory listings. If you # do not use FancyIndexing, you may comment this out. # -Alias /icons/ "@@@@ServerRoot@@@@/@@rel_iconsdir@@/" +Alias /icons/ "@@exp_iconsdir@@/" - + Options Indexes MultiViews AllowOverride None Order allow,deny @@@@ -513,9 +513,9 @@@@ # the manual, even if you choose to move your DocumentRoot. You may comment # this out if you do not care for the documentation. # -Alias /manual "@@@@ServerRoot@@@@/@@rel_manualdir@@" +Alias /manual "@@exp_manualdir@@" - + Options Indexes FollowSymLinks MultiViews AllowOverride None Order allow,deny @@@@ -530,7 +530,7 @@@@ # The same rules about trailing "/" apply to ScriptAlias directives as to # Alias. # -ScriptAlias /cgi-bin/ "@@@@ServerRoot@@@@/@@rel_cgidir@@/" +ScriptAlias /cgi-bin/ "@@exp_cgidir@@/" # @@@@ -541,10 +541,10 @@@@ # -# "@@@@ServerRoot@@@@/@@rel_cgidir@@" should be changed to whatever your ScriptAliased +# "@@exp_cgidir@@" should be changed to whatever your ScriptAliased # CGI directory exists, if you have that configured. # - + AllowOverride None Options None Order allow,deny @@@@ -854,15 +854,15 @@@@ # Alias /error/include/ "/your/include/path/" # # which allows you to create your own set of files by starting with the -# @@@@ServerRoot@@@@/@@rel_errordir@@/include/ files and +# @@exp_errordir@@/include/ files and # copying them to /your/include/path/, even on a per-VirtualHost basis. # - Alias /error/ "@@@@ServerRoot@@@@/@@rel_errordir@@/" + Alias /error/ "@@exp_errordir@@/" - + AllowOverride None Options IncludesNoExec AddOutputFilter Includes html @@@@ -960,7 +960,7 @@@@ # To enable the cache as well, edit and uncomment the following lines: # (no cacheing without CacheRoot) # -#CacheRoot "@@@@ServerRoot@@@@/@@rel_proxycachedir@@" +#CacheRoot "@@exp_proxycachedir@@" #CacheSize 5 #CacheGcInterval 4 #CacheMaxExpire 24 @ 1.1.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.2 2002/06/01 13:18:02 itojun Exp $ d3 1 a3 1 --- docs/conf/httpd-std.conf.in.orig Wed Apr 24 16:24:35 2002 d35 101 @