Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-10-31 10:37:24 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
606 Commits 32 Branches 147 Tags
Commit Graph

313 Commits

Author SHA1 Message Date
Matthew Holt
122e3a9430 rewrite: Make internal header field name a const 2015-09-28 14:54:48 -06:00
Mathias Beke
bb85a84561 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	middleware/fastcgi/fastcgi.go
 2015-09-28 22:11:05 +02:00
Matthew Holt
be6fc35326 fastcgi: Fix REQUEST_URI if rewrite directive changes URL 2015-09-27 18:48:28 -06:00
Mathias Beke
8baead6107 Merge remote-tracking branch 'upstream/master' 2015-09-25 11:54:15 +02:00
Matthew Holt
4f5a29d6d1 errors: New 'visible' mode to write stack trace to response 
Also updated change list and added/improved tests
 2015-09-24 16:21:28 -06:00
Matthew Holt
da7562367c errors: Restore http status text in test 2015-09-24 14:01:08 -06:00
Matthew Holt
6001c94f30 errors: Fix test 2015-09-24 13:46:54 -06:00
Matt Holt
104a5998cb Merge pull request #251 from abiosoft/master 
rewrite: Use middleware.Replacer
 2015-09-23 14:22:54 -06:00
Matthew Holt
6cbd3ab096 proxy: 64-bit word alignment for 32-bit systems (fixes #252) 2015-09-22 16:47:39 -06:00
Abiola Ibrahim
7f9fa5730b Rewrite: Use only fragment, remove frag. 2015-09-20 18:13:53 +01:00
Matthew Holt
bdccc51437 More consistent error messages 2015-09-20 10:55:16 -06:00
Abiola Ibrahim
0e039a1868 Rewrite: Use middleware.Replacer. 
Bug fix for regexps starting with '/'.
 2015-09-20 08:49:55 +01:00
Matthew Holt
10ab037833 Moved fileServer and browse.IndexPages into middleware package 2015-09-19 20:35:48 -06:00
Henrique Dias
8120e57850 add user defined variables into browse template 2015-09-18 08:52:12 +01:00
Matt Holt
66fb8f031b Merge pull request #248 from hacdias/master 
browse: Option to ignore indexes
 2015-09-17 19:01:12 -06:00
Matthew Holt
9e2bef146e middleware: Added StripHTML to Context type 2015-09-17 16:23:30 -06:00
Henrique Dias
30b19190dc add ignoreIndexes option to browse 2015-09-17 20:33:39 +01:00
Matthew Holt
8c843ceefd middleware: Add StripExt to Context type for stripping extensions from paths 2015-09-16 21:31:58 -06:00
Mathias Beke
aa5a595762 middleware/fastcgi: Stripping PATH_INFO from SCRIPT_NAME 2015-09-16 20:25:40 +02:00
Alexander Morozov
faaef83954 Use less strict condition to avoid problems with concurrency 
In latest go versions TestWatcher fails pretty often, because it is
"more concurrent" now. Reproducible with go master:
while go test github.com/mholt/caddy/middleware/markdown; do :; done

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-09-11 10:25:13 -07:00
Abiola Ibrahim
7545755b00 Merge pull request #240 from LK4D4/fix_map_race 
markdown: fix race in accessing map
 2015-09-11 17:00:24 +01:00
Alexander Morozov
a5128da67a markdown: fix race in accessing map 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-09-11 08:34:52 -07:00
Alexander Morozov
37eedf5cdc Fix race in test 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-09-11 08:34:08 -07:00
Alexander Morozov
da7b9a6bbc Use markdown.Config as pointer everywhere 
* As value mutex was copied and therefore synchronization worked wrong
* It's pretty big structure with reference types, so copying create unnecessary
  pressure on GC

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-09-10 15:12:50 -07:00
Karthic Rao
ed4148f20e Complete test coverage for replacer for Go 2015-09-10 10:28:13 +05:30
Matthew Holt
4e1717db4c basicauth: htpasswd path now relative to site root 2015-09-05 16:04:30 -06:00
Matt Holt
159b68aab4 Merge pull request #228 from tgulacsi/htpasswd 
basicauth: Add htpasswd support
 2015-09-05 14:56:23 -06:00
Alexander Morozov
b199825c3b Fix formatting directives in tests 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-09-04 08:34:58 -07:00
Maxime
bdcbd11d65 Merge branch 'master' of https://github.com/mholt/caddy 2015-09-02 15:16:06 +02:00
Maxime
008160998a Added LogRoller parser and entity. 
The errors and logs can now have log rolling if provided by the user.
The current customisable parameter of it are:
The maximal size of the file before rolling.
The maximal age/time of the file before rolling.
The number of backups to keep.
 2015-09-02 15:13:31 +02:00
Tamás Gulácsi
392f1d70eb Add htpasswd support for basic auth 
If the password arg starts with htpasswd=, then the rest is treated as
the file name of the htpasswd file, and used for md5 and sha1 hashes.
 2015-08-30 20:08:42 +02:00
karthic rao
e3cea042d6 Left over comments removed 
Redundant comments in the code removed
 2015-08-30 19:00:35 +05:30
Karthic Rao
679668e3c0 removed redundant comment lines 2015-08-30 18:57:20 +05:30
Karthic Rao
730269743f Json response initial test for browse.go 2015-08-29 08:04:01 +05:30
Karthic Rao
444f9e40d5 initial test for replacer 2015-08-27 23:36:32 +05:30
pyed
b9d3e7721e Fixing my comment 
the old comment might throw the source-reader off, my bad.
 2015-08-27 18:01:46 +03:00
Abdulelah Alfuntukh
414b47d653 adds json option for the browse middleware 2015-08-24 23:37:11 +03:00
Karthic Rao
4704625e3a Complete test coverage for middleware/recorder.go 2015-08-14 09:59:22 +05:30
Karthic Rao
53c4797606 Initial setup of test for recorder.go of middleware package 2015-08-11 22:02:13 +05:30
Karthic Rao
bb072faeee Initial test for middleware/middleware.go 2015-08-08 00:56:59 +05:30
Matthew Holt
b62de4c521 New template action NowDate to get the time.Time of Now() 2015-08-05 08:27:13 -06:00
Matthew Holt
2e8a74ecff markdown: Prefix log messages, and slight refactor 
Also change sha1 to md5 for the directory scans; slightly faster.
 2015-08-05 08:15:52 -06:00
Matthew Holt
e94e90b046 Add new docker link, DO link, and enhanced comment 2015-08-05 07:37:51 -06:00
Matthew Holt
7173764d6d markdown: Render lists as part of summary (upstream bug workaround) 
See github.com/russross/blackfriday/issues/189
 2015-08-05 07:37:51 -06:00
Abiola Ibrahim
3b910645e7 Markdown: generate static sites after links. 2015-08-05 09:55:04 +01:00
Abiola Ibrahim
b5d79bdccc Markdown: Removed unused constant. 2015-08-05 01:01:57 +01:00
Abiola Ibrahim
2ab466599d Markdown: Modify development mode to generate links on page requests. 2015-08-05 00:41:04 +01:00
Abiola Ibrahim
851026d3fa Markdown: Watch for file changes. Removed sitegen dependency for links. 2015-08-04 23:35:09 +01:00
Matthew Holt
8d81ae88da fastcgi: Add HTTPS env variable on HTTPS connections 2015-08-03 17:16:24 -06:00
Matthew Holt
36fa6e857b markdown: Sitegen only occurs if directory exists 
We do this by returning an error and stopping link generation (which scans the markdown path for files)
 2015-08-01 16:09:10 -06:00