Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-6-1]: src/libexec/httpd Pull up following revision(s) (requested ...



details:   https://anonhg.NetBSD.org/src/rev/5d344fd71d40
branches:  netbsd-6-1
changeset: 775961:5d344fd71d40
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Jul 09 09:44:56 2014 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #1095):
libexec/httpd/CHANGES                           1.12-1.18
libexec/httpd/Makefile                          1.13-1.22
libexec/httpd/Makefile.boot                     1.6
libexec/httpd/auth-bozo.c                       1.11-1.13
libexec/httpd/bozohttpd.8                       1.33-1.46
libexec/httpd/bozohttpd.c                       1.31-1.54
libexec/httpd/bozohttpd.h                       1.21-1.32
libexec/httpd/cgi-bozo.c                        1.21-1.25
libexec/httpd/content-bozo.c                    1.8-1.10
libexec/httpd/daemon-bozo.c                     1.16-1.16
libexec/httpd/dir-index-bozo.c                  1.15-1.19
libexec/httpd/lua-bozo.c                        1.1-1.9
libexec/httpd/main.c                            1.6-1.7
libexec/httpd/netbsd_queue.h                    1.1
libexec/httpd/printenv.lua                      1.1-1.2
libexec/httpd/ssl-bozo.c                        1.14-1.16
libexec/httpd/tilde-luzah-bozo.c                1.10
libexec/httpd/libbozohttpd/Makefile             1.2
libexec/httpd/libbozohttpd/libbozohttpd.3       1.2-1.3
libexec/httpd/small/Makefile                    1.2

        Update bozohttpd from 20111118 to 20140708.

        changes in bozohttpd 20140708:
        o  fixes for virtual host support, from rajeev_v_pillai%yahoo.com@localhost
        o  avoid printing double errors, from shm%netbsd.org@localhost
        o  fix a security issue in basic HTTP authentication which would allow
           authentication to be bypassed, from shm%netbsd.org@localhost

        changes in bozohttpd 20140201:
        o  support .svg files
        o  fix a core dump when requests timeout

        changes in bozohttpd 20140102:
        o  update a few content types
        o  add support for directly calling lua scripts to handle
           processes, from mbalmer%netbsd.org@localhost
        o  properly escape generated HTML
        o  add authentication for redirections, from martin%netbsd.org@localhost
        o  handle chained ssl certifications, from elric%netbsd.org@localhost
        o  add basic support for gzipped files, from elric%netbsd.org@localhost
        o  properly escape generated URIs

diffstat:

 libexec/httpd/CHANGES                     |   85 +++--
 libexec/httpd/Makefile                    |   53 +++-
 libexec/httpd/Makefile.boot               |    7 +-
 libexec/httpd/auth-bozo.c                 |   19 +-
 libexec/httpd/bozohttpd.8                 |  213 +++++++++----
 libexec/httpd/bozohttpd.c                 |  457 +++++++++++++++++++++--------
 libexec/httpd/bozohttpd.h                 |   76 ++++-
 libexec/httpd/cgi-bozo.c                  |   21 +-
 libexec/httpd/content-bozo.c              |    6 +-
 libexec/httpd/daemon-bozo.c               |    4 +-
 libexec/httpd/dir-index-bozo.c            |   26 +-
 libexec/httpd/libbozohttpd/Makefile       |    1 +
 libexec/httpd/libbozohttpd/libbozohttpd.3 |    6 +-
 libexec/httpd/lua-bozo.c                  |  454 +++++++++++++++++++++++++++++
 libexec/httpd/main.c                      |   22 +-
 libexec/httpd/netbsd_queue.h              |   82 +++++
 libexec/httpd/printenv.lua                |   85 +++++
 libexec/httpd/small/Makefile              |    3 +-
 libexec/httpd/ssl-bozo.c                  |   12 +-
 libexec/httpd/tilde-luzah-bozo.c          |    4 +-
 20 files changed, 1336 insertions(+), 300 deletions(-)

diffs (truncated from 2751 to 300 lines):

diff -r f9d84d7658d4 -r 5d344fd71d40 libexec/httpd/CHANGES
--- a/libexec/httpd/CHANGES     Mon Jun 30 12:18:40 2014 +0000
+++ b/libexec/httpd/CHANGES     Wed Jul 09 09:44:56 2014 +0000
@@ -1,6 +1,26 @@
 $eterna: CHANGES,v 1.78 2011/11/18 01:25:11 mrg Exp $
 
-changes since bozohttpd 20100920:
+changes in bozohttpd 20140708:
+       o  fixes for virtual host support, from rajeev_v_pillai%yahoo.com@localhost
+       o  avoid printing double errors, from shm%netbsd.org@localhost
+       o  fix a security issue in basic HTTP authentication which would allow
+          authentication to be bypassed, from shm%netbsd.org@localhost
+
+changes in bozohttpd 20140201:
+       o  support .svg files
+       o  fix a core dump when requests timeout
+
+changes in bozohttpd 20140102:
+       o  update a few content types
+       o  add support for directly calling lua scripts to handle
+          processes, from mbalmer%netbsd.org@localhost
+       o  properly escape generated HTML
+       o  add authentication for redirections, from martin%netbsd.org@localhost
+       o  handle chained ssl certifications, from elric%netbsd.org@localhost
+       o  add basic support for gzipped files, from elric%netbsd.org@localhost
+       o  properly escape generated URIs
+
+changes in bozohttpd 20111118:
        o  add -P <pidfile> option, from jmmv%netbsd.org@localhost
        o  avoid crashes with http basic auth, from pooka%netbsd.org@localhost
        o  add support for REDIRECT_STATUS variable, from tls%netbsd.org@localhost
@@ -9,7 +29,7 @@
           reed%netbsd.org@localhost
        o  allow -I option to be useful in non-inetd mode as well
 
-changes since bozohttpd 20100617:
+changes in bozohttpd 20100920:
        o  properly fully disable multi-file mode for now
        o  fix the -t and -U options when used without the -e option, broken since
           the library-ifcation
@@ -20,7 +40,7 @@
        o  fix some various non standard compile time errors, from rudolf
        o  fix dynamic CGI content maps, from rudolf
 
-changes since bozohttpd 20100509:
+changes in bozohttpd 20100617:
        o  fix some compile issues
        o  fix SSL mode.  from rtr
        o  fix some cgi-bin issues, as seen with cvsweb
@@ -29,13 +49,13 @@
        o  remove "noreturn" attribute from bozo_http_error() that was
           causing incorrect runtime behaviour
 
-changes since bozohttpd 20090522:
+changes in bozohttpd 20100509:
        o  major rework and clean up of internal interfaces.  move the main
           program into main.c, the remaining parts are useable as library.
           add bindings for lua.  by Alistair G. Crooks <agc%netbsd.org@localhost>
        o  fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=566325
 
-changes since bozohttpd 20090417:
+changes in bozohttpd 20090522:
        o  avoid dying in daemon mode for some uncommon, but recoverable, errors
        o  close leaking file descriptors for CGI and daemon mode
        o  handle poll errors properly
@@ -46,7 +66,7 @@
        o  document the -f option
        o  daemon mode now serves 6 files per child
 
-changes since bozohttpd 20080303:
+changes in bozohttpd 20090417:
        o  make bozohttpd internally more modular, preparing the way
           to handle more than one request per process
        o  fix http-auth, set $REMOTE_USER not $REMOTEUSER.  also fix
@@ -60,18 +80,18 @@
           <joerg%netbsd.org@localhost>
        o  many more manual fixes, from NetBSD
 
-changes since bozohttpd 20060710:
+changes in bozohttpd 20080303:
        o  fix some cgi header processing, from <thelsdj%gmail.com@localhost>
        o  add simple Range: header processing, from <bad%bsd.de@localhost>
        o  man page fixes, from NetBSD
        o  clean up various parts, from NetBSD
 
-changes since bozohttpd 20060517:
+changes in bozohttpd 20060710:
        o  prefix some function names with "bozo"
        o  align directory indexing <hr> markers
        o  clean up some code GCC4 grumbled about
 
-changes since bozohttpd 20050410:
+changes in bozohttpd 20060517:
        o  don't allow "/.." or "../" files
        o  don't write ":80" into urls for the http port
        o  fix a fd leak when fork() fails
@@ -79,7 +99,7 @@
        o  build a text version of the manual page
        o  make "make clean" work properly
 
-changes since bozohttpd 20040808:
+changes in bozohttpd 20050410:
        o  fix some off-by-one errors from <roland.illig%gmx.de@localhost>
        o  properly support nph- CGI
        o  make content maps case insensitive
@@ -89,7 +109,7 @@
           from <rumble%ephemeral.org@localhost>
        o  HTTP/1.x protocol headers are now properly merged for CGI
 
-changes since bozohttpd 20040218:
+changes in bozohttpd 20040808:
        o  CGI status is now properly handled (-a flag has been removed)
        o  CGI file upload support works
        o  %xy translations are no longer ever applied after the first '?',
@@ -101,7 +121,7 @@
        o  don't print 2 "200" headers for CGI
        o  support .torrent files
 
-changes since bozohttpd 20031005:
+changes in bozohttpd 20040218:
        o  new .bzredirect file support for sane directory redirection
        o  new -Z option that enables SSL mode, from <rtr%eterna.com.au@localhost>
        o  the -C option has been changed to take two explicit options, rather
@@ -114,13 +134,13 @@
        o  with -r, if a .bzdirect file appears in a directory, allow direct
           access to this directory
 
-changes since bozohttpd 20030626:
+changes in bozohttpd 20031005:
        o  fixes for basic authorisation.  from <ecu%ipv42.net@localhost>
        o  always display file size in directory index mode
        o  add .xbel, .xml & .xsl -> text/xml mappings.  from
           <wiz%danbala.ifoer.tuwien.ac.at@localhost>
 
-changes since bozohttpd 20030409:
+changes in bozohttpd 20030626:
        o  fix a recent core dump when given no input
        o  add new -r flag that ensures referrer is set to this host
        o  fix several compile time errors with -DNO_CGIBIN_SUPPORT
@@ -134,7 +154,7 @@
        o  simplify some code in -C to avoid a core dump.  from lukem
        o  add a .css -> css/text entry to the content_map[].  from zakj%nox.cx@localhost
 
-changes since bozohttpd 20030313:
+changes in bozohttpd 20030409:
        o  -d without DEBUG enabled only prints one warning and continues
        o  one can now define the C macro SERVER_SOFTWARE when building to
           change the Server: header and CGI variable of the same name
@@ -147,7 +167,7 @@
        o  build on linux again
        o  fix core dumps when using -C
 
-changes since bozohttpd 20021106:
+changes in bozohttpd 20030313:
        o  deprecate -r flag; make this the default and silently ignore -r now
        o  add support for file extentions to call CGI programs (from lukem)
        o  add dynamic support to add new content map entries, allowing both
@@ -161,7 +181,7 @@
        o  in -b mode, set the SO_REUSEADDR socket option (lukem)
        o  allow -x (index.html) mode to work with CGI handlers
 
-changes since bozohttpd 5.15 (20020913):
+changes in bozohttpd 20021106:
        o  add .bz2 support
        o  properly escape <, > and & in error messages, partly from
           Nicolas Jombart <ecu%mariejeanne.net@localhost>
@@ -170,11 +190,11 @@
           overflowing the buffer with carriage returns (\r)
        o  do not decode "%XY"-style cgi-bin data beyond the "?"
 
-changes since bozohttpd 5.14 (20020823):
+changes in bozohttpd 5.15 (20020913):
        o  add .ogg support -> `application/x-ogg'
        o  fix CGI requests with "/" in the query part
 
-changes since bozohttpd 5.13 (20020804):
+changes in bozohttpd 5.14 (20020823):
        o  allow -X mode to work for "/"
        o  work on systems without MADV_SEQUENTIAL
        o  make a local cut-down copy of "queue.h" (fixes linux & solaris
@@ -183,15 +203,15 @@
        o  portability fixes for missing _PATH_DEFPATH, LOG_FTP and __progname
        o  better documentation on virtual host support
 
-changes since bozohttpd 5.12 (20020803):
+changes in bozohttpd 5.13 (20020804):
        o  support .mp3 files (type audio/mpeg)
        o  use stat() to find out if something is a directory, for -X mode
 
-changes since bozohttpd 5.11 (20020730):
+changes in bozohttpd 5.12 (20020803):
        o  constification
        o  fixes & enhancements for directory index mode (-X)
 
-changes since bozohttpd 5.10 (20020710):
+changes in bozohttpd 5.11 (20020730):
        o  more man page fixes from Thomas Klausner
           <wiz%danbala.ifoer.tuwien.ac.at@localhost>
        o  de-K&R C-ification
@@ -199,7 +219,7 @@
        o  fix core dump when asking for /cgi-bin/ when CGI isn't configured
        o  use a valid Server: header
 
-changes since bozohttpd 5.09 (20010922):
+changes in bozohttpd 5.10 (20020710):
        - add freebsd support 
        - fix a couple of header typos
        - many cgi-bin fixes from lukem%netbsd.org@localhost
@@ -208,41 +228,40 @@
        - add -e that does not clear the environment for -T/-U
        - fix a formatting error noticed by ISIHARA Takanori <ishit%oak.dti.ne.jp@localhost>
 
-changes since bozohttpd 5.08 (20010812):
+changes in bozohttpd 5.09 (20010922):
        - add a daemon mode
        - document how to use bozohttpd in netbsd inetd with more than 40 
        connections per minute and also with cgibin
        - man page fixes from wiz%netbsd.org@localhost
 
-changes since bozohttpd 5.07 (20010610):
+changes in bozohttpd 5.08 (20010812):
        - add directory index generation support (-X) from ad%netbsd.org@localhost
        - add .pa as an alias for .pac
        - make server software version configurable (RFC)
 
-changes since bozohttpd 5.06 (20000825):
+changes in bozohttpd 5.07 (20010610):
        - add .png support 
        - new "-x index.html" flag to change default file
        - new "-p public_html" flag to change default ~user directory
        - fixes cgi-bin support and more from chuck%research.att.com@localhost
        - add many new content-types, now support most common ones
 
-changes since bozohttpd 5.05 (20000815):
+changes in bozohttpd 5.06 (20000825):
        - add IPv6 suppor from itojun%iijlab.net@localhost
        - man page fixes from jlam%netbsd.org@localhost
 
-changes since bozohttpd 5.04 (20000427):
+changes in bozohttpd 5.05 (20000815):
        - fix a virtual host bug, from kleink%netbsd.org@localhost
 
-changes since bozohttpd 5.03 (20000427):
+changes in bozohttpd 5.04 (20000427):
        - fix virtual host support; URI takes precedence over Host:
 
-changes since bozohttpd 5.02 (20000426):
+changes in bozohttpd 5.03 (20000427):
        - fix a bug with chdir() 
 
-changes since bozohttpd 5.01 (20000421):
+changes in bozohttpd 5.02 (20000426):
        - .pac spport from simonb
 
-changes since bozohttpd 5.00 (19990519):
+changes in bozohttpd 5.01 (20000421):
        - .swf support 
        - virtual hosting support 
-
diff -r f9d84d7658d4 -r 5d344fd71d40 libexec/httpd/Makefile
--- a/libexec/httpd/Makefile    Mon Jun 30 12:18:40 2014 +0000
+++ b/libexec/httpd/Makefile    Wed Jul 09 09:44:56 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2010/09/20 23:11:38 mrg Exp $
+#      $NetBSD: Makefile,v 1.12.20.1 2014/07/09 09:44:56 msaitoh Exp $
 #
 #      $eterna: Makefile,v 1.30 2010/07/11 00:34:27 mrg Exp $
 #
@@ -13,6 +13,7 @@
 #      NO_DYNAMIC_CONTENT      /* don't support dynamic content updates */
 #      NO_SSL_SUPPORT          /* don't support ssl (https) */
 #      DO_HTPASSWD             /* support .htpasswd files */
+#      NO_LUA_SUPPORT          /* don't support Lua for dynamic content */
 #
 # these are usually set via the "COPTS" variable, or some other method
 # for setting CFLAGS relevant to your make, eg
@@ -23,11 +24,11 @@
 MAN=   httpd.8
 BUILDSYMLINKS+=bozohttpd.8 httpd.8
 SRCS=  bozohttpd.c ssl-bozo.c auth-bozo.c cgi-bozo.c daemon-bozo.c \
-       tilde-luzah-bozo.c dir-index-bozo.c content-bozo.c
+       tilde-luzah-bozo.c dir-index-bozo.c content-bozo.c lua-bozo.c
 SRCS+= main.c
 
-LDADD= -lcrypt
-DPADD= ${LIBCRYPT}
+LDADD= -lcrypt -llua -lm
+DPADD= ${LIBCRYPT} ${LIBLUA} ${LIBM}
 
 WARNS?=        4
 
@@ -44,4 +45,48 @@
 
 .endif
 
+#
+# Build release things.
+#
+NROFF?=                nroff
+



Home | Main Index | Thread Index | Old Index