diff --git a/.github/workflows/check-crlf.yml b/.github/workflows/check-crlf.yml
new file mode 100644
index 0000000..4ab83e3
--- /dev/null
+++ b/.github/workflows/check-crlf.yml
@@ -0,0 +1,20 @@
+# check for Windows CRLF in files
+# homepage: https://github.com/marketplace/actions/check-crlf
+
+name: Check CRLF
+
+on: [push, pull_request]
+
+jobs:
+  Check-CRLF:
+    name: verify that only LF linefeeds are used
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository contents
+        uses: actions/checkout@v4
+
+      - name: Use action to check for CRLF endings
+        uses: erclu/check-crlf@v1.2.0
+        with: # ignore directories containing *.csv & data
+          exclude: /demo/ /ms4w/ /test/ Makefile.vc 
\ No newline at end of file
diff --git a/.github/workflows/linux.sh b/.github/workflows/linux.sh
index 90e2887..642f38d 100755
--- a/.github/workflows/linux.sh
+++ b/.github/workflows/linux.sh
@@ -7,7 +7,7 @@ apt-get update
 DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     gcc libxml2-dev libpq-dev libfcgi-dev \
     autoconf make flex libfl-dev \
-    postgresql-12 postgresql-client postgis postgresql-12-postgis-3 postgresql-12-postgis-3-scripts \
+    postgresql-16 postgresql-client postgis postgresql-16-postgis-3 postgresql-16-postgis-3-scripts \
     wget ca-certificates patch valgrind
 
 cd "${WORK_DIR}"
@@ -16,9 +16,9 @@ CFLAGS="-Werror" ./configure
 make
 make install
 
-cp /etc/postgresql/12/main/pg_hba.conf /etc/postgresql/12/main/pg_hba.conf.bak
-echo "local all postgres trust" |  cat - /etc/postgresql/12/main/pg_hba.conf.bak > /etc/postgresql/12/main/pg_hba.conf
-echo "host all all 127.0.0.1/32 trust" |  cat - /etc/postgresql/12/main/pg_hba.conf.bak > /etc/postgresql/12/main/pg_hba.conf
+cp /etc/postgresql/16/main/pg_hba.conf /etc/postgresql/16/main/pg_hba.conf.bak
+echo "local all postgres trust" |  cat - /etc/postgresql/16/main/pg_hba.conf.bak > /etc/postgresql/16/main/pg_hba.conf
+echo "host all all 127.0.0.1/32 trust" |  cat - /etc/postgresql/16/main/pg_hba.conf.bak > /etc/postgresql/16/main/pg_hba.conf
 /etc/init.d/postgresql start
 
 rm -f /etc/tinyows.xml
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 5ee5397..8312571 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -12,4 +12,4 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Build
-        run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:20.04 $PWD/.github/workflows/linux.sh
+        run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:24.04 $PWD/.github/workflows/linux.sh
diff --git a/demo/install.sh.in b/demo/install.sh.in
index d5032f6..cd34c94 100755
--- a/demo/install.sh.in
+++ b/demo/install.sh.in
@@ -21,24 +21,34 @@ elif [ -d /usr/local/pgsql/share/contrib/postgis-3.2 ]; then
         PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.2
 elif [ -d /usr/local/pgsql/share/contrib/postgis-3.1 ]; then
         PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.1
+elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.5 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.5
+elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.4 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.4
+elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.3 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.3
+elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.2 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.2
+elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.1 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.1
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.4 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.3 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.2 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.1 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-1.5 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
 else
-	echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
+    echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
 fi
 
 echo "Create Spatial Database: $DB"
diff --git a/demo/tests/expected/wfs10_describe.txt b/demo/tests/expected/wfs10_describe.txt
index 2520c20..5f4b340 100644
--- a/demo/tests/expected/wfs10_describe.txt
+++ b/demo/tests/expected/wfs10_describe.txt
@@ -21,7 +21,7 @@ Content-Type: text/xml; subtype=gml/2.1.2;
  <xs:complexContent>
   <xs:extension base='gml:AbstractFeatureType'>
    <xs:sequence>
