github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-26 02:09:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
1,246 Commits 30 Branches 138 Tags 33 MiB
04089c533b
Commit Graph

1246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Holt
b79ff7403f Merge pull request #664 from jupiter/max-connections 
proxy: Add max_conns parameter for per-host maximum connections
 2016-03-14 15:25:44 -06:00
Matt Holt
7560778602 Merge pull request #673 from ERIIX/master 
Play nice when ACME used manually.
 2016-03-13 14:50:33 -06:00
Matt Holt
fc10951dde Merge pull request #676 from abiosoft/list-directives 
Add flag to list directives.
 2016-03-13 14:49:10 -06:00
Matt Holt
3e48e6a535 Merge pull request #657 from dprandzioch/feature/freebsd-service-script 
Folder for init scripts within dist / FreeBSD service script
 2016-03-13 14:46:06 -06:00
Abiola Ibrahim
44fc9b18a6 Print the directives in order of priority. 2016-03-13 18:29:26 +01:00
Abiola Ibrahim
3b6c387b84 Add flag to list directives. 2016-03-13 12:59:35 +01:00
Matthew Holt
35e4c1a7bf Sanity checkL this defer does not leak fds; comment added 2016-03-12 16:32:12 -07:00
Abiola Ibrahim
25bfdfe92c Merge pull request #672 from abiosoft/master 
Hide only the currently used Caddyfile
 2016-03-12 20:46:20 +01:00
Abiola Ibrahim
008ad398ce Hopefully, this is the final nail on the coffin. 2016-03-12 17:47:53 +01:00
Eric R. Monson
52d7379063 Play nice when ACME used manually. 
Minor change to server/server.go such that /.well-known/acme-challenge
can be passed through when TLS.Manual is true on the vhost the request
came in through.
 2016-03-11 22:37:54 -08:00
Abiola Ibrahim
e92a911e7d Add more tests. 2016-03-11 23:44:50 +01:00
Abiola Ibrahim
84845a66ab Fix broken build. 2016-03-11 23:11:21 +01:00
Matt Holt
e2f6ab3472 Merge pull request #671 from shawnps/patch-1 
capitalize struct name in comment (go lint)
 2016-03-11 08:21:56 -07:00
Abiola Ibrahim
f3a183ecc1 Use filepath.Clean for fileserver. 2016-03-11 15:39:13 +01:00
Shawn Smith
e958686ae4 capitalize struct name in comment 2016-03-11 23:16:28 +09:00
Pieter Raubenheimer
1f7d8d8ab0 Add test for UpstreamHost defaults 2016-03-10 14:45:23 +00:00
Pieter Raubenheimer
a7766c9033 Add common method for checking host availability 2016-03-10 14:42:19 +00:00
Pieter Raubenheimer
ce8ee831b3 Add check for per-host maximum connections 2016-03-08 16:25:05 +00:00
Matthew Holt
741d7685f1 Merge branch 'master' into fastcgi-methods 
# Conflicts:
#	middleware/fastcgi/fastcgi.go
 2016-03-07 16:25:23 -07:00
Matthew Holt
88e3a26c99 Full changes to contributing doc 
That was weird, only half of the file got committed...
 2016-03-07 12:10:26 -07:00
Matthew Holt
f52b1e80f5 Update contributing doc and add issue template 2016-03-07 12:07:39 -07:00
David Prandzioch
202679efde Renamed apache24 occurance to caddy :-) 2016-03-06 10:49:29 +01:00
David Prandzioch
75915e0a25 Added a directory dist/init/ that may provide service scripts for various distributions in the future, added a experimental FreeBSD service script 2016-03-06 10:44:07 +01:00
Matt Holt
9e386fc921 Merge pull request #652 from elcore/patch-2 
https: Support ECC keys
 2016-03-03 08:19:20 -07:00
