summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/php/cli-php8.1/php.ini9
-rw-r--r--root/.profile4
2 files changed, 10 insertions, 3 deletions
diff --git a/etc/php/cli-php8.1/php.ini b/etc/php/cli-php8.1/php.ini
index 04e1c0d..33a1da5 100644
--- a/etc/php/cli-php8.1/php.ini
+++ b/etc/php/cli-php8.1/php.ini
@@ -427,7 +427,7 @@ max_input_time = 60
; Maximum amount of memory a script may consume
; https://php.net/memory-limit
-memory_limit = 256M
+memory_limit = 128M
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Error handling and logging ;
@@ -915,6 +915,12 @@ default_socket_timeout = 60
; Be sure to appropriately set the extension_dir directive.
;
;extension=bz2
+
+; The ldap extension must be before curl if OpenSSL 1.0.2 and OpenLDAP is used
+; otherwise it results in segfault when unloading after using SASL.
+; See https://github.com/php/php-src/issues/8620 for more info.
+;extension=ldap
+
;extension=curl
;extension=ffi
;extension=ftp
@@ -924,7 +930,6 @@ default_socket_timeout = 60
;extension=gmp
;extension=intl
;extension=imap
-;extension=ldap
;extension=mbstring
;extension=exif ; Must be after mbstring as it depends on it
;extension=mysqli
diff --git a/root/.profile b/root/.profile
index 590eeee..de001c8 100644
--- a/root/.profile
+++ b/root/.profile
@@ -5,7 +5,9 @@ HISTFILESIZE=1000000000
shopt -s checkwinsize
function upload () {
chmod 0644 "$1"
- sftp -b- upload@upload <<< "put '$1' www/`[ '$2'x = x ] && echo $1 || echo $2`"
+ d=`[ '$2'x = x ] && echo $1 || echo $2`
+ sftp -b- upload@upload <<< "put '$1' www/$d"
+ echo https://upload.sijanec.eu./$d | xclip
}
function mcd () {
mkdir -p $@ && cd $@