accept "default" keyword in extension directive #1414
Conversation
kazuho
left a comment
There was a problem hiding this comment.
Thank you for the PR. It looks mostly fine.
I have left in-line comments. Please let me know what you think.
| if (strcmp(node->data.scalar, "default") == 0) { | ||
| return node->data.scalar; | ||
| } else if (assert_is_extension(cmd, node) == 0) { | ||
| return node->data.scalar + 1; |
There was a problem hiding this comment.
The function seems to either return "default" or return the extension stripping the preceding dot.
Does the fact mean that we can no longer register .default as an extension?
t/50file-file.t
Outdated
| my ($proto, $port, $cmd) = @_; | ||
| my $resp = `$cmd --silent $proto://127.0.0.1:$port/robots.txt?name=Tobor`; | ||
| is $resp, "Hello Tobor"; | ||
| }); |
There was a problem hiding this comment.
The test tests if the custom handler works well with file.file.
Could we also have a test case that maps all files under a directory to CGI? To rephrase, I would appreciate it if we could have a test case covering the use-case of SetHandler cgi-script in Apache.
<Directory "/home/*/public_html/cgi-bin">
Options ExecCGI
SetHandler cgi-script
</Directory>
lib/core/configurator.c
Outdated
| h2o_configurator_errprintf(cmd, node, "given extension \"%s\" does not start with a \".\"", node->data.scalar); | ||
| return -1; | ||
| } | ||
| if (strlen(node->data.scalar) == 1) { |
There was a problem hiding this comment.
This is definitely a nitpick, but how about changing to node->data.scalar[1] == '\0'?
lib/core/configurator.c
Outdated
| return 0; | ||
| } | ||
|
|
||
| static const char *get_ext(h2o_configurator_command_t *cmd, yoml_t *node) |
There was a problem hiding this comment.
How about changing the name of the function to normalize_ext or something?
| my $server = spawn_h2o(<< "EOT"); | ||
| file.custom-handler: | ||
| extension: ["default", ".cgi"] | ||
| fastcgi.spawn: "exec \$H2O_ROOT/share/h2o/fastcgi-cgi" |
There was a problem hiding this comment.
Could we use possibly do file.mime.settypes: {} as well to reset the existing mime-type here, and see that a file with .html extension gets treated as a CGI?
e6b4076 to
e84b551
Compare
3653f6f to
b0b7701
Compare
|
Thank you for the changes. |
Related to #1371, this PR allows h2o to assign custom handler to the files with no extension.
As an example: