aboutsummaryrefslogtreecommitdiff
path: root/www/nginx-devel/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* www/nginx-devel: welcome to the new stable release 1.20.0.Sergey A. Osokin2021-04-201-2/+1
|
* www/nginx-devel: update third-party vod module to 1.27Sergey A. Osokin2021-04-141-0/+1
|
* www/nginx-devel: move third-party module definition to Makefile.extmod.Sergey A. Osokin2021-04-141-16/+3
|
* www/nginx-devel: update from 1.19.9 to 1.19.10.Sergey A. Osokin2021-04-131-2/+1
| | | | | | | | | | | | | | | | <Changelog> *) Change: the default value of the "keepalive_requests" directive was changed to 1000. *) Feature: the "keepalive_time" directive. *) Feature: the $connection_time variable. *) Workaround: "gzip filter failed to use preallocated memory" alerts appeared in logs when using zlib-ng. </Changelog>
* Remove # $FreeBSD$ from Makefiles.Mathieu Arnold2021-04-061-1/+0
|
* Update passenger and its nginx module from 6.0.7 to 6.0.8.Sergey A. Osokin2021-04-061-0/+1
| | | | Bump PORTREVISION for www/nginx-devel.
* Update from 1.19.8 to 1.19.9.Sergey A. Osokin2021-04-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update NGINX JavaScript module from 0.5.2 to 0.5.3. Remove needless patches. <ChangeLog for nginx 1.19.9> *) Bugfix: nginx could not be built with the mail proxy module, but without the ngx_mail_ssl_module; the bug had appeared in 1.19.8. *) Bugfix: "upstream sent response body larger than indicated content length" errors might occur when working with gRPC backends; the bug had appeared in 1.19.1. *) Bugfix: nginx might not close a connection till keepalive timeout expiration if the connection was closed by the client while discarding the request body. *) Bugfix: nginx might not detect that a connection was already closed by the client when waiting for auth_delay or limit_req delay, or when working with backends. *) Bugfix: in the eventport method. </ChangeLog> <ChangeLog for njs 0.5.3> nginx modules: *) Feature: added the "js_var" directive. </ChangeLog>
* Run NJS module's configure script in the configure phase.Sergey A. Osokin2021-03-111-0/+4
| | | | | | | | | While I'm here update the NJS module description. Bump PORTREVISION. Notes: svn path=/head/; revision=568105
* Update from 1.19.7 to 1.19.8.Sergey A. Osokin2021-03-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Add the vendor's patch to build mail module without SSL support. <Changelog> *) Feature: flags in the "proxy_cookie_flags" directive can now contain variables. *) Feature: the "proxy_protocol" parameter of the "listen" directive, the "proxy_protocol" and "set_real_ip_from" directives in mail proxy. *) Bugfix: HTTP/2 connections were immediately closed when using "keepalive_timeout 0"; the bug had appeared in 1.19.7. *) Bugfix: some errors were logged as unknown if nginx was built with glibc 2.32. *) Bugfix: in the eventport method. </Changelog> Notes: svn path=/head/; revision=567947
* Update NGINX JavaScript module from 0.5.1 to 0.5.2.Sergey A. Osokin2021-03-091-1/+1
| | | | | | | Bump PORTREVISION. Notes: svn path=/head/; revision=567928
* Fix the port build by changing a third-party moduleSergey A. Osokin2021-02-241-1/+1
| | | | | | | | | | distribution on GH. Bump PORTREVISION. PR: 253700 Notes: svn path=/head/; revision=566494
* Refresh the kernel TLS patch.Sergey A. Osokin2021-02-191-4/+1
| | | | | | | | | | | | | | This functionality is available with the following prerequisites: o) security/openssl built from ports with the kTLS options defined; o) FreeBSD 13. Bump PORTREVISION. Submitted by: jhb Obtained from: https://github.com/nginx/nginx/compare/master...bsdjhb:ktls.patch Notes: svn path=/head/; revision=566096
* Update from 1.19.6 to 1.19.7.Sergey A. Osokin2021-02-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update njs module from 0.5.0 to 0.5.1. Update third-party auth_ldap module to its recent commit. <Changelog> Changes with nginx 1.19.7 16 Feb 2021 *) Change: connections handling in HTTP/2 has been changed to better match HTTP/1.x; the "http2_recv_timeout", "http2_idle_timeout", and "http2_max_requests" directives have been removed, the "keepalive_timeout" and "keepalive_requests" directives should be used instead. *) Change: the "http2_max_field_size" and "http2_max_header_size" directives have been removed, the "large_client_header_buffers" directive should be used instead. *) Feature: now, if free worker connections are exhausted, nginx starts closing not only keepalive connections, but also connections in lingering close. *) Bugfix: "zero size buf in output" alerts might appear in logs if an upstream server returned an incorrect response during unbuffered proxying; the bug had appeared in 1.19.1. *) Bugfix: HEAD requests were handled incorrectly if the "return" directive was used with the "image_filter" or "xslt_stylesheet" directives. *) Bugfix: in the "add_trailer" directive. Changes with njs 0.5.1 16 Feb 2021 nginx modules: *) Feature: introduced ngx.fetch() method implementing Fetch API. The following init options are supported: body, headers, buffer_size (nginx specific), max_response_body_size (nginx specific), method. The following properties and methods of Response object are implemented: arrayBuffer(), bodyUsed, json(), headers, ok, redirect, status, statusText, text(), type, url. The following properties and methods of Header object are implemented: get(), getAll(), has(). Notable limitations: only the http:// scheme is supported, redirects are not handled. In collaboration with 洪志道 (Hong Zhi Dao). *) Feature: added the "js_header_filter" directive. *) Bugfix: fixed processing buffered data in body filter in stream module. Core: *) Bugfix: fixed safe mode bypass in Function constructor. *) Bugfix: fixed Date.prototype.toISOString() with invalid date values. </Changelog> Notes: svn path=/head/; revision=565418
* Fix PROPFIND fail with 500 on simlinks to non exist file/dirSergey A. Osokin2020-12-281-1/+1
| | | | | | | | | | | when nginx compiled with the third-party http_dav_ext module. Bump PORTREVISION. PR: 220871 Notes: svn path=/head/; revision=559454
* Update the following third-party modules to their recent revisions:Sergey A. Osokin2020-12-271-1/+1
| | | | | | | | | | o) drizzle o) echo Bump PORTREVISION. Notes: svn path=/head/; revision=559348
* Update the following third-party modules to their recentSergey A. Osokin2020-12-221-1/+1
| | | | | | | | | | | | | | | commits or versions: o) aws_auth o) brotli o) http_shibboleth o) set_misc o) srcache Bump PORTREVISION. Notes: svn path=/head/; revision=558877
* Merge r558438 from www/nginx, i.e. update the followingSergey A. Osokin2020-12-191-0/+1
| | | | | | | | | | | third-party modules to their recent versions: o) fancyindex o) http_geoip2 Bump PORTREVISION. Notes: svn path=/head/; revision=558453
* Update from 1.19.5 to 1.19.6.Sergey A. Osokin2020-12-151-4/+1
| | | | | | | | | | | | | | | | | | | | | <Changelog> *) Bugfix: "no live upstreams" errors if a "server" inside "upstream" block was marked as "down". *) Bugfix: a segmentation fault might occur in a worker process if HTTPS was used; the bug had appeared in 1.19.5. *) Bugfix: nginx returned the 400 response on requests like "GET http://example.com?args HTTP/1.0". *) Bugfix: in the ngx_http_flv_module and ngx_http_mp4_module. Thanks to Chris Newton. </Changelog> Notes: svn path=/head/; revision=558162
* Fix a worker process issue by adding the vendor's patch.Sergey A. Osokin2020-12-071-1/+3
| | | | | | | | | | | | | | | | | | | | Bump PORTREVISION. Reported by: Peter Putzer <freebsd@mnd.sc> <ChangeLog> SSL: fixed SSL shutdown on lingering close. Ensure c->recv is properly reset to ngx_recv if SSL_shutdown() blocks on writing. The bug had appeared in 554c6ae25ffc. </ChangeLog> PR: 251664 Notes: svn path=/head/; revision=557244
* Update njs module from 0.4.4 to 0.5.0.Sergey A. Osokin2020-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump PORTREVISION. <ChangeLog> nginx modules: *) Feature: introduced global "ngx" object. The following methods were added: ngx.log(level, msg) The following properties were added: ngx.INFO, ngx.WARN, ngx.ERR. *) Feature: added support for Buffer object where string is expected. *) Feature: added Buffer version of existing properties. The following properties were added: r.requestBuffer (r.requestBody), r.responseBuffer (r.responseBody), r.rawVariables (r.variables), s.rawVariables (s.variables). The following events were added in stream module: upstream (upload), downstream (download). *) Improvement: added aliases to existing properties. The following properties were added: r.requestText (r.requestBody), r.responseText (r.responseBody). *) Improvement: throwing an exception in r.internalRedirect() for a subrequest. *) Bugfix: fixed promise r.subrequest() with error_page redirect. *) Bugfix: fixed promise events handling. Core: *) Feature: added TypeScript definitions for built-in modules. Thanks to Jakub Jirutka. *) Feature: tracking unhandled promise rejection. *) Feature: added initial iterator support. Thanks to Artem S. Povalyukhin. *) Improvement: TypeScript definitions are refactored. Thanks to Jakub Jirutka. *) Improvement: added forgotten support for Object.prototype.valueOf() in Buffer.from(). *) Bugfix: fixed heap-use-after-free in JSON.parse(). *) Bugfix: fixed heap-use-after-free in JSON.stringify(). *) Bugfix: fixed JSON.stringify() for arrays resizable via getters. *) Bugfix: fixed heap-buffer-overflow for RegExp.prototype[Symbol.replace]. *) Bugfix: fixed returned value for Buffer.prototype.write* functions. *) Bugfix: fixed querystring.stringify(). Thanks to Artem S. Povalyukhin. *) Bugfix: fixed the catch handler for Promise.prototype.finally(). *) Bugfix: fixed querystring.parse(). </ChangeLog> Notes: svn path=/head/; revision=556756
* Update third-party naxsi module from 1.2 to 1.3.Sergey A. Osokin2020-11-241-1/+1
| | | | | | | | | ChangeLog: https://github.com/nbs-system/naxsi/compare/1.2...1.3 Bump PORTREVISION. Notes: svn path=/head/; revision=556175
* Update third-party passenger module from 6.0.6 to 6.0.7.Sergey A. Osokin2020-11-241-0/+1
| | | | | | | | | ChangeLog: https://github.com/phusion/passenger/compare/release-6.0.6...release-6.0.7 Bump PORTREVISION. Notes: svn path=/head/; revision=556173
* Update from 1.19.4 to 1.19.5.Sergey A. Osokin2020-11-241-2/+1
| | | | | | | | | | | | | | | | | | | | | <Changelog> *) Feature: the -e switch. *) Feature: the same source files can now be specified in different modules while building addon modules. *) Bugfix: SSL shutdown did not work when lingering close was used. *) Bugfix: "upstream sent frame for closed stream" errors might occur when working with gRPC backends. *) Bugfix: in request body filters internal API. </Changelog> Notes: svn path=/head/; revision=556172
* Update third-partu link function module from 3.2.3 to 3.2.4.Sergey A. Osokin2020-11-241-1/+1
| | | | | | | Bump PORTREVISION. Notes: svn path=/head/; revision=556167
* Update third-party naxsi module from 1.1a to 1.2.Sergey A. Osokin2020-11-061-1/+1
| | | | | | | Bump PORTREVISION. Notes: svn path=/head/; revision=554324
* Update third-partu lua module to the recent version.Sergey A. Osokin2020-11-061-1/+1
| | | | | | | Bump PORTREVISION. Notes: svn path=/head/; revision=554296
* Update the kernel TLS patch to make all hunks succeeded.Sergey A. Osokin2020-10-281-0/+1
| | | | | | | Bump PORTREVISION. Notes: svn path=/head/; revision=553544
* Update from 1.19.3 to 1.19.4.Sergey A. Osokin2020-10-271-2/+1
| | | | | | | | | | | | | | | | | | Remove needless patches. <Changelog> *) Feature: the "ssl_conf_command", "proxy_ssl_conf_command", "grpc_ssl_conf_command", and "uwsgi_ssl_conf_command" directives. *) Feature: the "ssl_reject_handshake" directive. *) Feature: the "proxy_smtp_auth" directive in mail proxy. </Changelog> Notes: svn path=/head/; revision=553455
* Update third-party naxsi module from 0.56 to 1.1a.Sergey A. Osokin2020-10-241-1/+1
| | | | | | | Bump PORTREVISION. Notes: svn path=/head/; revision=553200
* Bump PORTREVISION for www/libjwt shlib changeSunpoet Po-Chuan Hsieh2020-10-181-1/+1
| | | | Notes: svn path=/head/; revision=552640
* Re-add the patch from r550699 to fix build with -fno-common forSergey A. Osokin2020-10-011-1/+1
| | | | | | | | | | | the third-party nchan module. Bump PORTREVISION. Spotted by: vanilla Notes: svn path=/head/; revision=550845
* Fix build with -fno-common.Sergey A. Osokin2020-09-301-1/+1
| | | | | | | | | Bump PORTREVISION. Submitted by: vanilla Notes: svn path=/head/; revision=550720
* Merge r549093 to fix build with -fno-common.Sergey A. Osokin2020-09-301-0/+1
| | | | | | | | | Bump PORTREVISION. Spotted by: vanilla Notes: svn path=/head/; revision=550699
* Update nginx from 1.19.2 to 1.19.3.Sergey A. Osokin2020-09-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update njs module from 0.4.3 to 0.4.4. <Changelog for nginx 1.19.3> *) Feature: the ngx_stream_set_module. *) Feature: the "proxy_cookie_flags" directive. *) Feature: the "userid_flags" directive. *) Bugfix: the "stale-if-error" cache control extension was erroneously applied if backend returned a response with status code 500, 502, 503, 504, 403, 404, or 429. *) Bugfix: "[crit] cache file ... has too long header" messages might appear in logs if caching was used and the backend returned responses with the "Vary" header line. *) Workaround: "[crit] SSL_write() failed" messages might appear in logs when using OpenSSL 1.1.1. *) Bugfix: "SSL_shutdown() failed (SSL: ... bad write retry)" messages might appear in logs; the bug had appeared in 1.19.2. *) Bugfix: a segmentation fault might occur in a worker process when using HTTP/2 if errors with code 400 were redirected to a proxied location using the "error_page" directive. *) Bugfix: socket leak when using HTTP/2 and subrequests in the njs module. </ChangeLog> <Changelog for njs 0.4.4> nginx modules: *) Bugfix: fixed location merge. *) Bugfix: fixed r.httpVersion for HTTP/2. Core: *) Feature: added support for numeric separators (ES12). *) Feature: added remaining methods for %TypedArray%.prototype. The following methods were added: every(), filter(), find(), findIndex(), forEach(), includes(), indexOf(), lastIndexOf(), map(), reduce(), reduceRight(), reverse(), some(). *) Feature: added %TypedArray% remaining methods. The following methods were added: from(), of(). *) Feature: added DataView object. *) Feature: added Buffer object implementation. *) Feature: added support for ArrayBuffer in TextDecoder.prototype.decode(). *) Feature: added support for Buffer object in "crypto" methods. *) Feature: added support for Buffer object in "fs" methods. *) Change: Hash.prototype.digest() and Hmac.prototype.digest() now return a Buffer instance instead of a byte string when encoding is not provided. *) Change: fs.readFile() and friends now return a Buffer instance instead of a byte string when encoding is not provided. *) Bugfix: fixed function "prototype" property handler while setting. *) Bugfix: fixed function "constructor" property handler while setting. *) Bugfix: fixed String.prototype.indexOf() for byte strings. *) Bugfix: fixed RegExpBuiltinExec() with a global flag and byte strings. *) Bugfix: fixed RegExp.prototype[Symbol.replace] when the replacement value is a function. *) Bugfix: fixed TextDecoder.prototype.decode() with non-zero TypedArray offset. </Changelog> Notes: svn path=/head/; revision=550529
* Add the corresponding library path to the patch for theSergey A. Osokin2020-08-271-4/+2
| | | | | | | | | | | | | | third-party http_auth_spnego module. The third-party http_auth_spnego module may not work with in-base Kerberos implementation because of gss_locaname() function usage, so remove the GSSAPI_BASE option from the GSSAPI radio button. Bump PORTREVISION. Notes: svn path=/head/; revision=546696
* Update third-party tarantool module to its recent commit.Sergey A. Osokin2020-08-271-1/+1
| | | | | | | Bump PORTREVISION. Notes: svn path=/head/; revision=546352
* Update third-party spnego-http-auth module to its recent version.Sergey A. Osokin2020-08-271-1/+1
| | | | | | | Bump PORTREVISION. Notes: svn path=/head/; revision=546334
* Partially merge r545592 from www/nginx.Sergey A. Osokin2020-08-271-1/+1
| | | | | | | | | - Fix broken build after NJS update (missing USES+=libedit) Bump PORTREVISION. Notes: svn path=/head/; revision=546313
* Partially revert back r533146 cause upstream_check third-partySergey A. Osokin2020-08-241-1/+1
| | | | | | | | | | | | dynamic module can't work as expected, so let's keep it static for now. Bump PORTREVISION. PR: 247523 Notes: svn path=/head/; revision=546038
* Update PLIST according to the recent change.Sergey A. Osokin2020-08-231-1/+1
| | | | | | | Bump PORTREVISION. Notes: svn path=/head/; revision=545800
* Update third-party dynamic_upstream module.Sergey A. Osokin2020-08-221-2/+2
| | | | | | | | | Add third-party dynamic_healthcheck module. Bump PORTREVISION. Notes: svn path=/head/; revision=545785
* Update third-party modules to their recent releases:Sergey A. Osokin2020-08-221-0/+1
| | | | | | | | | | o) ip2proxy-nginx o) slact-nchan Bump PORTREVISION. Notes: svn path=/head/; revision=545782
* Update nginx from 1.19.1 to 1.19.2.Sergey A. Osokin2020-08-111-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update njs module from 0.4.2 to 0.4.3. While I'm here soften some variables and target definitions to prepare the port for a separate build of dynamic modules. <Changelog for nginx 1.19.2> *) Change: now nginx starts closing keepalive connections before all free worker connections are exhausted, and logs a warning about this to the error log. *) Change: optimization of client request body reading when using chunked transfer encoding. *) Bugfix: memory leak if the "ssl_ocsp" directive was used. *) Bugfix: "zero size buf in output" alerts might appear in logs if a FastCGI server returned an incorrect response; the bug had appeared in 1.19.1. *) Bugfix: a segmentation fault might occur in a worker process if different large_client_header_buffers sizes were used in different virtual servers. *) Bugfix: SSL shutdown might not work. *) Bugfix: "SSL_shutdown() failed (SSL: ... bad write retry)" messages might appear in logs. *) Bugfix: in the ngx_http_slice_module. *) Bugfix: in the ngx_http_xslt_filter_module. </Changelog> <Changelog for njs 0.4.3> Core: *) Feature: added Query String module. *) Feature: improved fs.mkdir() to support recursive directory creation. Thanks to Artem S. Povalyukhin. *) Feature: improved fs.rmdir() to support recursive directory removal. Thanks to Artem S. Povalyukhin. *) Feature: introduced UTF-8 decoder according to WHATWG encoding spec. *) Feature: added TextEncoder/TextDecoder implementation. *) Bugfix: fixed parsing return statement without semicolon. *) Bugfix: fixed njs_number_to_int32() for big-endian platforms. *) Bugfix: fixed unit test on big-endian platforms. *) Bugfix: fixed regexp-literals parsing with '=' characters. *) Bugfix: fixed pre/post increment/decrement in assignment operations. </Changelog> Notes: svn path=/head/; revision=544689
* Update passenger and its third-party module for www/nginx-develSergey A. Osokin2020-07-151-1/+1
| | | | | | | from 6.0.5 to 6.0.6. Notes: svn path=/head/; revision=542274
* Update the following third-party modules to their new versions:Sergey A. Osokin2020-07-151-1/+1
| | | | | | | | | | o) cache_purge o) clojure Bump PORTREVISION. Notes: svn path=/head/; revision=542270
* Update third-party brotli module to v1.0.0rc.Sergey A. Osokin2020-07-091-0/+1
| | | | | | | Bump PORTREVISION. Notes: svn path=/head/; revision=541831
* Update from 1.19.0 to 1.19.1.Sergey A. Osokin2020-07-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <ChangeLog> *) Change: the "lingering_close", "lingering_time", and "lingering_timeout" directives now work when using HTTP/2. *) Change: now extra data sent by a backend are always discarded. *) Change: now after receiving a too short response from a FastCGI server nginx tries to send the available part of the response to the client, and then closes the client connection. *) Change: now after receiving a response with incorrect length from a gRPC backend nginx stops response processing with an error. *) Feature: the "min_free" parameter of the "proxy_cache_path", "fastcgi_cache_path", "scgi_cache_path", and "uwsgi_cache_path" directives. Thanks to Adam Bambuch. *) Bugfix: nginx did not delete unix domain listen sockets during graceful shutdown on the SIGQUIT signal. *) Bugfix: zero length UDP datagrams were not proxied. *) Bugfix: proxying to uwsgi backends using SSL might not work. Thanks to Guanzhong Chen. *) Bugfix: in error handling when using the "ssl_ocsp" directive. *) Bugfix: on XFS and NFS file systems disk cache size might be calculated incorrectly. *) Bugfix: "negative size buf in writer" alerts might appear in logs if a memcached server returned a malformed response. </ChangeLog> Notes: svn path=/head/; revision=541435
* Update third-party modules:Sergey A. Osokin2020-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o) lua from 0.10.15 to 0.10.17 o) njs from 0.4.1 to 0.4.2 Bump PORTREVISION. <ChangeLog for njs 0.4.2> Core: *) Feature: added RegExp.prototype[Symbol.replace]. *) Feature: introduced line level backtrace. *) Feature: added %TypedArray%.prototype.sort(). *) Feature: extended "fs" module. Added mkdir(), readdir(), rmdir() and friends. Thanks to Artem S. Povalyukhin. *) Improvement: parser refactoring. *) Bugfix: fixed TypedScript API description for HTTP headers. *) Bugfix: fixed TypedScript API description for NjsByteString type. *) Bugfix: fixed String.prototype.repeat() according to the specification. *) Bugfix: fixed parsing of flags for regexp literals. *) Bugfix: fixed index generation for global objects in generator. *) Bugfix: fixed String.prototype.replace() according to the specification. *) Bugfix: fixed %TypedArray%.prototype.copyWithin() with nonzero byte offset. *) Bugfix: fixed Array.prototype.splice() for sparse arrays. *) Bugfix: fixed Array.prototype.reverse() for sparse arrays. *) Bugfix: fixed Array.prototype.sort() for sparse arrays. </ChangeLog for njs 0.4.2> Notes: svn path=/head/; revision=541433
* Move NJS knob out of the HTTP group cause NGINX JavaScript moduleSergey A. Osokin2020-06-231-3/+3
| | | | | | | | | distribution provides modules for http and stream (tcp/udp). Bump PORTREVISION. Notes: svn path=/head/; revision=540006
* Add kernel TLS option.Sergey A. Osokin2020-06-051-2/+9
| | | | | | | | | | | | | | It's possible to build nginx on FreeBSD13 with security/openssl port, compiled with kernel TLS option as well. Bump PORTREVISION. Based on: https://github.com/nginx/nginx/compare/branches/stable-1.16...bsdjhb:ktls-1.16 Reviewed by: jhb Tested by: jhb Notes: svn path=/head/; revision=538058