github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-11 12:47:57 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
1,278 Commits 31 Branches 138 Tags 34 MiB
881da313dd
Commit Graph

1278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Holt
9dfb940d80 Merge pull request #245 from LK4D4/update_go 
Use latest Go minor versions for testing
 2015-09-14 11:49:59 -06:00
Alexander Morozov
1dbfeb7ecd Use latest minors Go for testing 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-09-14 10:43:46 -07:00
Matt Holt
f4054b6954 Merge pull request #241 from LK4D4/fix_race_test 
markdown: Use less strict condition to avoid problems with concurrency
 2015-09-11 15:58:13 -06: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
Matt Holt
287543a0e6 Merge pull request #238 from LK4D4/fix_vet 
Fix all vet warnings and add vet check to CI
 2015-09-11 10:21:22 -06: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
Abiola Ibrahim
26dc212f4c Merge pull request #239 from LK4D4/race_test 
Fix race in test
 2015-09-11 16:58:19 +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
f2e680430a Add vet check to CI 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-09-10 20:53:09 -07:00
Alexander Morozov
740a6a7ad5 Use func from stdlib to clone *tls.Config for calming vet 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-09-10 20:52:49 -07:00
Alexander Morozov
1236e492a9 Fix format verbs for funcs 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-09-10 19:59:19 -07:00
Alexander Morozov
80db177f5a Fix vet warnings about unkeyed fields 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-09-10 19:57:23 -07:00
Alexander Morozov
3d1cac313c Use %v instead of %p to calm vet 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-09-10 19:52:23 -07:00
Matt Holt
dc4a5ae1fd Merge pull request #237 from LK4D4/fix_lock 
markdown: Use markdown.Config as pointer everywhere
 2015-09-10 18:23:26 -06: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
Matt Holt
55de037035 Merge pull request #236 from LK4D4/fix_format_in_test 
basicauth: Fix format call in tests
 2015-09-10 15:16:13 -06:00
Alexander Morozov
c468b114e4 Fix format call in tests 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-09-10 14:04:33 -07:00
Matt Holt
d96bd5269a Merge pull request #235 from Karthic-Hackintosh/master 
middleware: Complete test coverage for replacer
 2015-09-10 08:27:23 -06:00
Karthic Rao
ed4148f20e Complete test coverage for replacer for Go 2015-09-10 10:28:13 +05:30
Matt Holt
f8e2cc8008 Merge pull request #234 from humboldtux/browse 
core: Configuration as command line arg #222
 2015-09-08 14:44:28 -06:00
Benoit Benedetti
5d32af8a6b Fix typo in loadConfigs comment 2015-09-08 22:38:30 +02:00
Benoit Benedetti
ed10863494 Configuration as command line arg #222 2015-09-08 22:27:05 +02:00
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
Matt Holt
d76cf6d337 Merge pull request #230 from evermax/master 
log, errors: Use localtime for the log roller timestamp
 2015-09-04 11:27:23 -06:00
Maxime
69950e57f0 Use localtime for the log roller timestamp 2015-09-04 19:18:01 +02:00
Matt Holt
d44ab3dbab Merge pull request #229 from LK4D4/fix_format 
Fix formatting directives in tests
 2015-09-04 10:07:30 -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
Matthew Holt
94becb89f6 Add Go 1.5 to the Travis CI manifest 2015-09-02 18:28:03 -06:00
Matt Holt
1f4231e1f0 Merge pull request #216 from evermax/master 
log, errors: Added lumberjack library for log rolling
 2015-09-02 17:44:10 -06: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
Matt Holt
1cafb1eea5 Merge pull request #226 from Karthic-Hackintosh/master 
browse: Initial test for json response in browse.go
 2015-08-31 21:34:54 -06: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
Matthew Holt
d79d2611ca Mention setcap in readme so it's more prominent 2015-08-30 10:55:30 -06: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
Matt Holt
bfc61824b9 Merge pull request #225 from Karthic-Hackintosh/master 
middleware: Initial test for replacer
 2015-08-27 15:01:45 -06:00
Karthic Rao
444f9e40d5 initial test for replacer 2015-08-27 23:36:32 +05:30
Matt Holt
c5006321a7 Merge pull request #224 from pyed/patch-2 
Fixing comment
 2015-08-27 10:13:38 -06:00
pyed
b9d3e7721e Fixing my comment 
the old comment might throw the source-reader off, my bad.
 2015-08-27 18:01:46 +03:00
Matt Holt
49a229835a Merge pull request #220 from pyed/json 
browse: Optional JSON output
 2015-08-27 08:48:44 -06:00
Abdulelah Alfuntukh
414b47d653 adds json option for the browse middleware 2015-08-24 23:37:11 +03:00
Abiola Ibrahim
b62d087bb6 Merge pull request #218 from Karthic-Hackintosh/master 
Complete test coverage for recorder.go of middleware package
 2015-08-14 07:23:27 +01: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
Matthew Holt
60b6c0c03d Add link to joshix/caddy in readme 2015-08-10 16:33:36 -06:00
Matt Holt
5f3ef9c0da Merge pull request #215 from Karthic-Hackintosh/master 
Initial test for middleware/middleware.go
 2015-08-10 07:26:56 -06:00