elcore
9099375b11 Support ECC certificates 2016-03-03 00:52:07 +00:00
Matthew Holt
36b440c04b https: Refuse start only if renewal fails on expired cert (closes #642) 2016-03-02 11:34:39 -07:00
Matthew Holt
2a46f2a14e Revert recent Content-Length-related changes and fix fastcgi return 
fastcgi's ServeHTTP method originally returned the correct value (0) in
b51e8bc191. Later, I mistakenly suggested
we change that to return the status code because I forgot that status
codes aren't logged by the return value. So fastcgi broke due in
3966936bd6 due to my error.

We later had to try to make up for this with ugly Content-Length checks
like in c37ad7f677. Turns out that all we
had to do was fix the returned status here back to 0. The proxy
middleware behaves the same way, and returning 0 is correct. We should
only return a status code if the response has not been written, but with
upstream servers, we do write a response; they do not know about our
error handler.

Also clarifed this in the middleware.Handler documentation.
 2016-03-02 11:33:40 -07:00
Matthew Holt
741880a38b Only obtain certificate and enable TLS if host qualifies (fixes #638) 2016-03-01 12:27:46 -07:00
Matt Holt
43c339c7e3 Merge pull request #641 from hkjn/fix-build-acme-crypt 
https: Fix build after https://github.com/xenolf/lego/commit/0e26b
 2016-02-27 10:21:44 -07:00
Henrik Jonsson
49c2807ba1 Fix build after https://github.com/xenolf/lego/commit/0e26b 
Fix up last-second changes

Fixes #640
 2016-02-27 18:06:56 +01:00
Matthew Holt
da08c94a8c Implant version information with -ldflags with help of build script 
Without -ldflags, the verison information needs to be updated manually,
which is never done between releases, so development builds appear
indiscernable from stable builds using `caddy -version`.

This is part of a set of changes intended to relieve the burden of
always updating version information manually and distributing binaries
that look stable but actually may not be.

A stable build is defined as one which is produced at a git tag with
a clean working directory (no uncommitted changes). A dev build is
anything else. With this build script, `caddy -version` will now reveal
whether it is a development build and, if so, the base version, the
latest commit, the date and time of build, and the names of files with
changes as well as how many changes were made.

The output of `caddy -version` for stable builds remains the same.
 2016-02-26 00:26:31 -07:00
Matthew Holt
c827a71d5d Version 0.8.2 2016-02-25 10:26:42 -07:00
Matthew Holt
2ecc837020 templates: .Truncate can truncate from end of string if length is negative 2016-02-24 20:32:26 -07:00
Matthew Holt
c37ad7f677 Only write error message/page if body not already written (fixes #567) 
Based on work started in, and replaces, #614
 2016-02-24 19:50:46 -07:00
Matthew Holt
737c7c4372 fastcgi: Only perform extra copy if necessary; added tests 2016-02-24 16:42:01 -07:00
Matt Holt
367397dbd6 Merge pull request #623 from xlab/f/docflags 
markdown: Implement .DocFlags and tests
 2016-02-24 14:45:22 -07:00
Matt Holt
a2dbfdc10e Merge pull request #636 from humboldtux/fastcgi-cl 
fastcgi: Explicitly set Content-Length (fixes #626)
 2016-02-24 14:39:15 -07:00
Benoit Benedetti
ef5f9c771d FastCGI: Explicitly set Content-Length #626 2016-02-24 22:11:07 +01:00
Matthew Holt
05957b4965 gzip: Implement http.Hijacker (fixes #635) 2016-02-24 12:23:50 -07:00
Matt Holt
72fcdec8d8 Merge pull request #627 from ax-nathan/master 
rewrite: Allow status to be 2xx or 4xx.
 2016-02-24 11:01:54 -07:00
Nathan Probst
f4bb43781c Remove unneeded Regexp from tests. 2016-02-24 10:28:06 -07:00
Matt Holt
197297b0d7 Merge pull request #628 from elcore/master 
tls: Add SHA384 ciphers
 2016-02-23 15:14:24 -07:00
elcore
a541eb7899 Adding new cipher suites 2016-02-23 21:23:13 +00:00
Nathan Probst
2ea6c95ac4 Allow rewrite status codes to be 2xx and 4xx. 2016-02-22 15:30:55 -07:00
Maxim Kupriianov
c7674e2060 Implement .DocFlags directive and tests. It holds all the boolean-typed front matter values. 2016-02-22 13:53:47 +03:00
Matt Holt
c12847e5ba Merge pull request #620 from humboldtux/recorder 
middleware: Export ResponseRecorder and add a couple getter methods
 2016-02-20 15:17:45 -07:00
Benoit Benedetti
bec130a563 Recorder: Exporting ResponseRecorder #614 2016-02-20 23:10:04 +01:00
Matthew Holt
09b7ce6c93 Try to get Go 1.6 on appveyor 2016-02-19 18:07:48 -07:00
Matt Holt
b860be01bb Merge pull request #615 from 1lann/master 
errors: Set missing Content-Type for plaintext error messages
 2016-02-19 14:52:43 -07:00
Matthew Holt
f7b5187bf3 server: Add "Referer" to log entry when host not found 2016-02-19 13:34:54 -07:00