Commit Graph

28 Commits (059a5a67ddff848385773162f90d6477b450d391)

Author SHA1 Message Date
Stefan Bühler 05858f6cf2 [ssl] Fix $HTTP["scheme"] conditional, could be "http" for ssl connections if the ssl $SERVER["socket"] conditional was nested (fixes #2501)
con->conf.is_ssl got removed and replaced by:
 * con->conf.ssl_enabled for the config var "ssl.engine" - it is only
   used to determine which server-sockets should use ssl. (usually not
   needed as it is mandatory and enough to set ssl.pemfile anyway)
 * con->srv_socket->is_ssl to detect the actual ssl status of the
   bound socket, which is the same as the ssl status of the connection
 * con->uri.scheme for the actual $HTTP["scheme"] value, also used for
   the CGI "HTTPS=ON" variable. This defaults to "https" if the
   connection uses ssl, but can be changed for example by mod_extforward
   if X-Forwarded-Proto: is set to either "http" or "https" (other values
   are ignored right now)

Also removed the broken srv_socket->is_proxy_ssl as it was a connection
value in a server_socket struct...

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2887 152afb58-edef-0310-8abb-c4023f1b3aa9
10 years ago
Stefan Bühler 543bd249fb fix handling of If-Modified-Since if If-None-Match is present (don't return 412 for date parsing errors); follow current draft for HTTP/1.1, which tells us to ignore If-Modified-Since if we have matching etags.
See:
 http://tools.ietf.org/html/draft-ietf-httpbis-p4-conditional-21#section-5
 > it makes sense to ignore the If-Modified-Since when entity tags are
 > understood and available for the selected representation.

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2865 152afb58-edef-0310-8abb-c4023f1b3aa9
11 years ago
Stefan Bühler 67cb38d0ca always define _GNU_SOURCE
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2643 152afb58-edef-0310-8abb-c4023f1b3aa9
14 years ago
Stefan Bühler 56adf372fb Revert to _GNU_SOURCE before <time.h> for strptime
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2628 152afb58-edef-0310-8abb-c4023f1b3aa9
14 years ago
Stefan Bühler 844d2e9ef5 Add _XOPEN_SOURCE for strptime
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2627 152afb58-edef-0310-8abb-c4023f1b3aa9
14 years ago
Stefan Bühler 22e8b456a9 Fix header inclusion order, always include "config.h" before any system header
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2624 152afb58-edef-0310-8abb-c4023f1b3aa9
14 years ago
Elan Ruusamäe 6c75b7bf24 - Combine Cache-Control header value in mod_expire to existing HTTP header if header already added by other modules (fixes #2068)
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2621 152afb58-edef-0310-8abb-c4023f1b3aa9
14 years ago
Stefan Bühler 0413cf0ecf Set tm.tm_isdst = 0 before mktime() (fixes #2047)
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2608 152afb58-edef-0310-8abb-c4023f1b3aa9
14 years ago
Stefan Bühler 8629831df2 Remove strptime failed message (fixes #2031)
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2593 152afb58-edef-0310-8abb-c4023f1b3aa9
14 years ago
Stefan Bühler a6218765c2 Fix some problems with more strict compilers (#1923)
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2408 152afb58-edef-0310-8abb-c4023f1b3aa9
14 years ago
Stefan Bühler 3d20850451 Fix uninitialized value in time struct after strptime
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2366 152afb58-edef-0310-8abb-c4023f1b3aa9
15 years ago
Stefan Bühler ad12e4c5b2 Insert many con->mode checks; they should prevent two modules to handle the same request if they shouldn't (#631)
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2271 152afb58-edef-0310-8abb-c4023f1b3aa9
15 years ago
Stefan Bühler 52861d77df Replace buffer_{append,copy}_string with the _len variant where possible (#1732, thx crypt)
Replace BUFFER_{APPEND,COPY}_STRING_CONST with _len(b, CONST_STRL_LEN(x))


git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2250 152afb58-edef-0310-8abb-c4023f1b3aa9
15 years ago
Jan Kneschke 1920bd2739 fixed invalid "304 Not Modified" on broken timestamps
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@1926 152afb58-edef-0310-8abb-c4023f1b3aa9
16 years ago
Jan Kneschke f1f11ba6ad fixed crashed if gethostbyaddr() fails on redirect
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@1718 152afb58-edef-0310-8abb-c4023f1b3aa9
16 years ago
Marcus Rückert 8cd1471cb3 - white space cleanup part 2 this time 1.4 ;)
i hope it helps with merging stuff back to 1.5

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@1371 152afb58-edef-0310-8abb-c4023f1b3aa9
17 years ago
Jan Kneschke a85ca5e0ef merged [1051], [1052], [1053], [1054], [1057], [1060], [1061], [1062]
added ssl.use-sslv2 and ssl.cipher-list


git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.11-ssl-fixes@1279 152afb58-edef-0310-8abb-c4023f1b3aa9
17 years ago
Jan Kneschke 2c5ea3f303 301 has a content now, so we need a file_finished to say that we have not content
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@989 152afb58-edef-0310-8abb-c4023f1b3aa9
18 years ago
Jan Kneschke 0ea0486d2f fixed the DEBUG: warning for the Last-Modified header check
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@841 152afb58-edef-0310-8abb-c4023f1b3aa9
18 years ago
Jan Kneschke b71b54fc5b added better debug
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@828 152afb58-edef-0310-8abb-c4023f1b3aa9
18 years ago
Xuefer 58e4c26d94 remove warning for strptime
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@769 152afb58-edef-0310-8abb-c4023f1b3aa9
18 years ago
Jan Kneschke dccb266a39 improved error-msg and fixed invalid read from uninit memory
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@727 152afb58-edef-0310-8abb-c4023f1b3aa9
18 years ago
Jan Kneschke 286b6100a4 moved the etag.h to the right file
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@677 152afb58-edef-0310-8abb-c4023f1b3aa9
18 years ago
Jan Kneschke d956619380 make MacOS X happy when it domes to mod_cml and lua
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@676 152afb58-edef-0310-8abb-c4023f1b3aa9
18 years ago
Jan Kneschke 172340e22f let mod_compress prepare etag, last-modified and content-type
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@569 152afb58-edef-0310-8abb-c4023f1b3aa9
18 years ago
Jan Kneschke cd4c324ff2 allow numbers in header-keys
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@523 152afb58-edef-0310-8abb-c4023f1b3aa9
18 years ago
Jan Kneschke 8b248ce3a5 moved SA_LEN macro to http-header-glue.c
git-svn-id: svn://svn.lighttpd.net/lighttpd/trunk@50 152afb58-edef-0310-8abb-c4023f1b3aa9
19 years ago
Jan Kneschke d26f6893d9 moved external functions to *-glue.c
this simplifies the linkage on windows and macosx
which can't reference the binary for symbols


git-svn-id: svn://svn.lighttpd.net/lighttpd/trunk@49 152afb58-edef-0310-8abb-c4023f1b3aa9
19 years ago