From cc23ca6a0f5c126942ea95dc77ba5f541f168287 Mon Sep 17 00:00:00 2001 From: Jeremy Collins Date: Sat, 12 Mar 2022 12:51:58 -0500 Subject: [PATCH 1/2] Concat strings without slash --- src/mod_dims.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod_dims.c b/src/mod_dims.c index 62ed095..b267481 100755 --- a/src/mod_dims.c +++ b/src/mod_dims.c @@ -1339,7 +1339,7 @@ dims_handle_request(dims_request_rec *d) request_rec *sub_req = ap_sub_req_lookup_uri(d->image_url, d->r, NULL); if (d->config->default_image_prefix != NULL) { - d->image_url = apr_psprintf(d->r->pool, "%s/%s", d->config->default_image_prefix, d->image_url); + d->image_url = apr_pstrcat(d->r->pool, d->config->default_image_prefix, d->image_url, NULL); } else if (sub_req && sub_req->canonical_filename) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, d->r, "Looking up image locally: %s", sub_req->canonical_filename); d->filename = sub_req->canonical_filename; From f3b26bbd840f9842c6f3b9860cce5e9156f62fd5 Mon Sep 17 00:00:00 2001 From: Jeremy Collins Date: Sat, 12 Mar 2022 12:52:13 -0500 Subject: [PATCH 2/2] Use .xz extension for Imagemagick --- .devcontainer/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index e1f9ae4..32d5d55 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -48,9 +48,9 @@ RUN wget http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz && \ make -j4 && make install # Imagemagick -RUN wget https://download.imagemagick.org/ImageMagick/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.gz && \ +RUN wget https://download.imagemagick.org/ImageMagick/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz && \ export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig && \ - tar xvf ImageMagick-${IMAGEMAGICK_VERSION}.tar.gz && \ + tar xvf ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz && \ cd ImageMagick-${IMAGEMAGICK_VERSION} && \ ./configure --without-x --with-quantum-depth=8 --prefix=$PREFIX && \ make -j4 && make install