Skip to content

Chages to include gcs in mod_http_cache #917

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

Open
ovadbar wants to merge 9 commits into
base: master
Choose a base branch
from
+642 −7
Open

Chages to include gcs in mod_http_cache #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
34f8055
Changes To allow GCS in mod_http_cache
ovadbar Aug 9, 2021
d21aaf6
STILL FAIL
ovadbar Aug 15, 2021
9dcffd7
More efficient but still not fix issue
ovadbar Dec 5, 2021
ed5461c
Test hack to get file size right
ovadbar Jun 5, 2022
13fa10c
Merge branch 'gcs' of github.com:ovadbar/freeswitch into gcs
ovadbar Jun 5, 2022
59bf0e6
Pass all tests?
ovadbar Jun 6, 2022
9b06796
Free headers
ovadbar Jun 6, 2022
33eb8dc
Merge branch 'master' into gcs
ovadbar Jun 23, 2022
5628938
Merge branch 'master' into gcs
ovadbar Dec 26, 2022
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
10 changes: 7 additions & 3 deletions src/mod/applications/mod_http_cache/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_http_cache

noinst_LTLIBRARIES = libhttpcachemod.la
libhttpcachemod_la_SOURCES = mod_http_cache.c common.c aws.c azure.c
libhttpcachemod_la_SOURCES = mod_http_cache.c common.c aws.c azure.c gcs.c

mod_LTLIBRARIES = mod_http_cache.la
mod_http_cache_la_SOURCES =
Expand All @@ -11,12 +11,16 @@ mod_http_cache_la_CPPFLAGS = $(CURL_CFLAGS) $(AM_CPPFLAGS)
mod_http_cache_la_LIBADD = $(switch_builddir)/libfreeswitch.la libhttpcachemod.la
mod_http_cache_la_LDFLAGS = $(CURL_LIBS) -avoid-version -module -no-undefined -shared

noinst_PROGRAMS = test/test_aws
noinst_PROGRAMS = test/test_aws test/test_gcs

test_test_aws_SOURCES = test/test_aws.c
test_test_aws_CFLAGS = $(AM_CFLAGS) -I. -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\"
test_test_aws_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS)
test_test_aws_LDADD = libhttpcachemod.la

TESTS = $(noinst_PROGRAMS)
test_test_gcs_SOURCES = test/test_gcs.c
test_test_gcs_CFLAGS = $(AM_CFLAGS) -I. -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\"
test_test_gcs_LDFLAGS = $(AM_LDFLAGS) -avoid-version -no-undefined $(freeswitch_LDFLAGS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS) -lcurl
test_test_gcs_LDADD = libhttpcachemod.la

TESTS = $(noinst_PROGRAMS)
5 changes: 4 additions & 1 deletion src/mod/applications/mod_http_cache/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,11 @@ struct http_profile {
char *aws_s3_access_key_id;
char *secret_access_key;
char *base_domain;
char *region; // AWS region. Used by AWS S3
char *region; // AWS region. Used by AWS S3 // Used by gcs as token uri
char *gcs_email; // GCS service account email
char *gcs_credentials; // GCS credencial token
switch_time_t expires; // Expiration time in seconds for URL signature. Default is 604800 seconds. Used by AWS S3
// GCS Expiration used for when the gcs_credentials expires
switch_size_t bytes_per_block;
int header_count;
char** header_names;
Expand Down
Loading