Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support brotli content encoding #164

Merged
merged 2 commits into from
Feb 11, 2021
Merged

Support brotli content encoding #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3bd98c
Support brotli content encoding
bptato Feb 10, 2021
767f2d6
Update config.h.dist
bptato Feb 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config.h.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,13 @@ typedef void MySignalHandler;
#define DEV_TTY_PATH "/dev/tty"
#define CGI_EXTENSION ".cgi"
#endif
#define BROTLI_CMDNAME "brotli"

#define PATH_SEPARATOR ':'
#define GUNZIP_NAME "gunzip"
#define BUNZIP2_NAME "bunzip2"
#define INFLATE_NAME "inflate"
#define BROTLI_NAME "brotli"

#endif /* makefile_parameter */
#endif /* _CONFIGURED_ */
Expand Down
2 changes: 2 additions & 0 deletions config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,11 +241,13 @@ typedef RETSIGTYPE MySignalHandler;
#define DEV_TTY_PATH "/dev/tty"
#define CGI_EXTENSION ".cgi"
#endif
#define BROTLI_CMDNAME "brotli"

#define PATH_SEPARATOR ':'
#define GUNZIP_NAME "gunzip"
#define BUNZIP2_NAME "bunzip2"
#define INFLATE_NAME "inflate"
#define BROTLI_NAME "brotli"

#ifdef __MINGW32_VERSION
#define SIGKILL SIGTERM
Expand Down
21 changes: 15 additions & 6 deletions file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,20 +161,24 @@ static struct compression_decoder {
char *name;
char *encoding;
char *encodings[4];
int use_d_arg;
} compression_decoders[] = {
{ CMP_COMPRESS, ".gz", "application/x-gzip",
0, GUNZIP_CMDNAME, GUNZIP_NAME, "gzip",
{"gzip", "x-gzip", NULL} },
{"gzip", "x-gzip", NULL}, 0 },
{ CMP_COMPRESS, ".Z", "application/x-compress",
0, GUNZIP_CMDNAME, GUNZIP_NAME, "compress",
{"compress", "x-compress", NULL} },
{"compress", "x-compress", NULL}, 0 },
{ CMP_BZIP2, ".bz2", "application/x-bzip",
0, BUNZIP2_CMDNAME, BUNZIP2_NAME, "bzip, bzip2",
{"x-bzip", "bzip", "bzip2", NULL} },
{"x-bzip", "bzip", "bzip2", NULL}, 0 },
{ CMP_DEFLATE, ".deflate", "application/x-deflate",
1, INFLATE_CMDNAME, INFLATE_NAME, "deflate",
{"deflate", "x-deflate", NULL} },
{ CMP_NOCOMPRESS, NULL, NULL, 0, NULL, NULL, NULL, {NULL}},
{"deflate", "x-deflate", NULL}, 0 },
{ CMP_BROTLI, ".br", "application/x-br",
0, BROTLI_CMDNAME, BROTLI_NAME, "br",
{"br", "x-br", NULL}, 1 },
{ CMP_NOCOMPRESS, NULL, NULL, 0, NULL, NULL, NULL, {NULL}, 0},
};
/* *INDENT-ON* */

Expand Down Expand Up @@ -8642,6 +8646,7 @@ uncompress_stream(URLFile *uf, char **src)
char *tmpf = NULL;
char *ext = NULL;
struct compression_decoder *d;
int use_d_arg = 0;

if (IStype(uf->stream) != IST_ENCODED) {
uf->stream = newEncodedStream(uf->stream, uf->encoding);
Expand All @@ -8655,6 +8660,7 @@ uncompress_stream(URLFile *uf, char **src)
expand_cmd = d->cmd;
expand_name = d->name;
ext = d->ext;
use_d_arg = d->use_d_arg;
break;
}
}
Expand Down Expand Up @@ -8709,7 +8715,10 @@ uncompress_stream(URLFile *uf, char **src)
/* child1 */
dup2(1, 2); /* stderr>&stdout */
setup_child(TRUE, -1, -1);
execlp(expand_cmd, expand_name, NULL);
if (use_d_arg)
execlp(expand_cmd, expand_name, "-d", NULL);
else
execlp(expand_cmd, expand_name, NULL);
exit(1);
}
if (tmpf) {
Expand Down
1 change: 1 addition & 0 deletions html.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ typedef struct {
#define CMP_GZIP 2
#define CMP_BZIP2 3
#define CMP_DEFLATE 4
#define CMP_BROTLI 5

#define ENC_7BIT 0
#define ENC_BASE64 1
Expand Down