-    <xs:element name ='id_geofla' type='long' nillable='true' minOccurs='0' maxOccurs='1'/>
+    <xs:element name ='id_geofla' type='double' nillable='true' minOccurs='0' maxOccurs='1'/>
     <xs:element name ='code_chf_l' nillable='true' minOccurs='0' maxOccurs='1'>
 <xs:simpleType><xs:restriction base='string'><xs:maxLength value='3'/></xs:restriction></xs:simpleType></xs:element>    <xs:element name ='nom_chf_l' nillable='true' minOccurs='0' maxOccurs='1'>
 <xs:simpleType><xs:restriction base='string'><xs:maxLength value='50'/></xs:restriction></xs:simpleType></xs:element>    <xs:element name ='x_chf_lieu' type='int' nillable='true' minOccurs='0' maxOccurs='1'/>
diff --git a/demo/tests/expected/wfs11_describe.txt b/demo/tests/expected/wfs11_describe.txt
index 558730c..fb213ca 100644
--- a/demo/tests/expected/wfs11_describe.txt
+++ b/demo/tests/expected/wfs11_describe.txt
@@ -21,7 +21,7 @@ Content-Type: text/xml; subtype=gml/3.1.1;
  <xs:complexContent>
   <xs:extension base='gml:AbstractFeatureType'>
    <xs:sequence>
-    <xs:element name ='id_geofla' type='long' nillable='true' minOccurs='0' maxOccurs='1'/>
+    <xs:element name ='id_geofla' type='double' nillable='true' minOccurs='0' maxOccurs='1'/>
     <xs:element name ='code_chf_l' nillable='true' minOccurs='0' maxOccurs='1'>
 <xs:simpleType><xs:restriction base='string'><xs:maxLength value='3'/></xs:restriction></xs:simpleType></xs:element>    <xs:element name ='nom_chf_l' nillable='true' minOccurs='0' maxOccurs='1'>
 <xs:simpleType><xs:restriction base='string'><xs:maxLength value='50'/></xs:restriction></xs:simpleType></xs:element>    <xs:element name ='x_chf_lieu' type='int' nillable='true' minOccurs='0' maxOccurs='1'/>
diff --git a/test/wfs_100/install_wfs_100.sh.in b/test/wfs_100/install_wfs_100.sh.in
index 840b742..eecd64c 100755
--- a/test/wfs_100/install_wfs_100.sh.in
+++ b/test/wfs_100/install_wfs_100.sh.in
@@ -10,24 +10,34 @@ PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
 PGUSER=postgres
 DB=tinyows_test
 
-if [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
+if [ -d @POSTGIS_SHARE@/contrib/postgis-3.5 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.5
+elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.4 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.4
+elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.3 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.3
+elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.2 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.2
+elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.1 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.1
+elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.4 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.3 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.2 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.1 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-1.5 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
 else
-	echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
+    echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
 fi
 
 echo "Create Spatial Database: $DB"
diff --git a/test/wfs_110/install_wfs_110.sh.in b/test/wfs_110/install_wfs_110.sh.in
index aaddd41..2a7bcbc 100755
--- a/test/wfs_110/install_wfs_110.sh.in
+++ b/test/wfs_110/install_wfs_110.sh.in
@@ -10,24 +10,34 @@ PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
 PGUSER=postgres
 DB=tinyows_test
 
-if [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
+if [ -d @POSTGIS_SHARE@/contrib/postgis-3.5 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.5
+elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.4 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.4
+elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.3 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.3
+elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.2 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.2
+elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.1 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.1
+elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.4 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.3 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.2 ]; then
 	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.1 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
 elif [ -d @POSTGIS_SHARE@/contrib/postgis-1.5 ]; then
-	PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
+    PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
 else
-	echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
+    echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
 fi
 
 echo "Create Spatial Database: $DB"