Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-04-08 02:54:50 -05:00
Code Issues Activity
694 commits 27 branches 144 tags 33 MiB
Commit graph

694 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dipen Patel
fc50defe61 Merge branch 'master' of https://github.com/PatelNDipen/caddy 2015-10-31 10:14:42 -04:00
Dipen Patel
42a24a7f29 wrote startupandshutdown test cases and added value for OncePerServerBlock in the NewTestController function of controller.go 
Signed-off-by: Dipen Patel <patelndipen@gmail.com>
 2015-10-31 10:10:19 -04:00
Dipen Patel
027bf49945 Got startupshutdown test working on *nix 2015-10-28 19:48:59 -04:00
Matt Holt
94ff7dc6fb Merge pull request #287 from Makpoc/parsewincmd 
Fix windows command parsing
 2015-10-27 23:50:21 -06:00
Matthew Holt
cc229aefae templates: Parse host successfully when port is implicit (fixes #292) 2015-10-27 23:20:05 -06:00
Makpoc
d1b667fbce Two quotes next to each other result in one escaped quote; Add Split Example, add/refactor tests for every platform. 2015-10-24 15:33:04 +03:00
makpoc
0d004ccbab Attempt to fix windows command parsing + add more tests 2015-10-23 20:21:05 +03:00
Matthew Holt
fec491fb12 Removed another test that is Windows-specific 
We're not trying to test the shlex library; just our wrapper function
 2015-10-21 14:15:42 -06:00
Matthew Holt
794d271152 Remove extra tests that were Linux-specific 
These tests with the backslash seem to assert that shlex (our Unix shell parsing library) is working properly, not our wrapper function (that parses commands for both Windows and non-Windows). These tests break on Windows so I have removed them.
 2015-10-21 14:11:30 -06:00
Matthew Holt
29362e45bc Parse Windows commands differently than Unix commands 
Stinkin' backslashes
 2015-10-21 14:03:33 -06:00
Dipen Patel
1687c6f4b7 Testing startupshutdown.go after Window's modification to middleware/commands.go 2015-10-20 20:56:34 -04:00
Dipen Patel
e7a4ca25c1 Testing Windows's path separator modification of SplitCommandsAndArgs 2015-10-20 20:50:30 -04:00
Matt Holt
136119f8ac Merge pull request #282 from Makpoc/fileserver_tests 
core: fileServer tests
 2015-10-20 18:18:11 -06:00
Makpoc
e3ec7394ab fix go vet error 2015-10-21 02:18:33 +03:00
Makpoc
ddd69d19c0 Add tests for fileserver.go 2015-10-21 02:08:36 +03:00
Makpoc
8ecc366582 Check and return the correct error if Stat method fails (see golang issue #12991) 2015-10-21 01:25:38 +03:00
Matt Holt
4db54f8ddc Merge pull request #281 from mem/master 
Add TestNewDefault to config tests
 2015-10-20 10:36:59 -06:00
Marcelo Magallon
8f9f6caa4e Update config_test.go 2015-10-20 10:31:21 -06:00
Marcelo E. Magallon
7e41f6ed62 Add TestNewDefault to config tests 
Very simple test to make sure that NewDefault is populating the correct
fields with the correct values.
 2015-10-20 05:13:00 -06:00
Matt Holt
159eb68a11 Merge pull request #279 from pcasaretto/coverage-up 
Test app.SetCPU, config.makeOnces, config.makeStorages
 2015-10-19 20:55:35 -06:00
Paulo L F Casaretto
815231b1e0 Test app.SetCPU function 2015-10-20 00:33:36 -02:00
Paulo L F Casaretto
0feb0d9244 Test validDirective function 2015-10-20 00:33:19 -02:00
Paulo L F Casaretto
1db138ed55 Test makeStorages function 2015-10-19 23:23:18 -02:00
Paulo L F Casaretto
4c0d4dd780 Test makeOnces function 2015-10-19 23:19:12 -02:00
Matthew Holt
acf43857a3 Fix ServerBlockStorage so it actually stores stuff 2015-10-19 07:41:58 -06:00
Matthew Holt
e2f6c51fb0 core: Controller has field to persist server state 
Also added ServerBlockHostIndex
 2015-10-19 07:41:58 -06:00
Matthew Holt
c4a7378466 core: Disable TLS for sites where http is explicitly defined (fix) 2015-10-19 07:41:58 -06:00
Matthew Holt
a17e9b6b02 Add ServerBlockIndex and ServerBlockHosts to Controller 
This way, Setup functions have access to the list of hosts that share the server block, and also, if needed for some reason, the index of the server block in the input
 2015-10-19 07:41:58 -06:00
Matthew Holt
f978967e5e OncePerServerBlock may now return an error 2015-10-19 07:41:58 -06:00
Matthew Holt
fc413e2403 First use of OncePerServerBlock in a Setup function 
startup and shutdown commands should only be executed once per appearance in the Caddyfile (naturally meaning once per server block).

Notice that we support multiple occurrences of startup and shutdown in the same server block by building the callback array incrementally as we parse the Caddyfile, then we append all the callbacks all at once. Quite literally, the OncePerServerBlock function executes only once per server block!
 2015-10-19 07:41:58 -06:00
Matthew Holt
38719765bf Don't share sync.Once with all directives 
If each server block had only one sync.Once then all directives would refer to it and only the first directive would be able to use it! So this commit changes it to a map of sync.Once instances, keyed by directive. So by creating a new map for every server block, each directive in that block can get its own sync.Once which is exactly what is needed. They won't step on each other this way.
 2015-10-19 07:41:58 -06:00
Matthew Holt
f3596f734d Epic revert of 0ac8bf5 and adding OncePerServerBlock 
Turns out having each server block share a single server.Config during initialization when the Setup functions are being called was a bad idea. Sure, startup and shutdown functions were only executed once, but they had no idea what their hostname or port was. So here we revert to the old way of doing things where Setup may be called multiple times per server block (once per host associated with the block, to be precise), but the Setup functions now know their host and port since the config belongs to exactly one virtualHost. To have something happen just once per server block, use OncePerServerBlock, a new function available on each Controller.
 2015-10-19 07:41:58 -06:00
Matt Holt
1d15fe069a Merge pull request #278 from Makpoc/context_tests 
Cover the rest of the (not one-liner) functions in context
 2015-10-19 07:08:34 -06:00
makpoc
72a5579d83 Cover the rest of the (not one-liner) functions in context 2015-10-19 13:51:49 +03:00
Dipen Patel
8c10b36395 testing parsing of windows paths 2015-10-18 21:58:19 -04:00
Dipen Patel
2c9f86e31d test windows 2015-10-18 21:45:15 -04:00
Dipen Patel
22ce04c26e path separator test 2015-10-18 21:32:29 -04:00
Dipen Patel
ead24e162f Still testing on windows 2015-10-18 21:13:09 -04:00
Dipen Patel
cd7bc846d8 Testing with windows 2015-10-18 21:10:45 -04:00
Dipen Patel
c26772c5b1 Testing windows path 2015-10-18 21:08:03 -04:00
Dipen Patel
a4180f723a Fixed compile time errors 2015-10-18 16:38:06 -04:00
Dipen Patel
04a2adf4cf Logging tempDir on windows 2015-10-18 16:34:25 -04:00
Dipen Patel
b8debc5763 Testing unique tempDir name on Windows 2015-10-18 16:25:08 -04:00
Dipen Patel
e458c2edbb modified test to create directory for testing in the OS's temp directory 2015-10-18 14:14:45 -04:00
Dipen Patel
718d8fd041 Added test for config/setup/startupshutdown 2015-10-17 21:00:39 -04:00
Matt Holt
3614a093e3 Merge pull request #275 from mem/master 
Add tests for websocket configuration
 2015-10-17 13:14:43 -06:00
Marcelo E. Magallon
6325bcf5b2 Add tests for websocket configuration 
Command arguments:

	websocket /api5 "cmd arg1 arg2 arg3"

Optional block:

	websocket /api6 cat {
		respawn
	}

Invalid option in optional block:

	websocket /api7 cat {
		invalid
	}
 2015-10-17 12:09:55 -06:00
Matt Holt
3faffdce2d Merge pull request #274 from Makpoc/context_tests 
Add context.go tests
 2015-10-15 15:29:23 -06:00
Makpoc
d6242e9cac Apply review comments - change the used domain, remove obsolete function, remove commented tests 2015-10-15 23:09:02 +03:00
makpoc
bd4d9c6fe2 add tests for context.Header,IP,URL,Host,Port,Method,PathMatches 2015-10-15 19:46:23 +03:00