Merge branch 'openframeworks:patch-release' into patch-release

ofxyz · Apr 19, 2024 · ce16ab7 · ce16ab7
2 parents 12a1efb + f93179b
commit ce16ab7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/libs/openFrameworks/utils/ofURLFileLoader.cpp b/libs/openFrameworks/utils/ofURLFileLoader.cpp
@@ -180,7 +180,7 @@ namespace{
 ofHttpResponse ofURLFileLoaderImpl::handleRequest(const ofHttpRequest & request) {
 	curl_slist *headers = nullptr;
 	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYPEER, 0);
-	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYHOST, 0);
+	curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYHOST, 2);
 	curl_easy_setopt(curl.get(), CURLOPT_URL, request.url.c_str());
 
 	// always follow redirections

diff --git a/scripts/linux/ubuntu/install_codecs.sh b/scripts/linux/ubuntu/install_codecs.sh
@@ -9,7 +9,14 @@ if [ $(id -u) != 0 ]; then
    exit 1
 fi
 
+
+if [ "$1" == "-y" ]; then
+    FORCE_YES=-y
+else
+    FORCE_YES=""
+fi
+
 GSTREAMER_VERSION=0.10
 apt-cache show libgstreamer1.0-dev && GSTREAMER_VERSION=1.0
 
-apt-get install libmpg123-dev gstreamer${GSTREAMER_VERSION}-plugins-ugly
+apt-get install ${FORCE_YES} libmpg123-dev gstreamer${GSTREAMER_VERSION}-plugins-ugly