Open Build Service

Changes of Revision 5

php8.changes Changed

@@ -1,7 +1,43 @@
 -------------------------------------------------------------------
-Tue Sep  3 15:00:38 UTC 2024 - Angelo Grossini <angelo@intercom.it>
+Fri Mar 14 06:43:49 UTC 2025 - pgajdos@suse.com
 
-- fix broken patch
+- version update to 8.2.28
+  * This is a security release.
+
+-------------------------------------------------------------------
+Fri Dec 20 08:06:46 UTC 2024 - pgajdos@suse.com
+
+- version update to 8.2.27
+  * This is a bugfix release.
+
+-------------------------------------------------------------------
+Thu Nov 21 08:54:51 UTC 2024 - pgajdos@suse.com
+
+-  Add /srv/www directories to filelist bsc#1231027
+
+-------------------------------------------------------------------
+Thu Nov 21 07:51:53 UTC 2024 - pgajdos@suse.com
+
+- version update to 8.2.26
+  * This is a security release.
+
+-------------------------------------------------------------------
+Thu Oct 24 18:51:53 UTC 2024 - pgajdos@suse.com
+
+- version update to 8.2.25
+  * This is a bug fix release.
+
+-------------------------------------------------------------------
+Thu Sep 26 19:51:16 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
+
+- version update to 8.2.24
+  * This is a security release.
+
+-------------------------------------------------------------------
+Tue Sep  3 18:05:22 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
+
+- Fix build error due to context changes
+  % php-systzdata-v23.patch
 
 -------------------------------------------------------------------
 Fri Aug 30 07:25:32 UTC 2024 - pgajdos@suse.com

php8.spec Changed

php-systzdata-v23.patch Changed

@@ -38,9 +38,9 @@
 ===================================================================
 --- php-8.2.7.orig/ext/date/config0.m4
 +++ php-8.2.7/ext/date/config0.m4
-@@ -4,6 +4,19 @@ AC_CHECK_HEADERS(io.h)
- dnl Check for strtoll, atoll
- AC_CHECK_FUNCS(strtoll atoll)
+@@ -8,6 +8,19 @@ AC_CHECK_HEADERS(io.h)
+   PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough",,
+   -Werror)
  
 +PHP_ARG_WITH(system-tzdata, for use of system timezone data,
 +  --with-system-tzdata=DIR      to specify use of system timezone data,
@@ -55,9 +55,9 @@
 +   fi
 +fi
 +
- AX_CHECK_COMPILE_FLAG(-Wno-implicit-fallthrough,
-   PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough",,
-   -Werror)
+ PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
+ timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
+                  lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
 Index: php-8.2.7/ext/date/lib/parse_tz.c
 ===================================================================
 --- php-8.2.7.orig/ext/date/lib/parse_tz.c

_link Changed

php-8.2.23.tar.xz.asc Deleted

php-8.2.23.tar.xz/.cirrus.yml Deleted

@@ -1,28 +0,0 @@
-env:
-  CIRRUS_CLONE_DEPTH: 1
-
-freebsd_task:
-  name: FREEBSD_DEBUG_NTS
-  freebsd_instance:
-    image_family: freebsd-13-3
-  env:
-    ARCH: amd64
-  install_script:
-    #- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf
-    #- pkg upgrade -y
-    - kldload accf_http
-    - pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 krb5 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif
-  script:
-    - ./buildconf -f
-    - ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-kerberos --with-ffi --enable-zend-test --enable-dl-test=shared --enable-intl --with-mhash --with-sodium --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d
-    - gmake -j2
-    - mkdir /etc/php.d
-    - gmake install
-    - echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
-    - echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
-    # Specify opcache.preload_user as we're running as root.
-    - echo opcache.preload_user=root >> /etc/php.d/opcache.ini
-  tests_script:
-    - export SKIP_IO_CAPTURE_TESTS=1
-    - export CI_NO_IPV6=1
-    - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,BORK,LEAK,XLEAK --no-progress --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so

php-8.2.23.tar.xz/ext/standard/tests/http/http_response_header_05.phpt Deleted

php-8.2.28.tar.xz.asc Added

php-8.2.23.tar.xz/.circleci/config.yml -> php-8.2.28.tar.xz/.circleci/config.yml Changed

php-8.2.23.tar.xz/.github/CODEOWNERS -> php-8.2.28.tar.xz/.github/CODEOWNERS Changed

@@ -14,7 +14,7 @@
 # For more information, see the GitHub CODEOWNERS documentation:
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-/.github @iluuu1994 @TimWolla
+/.github @TimWolla
 /build/gen_stub.php @kocsismate
 /ext/bcmath @Girgias @nielsdos @SakiTakamachi
 /ext/curl @adoy
@@ -30,15 +30,16 @@
 /ext/json @bukka
 /ext/libxml @nielsdos
 /ext/mbstring @alexdowad @youkidearitai
-/ext/mysqlnd @SakiTakamachi
+/ext/mysqli @bukka @kamil-tekiela
+/ext/mysqlnd @bukka @kamil-tekiela @SakiTakamachi
 /ext/odbc @NattyNarwhal
-/ext/opcache @dstogov @iluuu1994
+/ext/opcache @dstogov
 /ext/openssl @bukka
 /ext/pcntl @devnexen
 /ext/pdo @SakiTakamachi
 /ext/pdo_dblib @SakiTakamachi
 /ext/pdo_firebird @SakiTakamachi
-/ext/pdo_mysql @SakiTakamachi
+/ext/pdo_mysql @kamil-tekiela @SakiTakamachi
 /ext/pdo_odbc @NattyNarwhal @SakiTakamachi
 /ext/pdo_pgsql @devnexen @SakiTakamachi
 /ext/pdo_sqlite @SakiTakamachi
@@ -46,6 +47,7 @@
 /ext/random @TimWolla @zeriyoshi
 /ext/session @Girgias
 /ext/simplexml @nielsdos
+/ext/soap @nielsdos
 /ext/sockets @devnexen
 /ext/spl @Girgias
 /ext/standard @bukka
@@ -55,26 +57,24 @@
 /ext/xsl @nielsdos
 /main @bukka
 /sapi/fpm @bukka
-/Zend/Optimizer @dstogov @iluuu1994
+/Zend/Optimizer @dstogov
 /Zend/zend.* @dstogov
 /Zend/zend_alloc.* @dstogov
-/Zend/zend_API.* @dstogov @iluuu1994
+/Zend/zend_API.* @dstogov
 /Zend/zend_call_stack.* @arnaud-lb
 /Zend/zend_closures.* @dstogov
-/Zend/zend_compile.* @iluuu1994
-/Zend/zend_enum.* @iluuu1994
-/Zend/zend_execute.* @dstogov @iluuu1994
-/Zend/zend_execute_API.c @dstogov @iluuu1994
+/Zend/zend_execute.* @dstogov
+/Zend/zend_execute_API.c @dstogov
 /Zend/zend_gc.* @dstogov @arnaud-lb
 /Zend/zend_hash.* @dstogov
-/Zend/zend_inheritance.* @dstogov @iluuu1994
+/Zend/zend_inheritance.* @dstogov
 /Zend/zend_max_execution_timer.* @arnaud-lb
-/Zend/zend_object_handlers.* @dstogov @iluuu1994
-/Zend/zend_objects.* @dstogov @iluuu1994
-/Zend/zend_objects_API.* @dstogov @iluuu1994
-/Zend/zend_opcode.* @dstogov @iluuu1994
+/Zend/zend_object_handlers.* @dstogov
+/Zend/zend_objects.* @dstogov
+/Zend/zend_objects_API.* @dstogov
+/Zend/zend_opcode.* @dstogov
 /Zend/zend_string.* @dstogov
-/Zend/zend_type*.h @dstogov @iluuu1994
+/Zend/zend_type*.h @dstogov
 /Zend/zend_variables.* @dstogov
-/Zend/zend_vm* @dstogov @iluuu1994
+/Zend/zend_vm* @dstogov
 *.stub.php @kocsismate

php-8.2.23.tar.xz/.github/actions/brew/action.yml -> php-8.2.28.tar.xz/.github/actions/brew/action.yml Changed

php-8.2.23.tar.xz/.github/actions/build-libmysqlclient/action.yml -> php-8.2.28.tar.xz/.github/actions/build-libmysqlclient/action.yml Changed

php-8.2.28.tar.xz/.github/actions/configure-gentoo Added

php-8.2.28.tar.xz/.github/actions/configure-gentoo/action.yml Added

@@ -0,0 +1,81 @@
+name: ./configure
+inputs:
+  configurationParameters:
+    default: ''
+    required: false
+  skipSlow:
+    default: false
+    required: false
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -x
+        ./buildconf --force
+        ./configure \
+          --enable-option-checking=fatal \
+          --prefix=/usr \
+          --with-libdir=lib64 \
+          --enable-phpdbg \
+          --enable-fpm \
+          --with-pdo-mysql=mysqlnd \
+          --with-mysqli=mysqlnd \
+          ${{ inputs.skipSlow == 'false' && '--with-pgsql' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-pgsql' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-sqlite' || '' }} \
+          --enable-intl \
+          --without-pear \
+          --enable-gd \
+          --with-jpeg \
+          --with-webp \
+          --with-freetype \
+          --with-xpm \
+          --enable-exif \
+          --with-zip \
+          --with-zlib \
+          --enable-soap \
+          --enable-xmlreader \
+          --with-xsl \
+          ${{ inputs.skipSlow == 'false' && '--with-tidy' || '' }} \
+          --enable-sysvsem \
+          --enable-sysvshm \
+          --enable-shmop \
+          --enable-pcntl \
+          --with-readline \
+          --enable-mbstring \
+          --with-iconv \
+          --with-curl \
+          --with-gettext \
+          --enable-sockets \
+          --with-bz2 \
+          --with-openssl \
+          --with-gmp \
+          --enable-bcmath \
+          --enable-calendar \
+          --enable-ftp \
+          ${{ inputs.skipSlow == 'false' && '--with-enchant=/usr' || '' }} \
+          --enable-sysvmsg \
+          --with-ffi \
+          --enable-zend-test \
+          ${{ inputs.skipSlow == 'false' && '--enable-dl-test=shared' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-ldap' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-ldap-sasl' || '' }} \
+          --with-password-argon2 \
+          --with-mhash \
+          --with-sodium \
+          --enable-dba \
+          --with-cdb \
+          --enable-flatfile \
+          --enable-inifile \
+          --with-tcadb \
+          --with-lmdb \
+          --with-qdbm \
+          ${{ inputs.skipSlow == 'false' && '--with-snmp' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-unixODBC' || '' }} \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-odbc=unixODBC,/usr' || '' }} \
+          --with-config-file-path=/etc \
+          --with-config-file-scan-dir=/etc/php.d \
+          ${{ inputs.skipSlow == 'false' && '--with-pdo-dblib' || '' }} \
+          --enable-werror \
+          ${{ inputs.configurationParameters }} || cat config.log

php-8.2.23.tar.xz/.github/actions/configure-macos/action.yml -> php-8.2.28.tar.xz/.github/actions/configure-macos/action.yml Changed

php-8.2.23.tar.xz/.github/actions/configure-x64/action.yml -> php-8.2.28.tar.xz/.github/actions/configure-x64/action.yml Changed

php-8.2.28.tar.xz/.github/actions/freebsd Added

php-8.2.28.tar.xz/.github/actions/freebsd/action.yml Added

@@ -0,0 +1,104 @@
+name: FreeBSD
+runs:
+  using: composite
+  steps:
+    - name: FreeBSD
+      uses: vmactions/freebsd-vm@v1
+      with:
+        release: '13.3'
+        usesh: true
+        copyback: false
+        # Temporarily disable sqlite, as FreeBSD ships it with disabled double quotes. We'll need to fix our tests.
+        # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269889
+        prepare: |
+          cd $GITHUB_WORKSPACE
+
+          kldload accf_http
+          pkg install -y \
+            autoconf \
+            bison \
+            gmake \
+            re2c \
+            icu \
+            libiconv \
+            png \
+            freetype2 \
+            enchant2 \
+            bzip2 \
+            t1lib \
+            gmp \
+            tidyp \
+            libsodium \
+            libzip \
+            libxml2 \
+            libxslt \
+            openssl \
+            oniguruma \
+            pkgconf \
+            webp \
+            libavif \
+            `#sqlite3` \
+            curl
+
+          ./buildconf -f
+          ./configure \
+            --prefix=/usr/local \
+            --enable-debug \
+            --enable-option-checking=fatal \
+            --enable-fpm \
+            `#--with-pdo-sqlite` \
+            --without-sqlite3 \
+            --without-pdo-sqlite \
+            --without-pear \
+            --with-bz2 \
+            --with-avif \
+            --with-jpeg \
+            --with-webp \
+            --with-freetype \
+            --enable-gd \
+            --enable-exif \
+            --with-zip \
+            --with-zlib \
+            --enable-soap \
+            --enable-xmlreader \
+            --with-xsl \
+            --with-libxml \
+            --enable-shmop \
+            --enable-pcntl \
+            --enable-mbstring \
+            --with-curl \
+            --enable-sockets \
+            --with-openssl \
+            --with-iconv=/usr/local \
+            --enable-bcmath \
+            --enable-calendar \
+            --enable-ftp \
+            --with-ffi \
+            --enable-zend-test \
+            --enable-dl-test=shared \
+            --enable-intl \
+            --with-mhash \
+            --with-sodium \
+            --with-config-file-path=/etc \
+            --with-config-file-scan-dir=/etc/php.d
+          gmake -j2
+          mkdir /etc/php.d
+          gmake install > /dev/null
+          echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
+          echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
+          echo opcache.preload_user=root >> /etc/php.d/opcache.ini
+        run: |
+          cd $GITHUB_WORKSPACE
+
+          export SKIP_IO_CAPTURE_TESTS=1
+          export CI_NO_IPV6=1
+          export STACK_LIMIT_DEFAULTS_CHECK=1
+          sapi/cli/php run-tests.php \
+            -P -q -j2 \
+            -g FAIL,BORK,LEAK,XLEAK \
+            --no-progress \
+            --offline \
+            --show-diff \
+            --show-slow 1000 \
+            --set-timeout 120 \
+            -d zend_extension=opcache.so

php-8.2.23.tar.xz/.github/actions/setup-mssql/action.yml -> php-8.2.28.tar.xz/.github/actions/setup-mssql/action.yml Changed

php-8.2.23.tar.xz/.github/actions/setup-windows/action.yml -> php-8.2.28.tar.xz/.github/actions/setup-windows/action.yml Changed

php-8.2.23.tar.xz/.github/actions/setup-x64/action.yml -> php-8.2.28.tar.xz/.github/actions/setup-x64/action.yml Changed

@@ -6,15 +6,8 @@
       run: |
         set -x
 
-        sudo service mysql start
-        sudo service postgresql start
         sudo service slapd start
-        mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
-        # Ensure local_infile tests can run.
-        mysql -uroot -proot -e "SET GLOBAL local_infile = true"
-        sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
-        sudo -u postgres psql -c "CREATE DATABASE test;"
-        docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
+        docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
         sudo locale-gen de_DE
 
         ./.github/scripts/setup-slapd.sh

php-8.2.28.tar.xz/.github/actions/test-gentoo Added

php-8.2.28.tar.xz/.github/actions/test-gentoo/action.yml Added

@@ -0,0 +1,34 @@
+name: Test
+inputs:
+  runTestsParameters:
+    default: ''
+    required: false
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -x
+        # XXX: Set up other database tests?
+        # XXX: These tests are not running containerized
+        export MYSQL_TEST_USER=ci
+        export MYSQL_TEST_PASSWD=ci
+        if  -z "$PDO_MYSQL_TEST_DSN" ; then
+          export PDO_MYSQL_TEST_DSN="mysql:host=localhost;dbname=test"
+        fi
+        export PDO_MYSQL_TEST_USER=ci
+        export PDO_MYSQL_TEST_PASS=ci
+        export PGSQL_TEST_CONNSTR="host=localhost dbname=test port=5432 user=ci password=ci"
+        if  -z "$PDO_PGSQL_TEST_DSN" ; then
+          export PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=ci password=ci"
+        fi
+        # Slow tests criteron is doubled because this runner isn't as fast as others
+        export SKIP_IO_CAPTURE_TESTS=1
+        export STACK_LIMIT_DEFAULTS_CHECK=1
+        sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
+          -j$(nproc) \
+          -g FAIL,BORK,LEAK,XLEAK \
+          --no-progress \
+          --show-diff \
+          --show-slow 2000 \
+          --set-timeout 120

php-8.2.23.tar.xz/.github/actions/test-linux/action.yml -> php-8.2.28.tar.xz/.github/actions/test-linux/action.yml Changed

php-8.2.23.tar.xz/.github/labeler.yml -> php-8.2.28.tar.xz/.github/labeler.yml Changed

@@ -241,3 +241,93 @@
 
 "SAPI: phpdbg":
 - sapi/phpdbg/**/*
+
+"ABI break":
+- 'TSRM/*.h'
+- 'Zend/*.h'
+- 'Zend/Optimizer/zend_call_graph.h'
+- 'Zend/Optimizer/zend_cfg.h'
+- 'Zend/Optimizer/zend_dump.h'
+- 'Zend/Optimizer/zend_func_info.h'
+- 'Zend/Optimizer/zend_inference.h'
+- 'Zend/Optimizer/zend_optimizer.h'
+- 'Zend/Optimizer/zend_ssa.h'
+- 'ext/curl/php_curl.h'
+- 'ext/date/lib/timelib.h'
+- 'ext/date/lib/timelib_config.h'
+- 'ext/date/php_date.h'
+- 'ext/dom/xml_common.h'
+- 'ext/filter/php_filter.h'
+- 'ext/gd/*.h'
+- 'ext/gd/libgd/*.h'
+- 'ext/gmp/php_gmp_int.h'
+- 'ext/hash/php_hash.h'
+- 'ext/hash/php_hash_adler32.h'
+- 'ext/hash/php_hash_crc32.h'
+- 'ext/hash/php_hash_gost.h'
+- 'ext/hash/php_hash_haval.h'
+- 'ext/hash/php_hash_md.h'
+- 'ext/hash/php_hash_murmur.h'
+- 'ext/hash/php_hash_ripemd.h'
+- 'ext/hash/php_hash_sha.h'
+- 'ext/hash/php_hash_sha3.h'
+- 'ext/hash/php_hash_snefru.h'
+- 'ext/hash/php_hash_tiger.h'
+- 'ext/hash/php_hash_whirlpool.h'
+- 'ext/hash/php_hash_xxhash.h'
+- 'ext/iconv/*.h'
+- 'ext/json/php_json.h'
+- 'ext/json/php_json_parser.h'
+- 'ext/json/php_json_scanner.h'
+- 'ext/libxml/php_libxml.h'
+- 'ext/mbstring/libmbfl/config.h'
+- 'ext/mbstring/libmbfl/mbfl/eaw_table.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfilter.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfilter_pass.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_consts.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_convert.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_defs.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_encoding.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_language.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h'
+- 'ext/mbstring/libmbfl/mbfl/mbfl_string.h'
+- 'ext/mbstring/mbstring.h'
+- 'ext/mbstring/php_mbregex.h'
+- 'ext/mbstring/php_onig_compat.h'
+- 'ext/mysqli/php_mysqli_structs.h'
+- 'ext/mysqlnd/*.h'
+- 'ext/pcre/pcre2lib/*.h'
+- 'ext/pcre/php_pcre.h'
+- 'ext/pdo/php_pdo.h'
+- 'ext/pdo/php_pdo_driver.h'
+- 'ext/pdo/php_pdo_error.h'
+- 'ext/random/php_random.h'
+- 'ext/session/mod_files.h'
+- 'ext/session/mod_mm.h'
+- 'ext/session/mod_user.h'
+- 'ext/session/php_session.h'
+- 'ext/simplexml/php_simplexml.h'
+- 'ext/simplexml/php_simplexml_exports.h'
+- 'ext/sockets/php_sockets.h'
+- 'ext/sockets/windows_common.h'
+- 'ext/sodium/php_libsodium.h'
+- 'ext/spl/php_spl.h'
+- 'ext/spl/spl_array.h'
+- 'ext/spl/spl_directory.h'
+- 'ext/spl/spl_dllist.h'
+- 'ext/spl/spl_engine.h'
+- 'ext/spl/spl_exceptions.h'
+- 'ext/spl/spl_fixedarray.h'
+- 'ext/spl/spl_functions.h'
+- 'ext/spl/spl_heap.h'
+- 'ext/spl/spl_iterators.h'
+- 'ext/spl/spl_observer.h'
+- 'ext/standard/*.h'
+- 'ext/xml/*.h'
+- 'main/*.h'
+- 'main/streams/*.h'
+- 'sapi/embed/php_embed.h'
+- 'win32/*.h'

php-8.2.23.tar.xz/.github/lsan-suppressions.txt -> php-8.2.28.tar.xz/.github/lsan-suppressions.txt Changed

php-8.2.23.tar.xz/.github/nightly_matrix.php -> php-8.2.28.tar.xz/.github/nightly_matrix.php Changed

@@ -1,23 +1,17 @@
 <?php
 
-const BRANCHES = 'master', 'PHP-8.2', 'PHP-8.1', 'PHP-8.0';
+const BRANCHES = 
+    'ref' => 'master', 'version' => 8, 5,
+    'ref' => 'PHP-8.4', 'version' => 8, 4,
+    'ref' => 'PHP-8.3', 'version' => 8, 3,
+    'ref' => 'PHP-8.2', 'version' => 8, 2,
+    'ref' => 'PHP-8.1', 'version' => 8, 1,
+;
 
 function get_branch_commit_cache_file_path(): string {
     return dirname(__DIR__) . '/branch-commit-cache.json';
 }
 
-function get_branch_matrix(array $branches) {
-    $result = array_map(function ($branch) {
-        $branch_key = strtoupper(str_replace('.', '', $branch));
-        return 
-            'name' => $branch_key,
-            'ref' => $branch,
-        ;
-    }, $branches);
-
-    return $result;
-}
-
 function get_branches() {
     $branch_commit_cache_file = get_branch_commit_cache_file_path();
     $branch_commit_map = ;
@@ -27,88 +21,45 @@
 
     $changed_branches = ;
     foreach (BRANCHES as $branch) {
-        $previous_commit_hash = $branch_commit_map$branch ?? null;
-        $current_commit_hash = trim(shell_exec('git rev-parse origin/' . $branch));
+        $previous_commit_hash = $branch_commit_map$branch'ref' ?? null;
+        $current_commit_hash = trim(shell_exec('git rev-parse origin/' . $branch'ref'));
 
         if ($previous_commit_hash !== $current_commit_hash) {
             $changed_branches = $branch;
         }
 
-        $branch_commit_map$branch = $current_commit_hash;
+        $branch_commit_map$branch'ref' = $current_commit_hash;
     }
 
     file_put_contents($branch_commit_cache_file, json_encode($branch_commit_map));
 
-    return get_branch_matrix($changed_branches);
+    return $changed_branches;
 }
 
-function get_matrix_include(array $branches) {
-    $jobs = ;
-    foreach ($branches as $branch) {
-        $jobs = 
-            'name' => '_ASAN_UBSAN',
-            'branch' => $branch,
-            'debug' => true,
-            'zts' => true,
-            'configuration_parameters' => "CFLAGS='-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC' LDFLAGS='-fsanitize=undefined,address'",
-            'run_tests_parameters' => '--asan',
-            'test_function_jit' => false,
-        ;
-        if ($branch'ref' !== 'PHP-8.0') {
-            $jobs = 
-                'name' => '_REPEAT',
-                'branch' => $branch,
-                'debug' => true,
-                'zts' => false,
-                'run_tests_parameters' => '--repeat 2',
-                'timeout_minutes' => 360,
-                'test_function_jit' => true,
-            ;
-            $jobs = 
-                'name' => '_VARIATION',
-                'branch' => $branch,
-                'debug' => true,
-                'zts' => true,
-                'configuration_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1'",
-                'run_tests_parameters' => '-d zend_test.observer.enabled=1 -d zend_test.observer.show_output=0',
-                'timeout_minutes' => 360,
-                'test_function_jit' => true,
-            ;
-        }
-    }
-    return $jobs;
-}
-
-function get_windows_matrix_include(array $branches) {
-    $jobs = ;
-    foreach ($branches as $branch) {
-        $jobs = 
-            'branch' => $branch,
-            'x64' => true,
-            'zts' => true,
-            'opcache' => true,
-        ;
-        $jobs = 
-            'branch' => $branch,
-            'x64' => false,
-            'zts' => false,
-            'opcache' => false,
-        ;
-    }
-    return $jobs;
+function get_current_version(): array {
+    $file = dirname(__DIR__) . '/main/php_version.h';
+    $content = file_get_contents($file);
+    preg_match('(^#define PHP_MAJOR_VERSION (?<num>\d+)$)m', $content, $matches);
+    $major = (int) $matches'num';
+    preg_match('(^#define PHP_MINOR_VERSION (?<num>\d+)$)m', $content, $matches);
+    $minor = (int) $matches'num';
+    return $major, $minor;
 }
 
 $trigger = $argv1 ?? 'schedule';
 $attempt = (int) ($argv2 ?? 1);
-$discard_cache = ($trigger === 'schedule' && $attempt !== 1) || $trigger === 'workflow_dispatch';
+$monday = date('w', time()) === '1';
+$discard_cache = $monday
+    || ($trigger === 'schedule' && $attempt !== 1)
+    || $trigger === 'workflow_dispatch';
 if ($discard_cache) {
     @unlink(get_branch_commit_cache_file_path());
 }
+$branch = $argv3 ?? 'master';
+$branches = $branch === 'master'
+    ? get_branches()
+    : 'ref' => $branch, 'version' => get_current_version();
 
-$branches = get_branches();
-$matrix_include = get_matrix_include($branches);
-$windows_matrix_include = get_windows_matrix_include($branches);
-
-echo '::set-output name=branches::' . json_encode($branches, JSON_UNESCAPED_SLASHES) . "\n";
-echo '::set-output name=matrix-include::' . json_encode($matrix_include, JSON_UNESCAPED_SLASHES) . "\n";
-echo '::set-output name=windows-matrix-include::' . json_encode($windows_matrix_include, JSON_UNESCAPED_SLASHES) . "\n";
+$f = fopen(getenv('GITHUB_OUTPUT'), 'a');
+fwrite($f, 'branches=' . json_encode($branches, JSON_UNESCAPED_SLASHES) . "\n");
+fclose($f);

php-8.2.23.tar.xz/.github/scripts/setup-slapd.sh -> php-8.2.28.tar.xz/.github/scripts/setup-slapd.sh Changed

php-8.2.23.tar.xz/.github/scripts/windows/test_task.bat -> php-8.2.28.tar.xz/.github/scripts/windows/test_task.bat Changed

@@ -52,7 +52,12 @@
 set PDOTEST_DSN=odbc:%ODBC_TEST_DSN%
 
 rem setup Firebird related exts
-curl -sLo Firebird.zip https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0_x64.zip
+if "%PLATFORM%" == "x64" (
+	set PHP_FIREBIRD_DOWNLOAD_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0_x64.zip
+) else (
+	set PHP_FIREBIRD_DOWNLOAD_URL=https://github.com/FirebirdSQL/firebird/releases/download/v3.0.9/Firebird-3.0.9.33560-0_Win32.zip
+)
+curl -sLo Firebird.zip %PHP_FIREBIRD_DOWNLOAD_URL%
 7z x -oC:\Firebird Firebird.zip
 set PDO_FIREBIRD_TEST_DATABASE=C:\test.fdb
 set PDO_FIREBIRD_TEST_DSN=firebird:dbname=%PDO_FIREBIRD_TEST_DATABASE%
@@ -98,14 +103,14 @@
 if %errorlevel% neq 0 exit /b 3
 echo Fetching enchant dicts
 pushd %~d0\usr\local\share\enchant\hunspell
-powershell -Command wget http://windows.php.net/downloads/qa/appveyor/ext/enchant/dict.zip -OutFile dict.zip
+powershell -Command wget https://downloads.php.net/~windows/qa/appveyor/ext/enchant/dict.zip -OutFile dict.zip
 unzip dict.zip
 del /q dict.zip
 popd
 
 rem prepare for snmp
 set MIBDIRS=%DEPS_DIR%\share\mibs
-start %DEPS_DIR%\bin\snmpd.exe -C -c %APPVEYOR_BUILD_FOLDER%\ext\snmp\tests\snmpd.conf -Ln
+start %DEPS_DIR%\bin\snmpd.exe -C -c %GITHUB_WORKSPACE%\ext\snmp\tests\snmpd.conf -Ln
 
 set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release
 if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS
@@ -121,8 +126,9 @@
 echo extension_dir=%PHP_BUILD_DIR% > %PHP_BUILD_DIR%\php.ini
 echo opcache.file_cache=%PHP_BUILD_DIR%\test_file_cache >> %PHP_BUILD_DIR%\php.ini
 if "%OPCACHE%" equ "1" echo zend_extension=php_opcache.dll >> %PHP_BUILD_DIR%\php.ini
-rem work-around for some spawned PHP processes requiring OpenSSL
+rem work-around for some spawned PHP processes requiring OpenSSL and sockets
 echo extension=php_openssl.dll >> %PHP_BUILD_DIR%\php.ini
+echo extension=php_sockets.dll >> %PHP_BUILD_DIR%\php.ini
 
 rem remove ext dlls for which tests are not supported
 for %%i in (ldap oci8_12c pdo_oci) do (

php-8.2.23.tar.xz/.github/workflows/labeler.yml -> php-8.2.28.tar.xz/.github/workflows/labeler.yml Changed

php-8.2.23.tar.xz/.github/workflows/nightly.yml -> php-8.2.28.tar.xz/.github/workflows/nightly.yml Changed

@@ -1,68 +1,216 @@
-name: Nightly
+name: Test suite
 on:
-  schedule:
-   - cron: "0 1 * * *"
-  workflow_dispatch: ~
+  workflow_call:
+    inputs:
+      asan_ubuntu_version:
+        required: true
+        type: string
+      branch:
+        required: true
+        type: string
+      community_verify_type_inference:
+        required: true
+        type: boolean
+      libmysqlclient_with_mysqli:
+        required: true
+        type: boolean
+      run_alpine:
+        required: true
+        type: boolean
+      run_linux_ppc64:
+        required: true
+        type: boolean
+      run_macos_arm64:
+        required: true
+        type: boolean
+      ubuntu_version:
+        required: true
+        type: string
+      windows_version:
+        required: true
+        type: string
+      skip_symfony:
+        required: true
+        type: boolean
+      skip_wordpress:
+        required: true
+        type: boolean
+permissions:
+  contents: read
 jobs:
-  GENERATE_MATRIX:
-    name: Generate Matrix
-    if: github.repository_owner == 'php' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    outputs:
-      branches: ${{ steps.set-matrix.outputs.branches }}
-      matrix-include: ${{ steps.set-matrix.outputs.matrix-include }}
-      windows-matrix-include: ${{ steps.set-matrix.outputs.windows-matrix-include }}
+  LINUX_PPC64:
+    if: inputs.run_linux_ppc64
+    name: LINUX_PPC64_ASAN_UBSAN_DEBUG_ZTS
+    # This runs on a self-hosted runner; see https://wiki.php.net/systems/ci
+    runs-on: self-hosted, gentoo, ppc64
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
+      - name: System info
+        run: |
+          echo "::group::Show host CPU info"
+          lscpu
+          echo "::endgroup::"
+          echo "::group::Show installed packages"
+          cat /var/lib/portage/world
+          echo "::endgroup::"
+      - name: ./configure
+        uses: ./.github/actions/configure-gentoo
+        with:
+          configurationParameters: >-
+            CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
+            LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
+            CC=clang-17
+            CXX=clang++-17
+            --enable-debug
+            --enable-zts
+          skipSlow: false # FIXME: This should likely include slow extensions
+      - name: make
+        run: make -j$(/usr/bin/nproc) >/dev/null
+      # Skip an install action for now
+      - name: Tests
+        uses: ./.github/actions/test-gentoo
+        # There is no PPC JIT, so rip this out
+        with:
+          runTestsParameters: >-
+            --asan -x
+  ALPINE:
+    if: inputs.run_alpine
+    name: ALPINE_X64_ASAN_UBSAN_DEBUG_ZTS
+    runs-on: ubuntu-22.04
+    container:
+      image: 'alpine:3.20.1'
     steps:
-      - uses: actions/checkout@v4
-        with:
-          # Set fetch-depth to 0 to clone the full repository
-          # including all branches. This is required to find
-          # the correct commit hashes.
-          fetch-depth: 0
-      - name: Grab the commit mapping
-        uses: actions/cache@v3
-        with:
-          path: branch-commit-cache.json
-          # The cache key needs to change every time for the
-          # cache to be updated after this job finishes.
-          key: nightly-${{ github.run_id }}-${{ github.run_attempt }}
-          restore-keys: |
-            nightly-
-      - name: Generate Matrix
-        id: set-matrix
-        run: php .github/nightly_matrix.php "${{ github.event_name }}" "${{ github.run_attempt }}"
+      - name: git checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
+      - name: apk
+        uses: ./.github/actions/apk
+      - name: LLVM 17 (ASAN-only)
+        # libclang_rt.asan-x86_64.a is provided by compiler-rt, and only for clang17:
+        # https://pkgs.alpinelinux.org/contents?file=libclang_rt.asan-x86_64.a&path=&name=&branch=v3.20
+        run: |
+          apk add clang17 compiler-rt
+      - name: System info
+        run: |
+          echo "::group::Show host CPU info"
+          lscpu
+          echo "::endgroup::"
+          echo "::group::Show installed package versions"
+          apk list
+          echo "::endgroup::"
+      - name: ./configure
+        uses: ./.github/actions/configure-alpine
+        with:
+          configurationParameters: >-
+            CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
+            LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
+            CC=clang-17
+            CXX=clang++-17
+            --enable-debug
+            --enable-zts
+          skipSlow: true # FIXME: This should likely include slow extensions
+      - name: make
+        run: make -j$(/usr/bin/nproc) >/dev/null
+      - name: make install
+        uses: ./.github/actions/install-alpine
+      - name: Test Tracing JIT
+        uses: ./.github/actions/test-alpine
+        with:
+          jitType: tracing
+          runTestsParameters: >-
+            --asan -x
+            -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
       - name: Notify Slack
         if: failure()
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
+
   LINUX_X64:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
+    services:
+      mysql:
+        image: mysql:8.3
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_DATABASE: test
+          MYSQL_ROOT_PASSWORD: root
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: test
+      firebird:
+        image: jacobalberty/firebird
+        ports:
+          - 3050:3050
+        env:
+          ISC_PASSWORD: test
+          FIREBIRD_DATABASE: test.fdb
+          FIREBIRD_USER: test
+          FIREBIRD_PASSWORD: test
     strategy:
       fail-fast: false
       matrix:
-        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
         configuration_parameters: ''
         debug: true, false
         name: ''
         run_tests_parameters: ''
         test_function_jit: true
         zts: true, false
-        include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.matrix-include) }}
-    name: "${{ matrix.branch.name }}_LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: ubuntu-20.04
+        include:
+          - name: _ASAN_UBSAN
+            debug: true
+            zts: true
+            configuration_parameters: >-
+              CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC"
+              LDFLAGS="-fsanitize=undefined,address"
+            run_tests_parameters: '--asan'
+            test_function_jit: false
+            asan: true
+          - name: _REPEAT
+            debug: true
+            zts: false
+            run_tests_parameters: --repeat 2
+            timeout_minutes: 360
+            test_function_jit: true
+            asan: false
+          - name: _VARIATION
+            debug: true
+            zts: true
+            configuration_parameters: >-
+              CFLAGS="-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1 -DZEND_VERIFY_TYPE_INFERENCE"
+            run_tests_parameters: -d zend_test.observer.enabled=1 -d zend_test.observer.show_output=0
+            timeout_minutes: 360
+            test_function_jit: true
+            asan: false
+    name: "LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
+    runs-on: ubuntu-${{ matrix.asan && inputs.asan_ubuntu_version || inputs.ubuntu_version }}
     steps:
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: Create MSSQL container
         uses: ./.github/actions/setup-mssql
-      - name: Create Oracle container
-        uses: ./.github/actions/setup-oracle
       - name: apt
         uses: ./.github/actions/apt-x64
+        with:
+          asan: ${{ matrix.asan && 'true' || 'false' }}
+      - name: System info
+        run: |
+          echo "::group::Show host CPU info"
+          lscpu
+          echo "::endgroup::"
+          echo "::group::Show installed package versions"
+          dpkg -l
+          echo "::endgroup::"
       - name: ./configure
         uses: ./.github/actions/configure-x64
         with:
@@ -70,6 +218,7 @@
             ${{ matrix.configuration_parameters }}
             --${{ matrix.debug && 'enable' || 'disable' }}-debug
             --${{ matrix.zts && 'enable' || 'disable' }}-zts
+          asan: ${{ matrix.asan && 'true' || 'false' }}
       - name: make
         run: make -j$(/usr/bin/nproc) >/dev/null
       - name: make install
@@ -116,37 +265,49 @@
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   LINUX_X32:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
     strategy:
       fail-fast: false
       matrix:
-        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
         debug: true, false
         zts: true, false
-    name: "${{ matrix.branch.name }}_LINUX_X32_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
+    name: "LINUX_X32_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
     runs-on: ubuntu-latest
     container:
-      image: ubuntu:20.04
+      image: ubuntu:${{ inputs.ubuntu_version }}
     env:
-      MYSQL_TEST_HOST: mysql
-      PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
-      PDO_MYSQL_TEST_HOST: mysql
+      PDO_FIREBIRD_TEST_DSN: firebird:dbname=firebird:test.fdb
     services:
       mysql:
-        image: mysql:8
+        image: mysql:8.3
         ports:
           - 3306:3306
         env:
           MYSQL_DATABASE: test
           MYSQL_ROOT_PASSWORD: root
+      firebird:
+        image: jacobalberty/firebird
+        ports:
+          - 3050:3050
+        env:
+          ISC_PASSWORD: test
+          FIREBIRD_DATABASE: test.fdb
+          FIREBIRD_USER: test
+          FIREBIRD_PASSWORD: test
     steps:
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: apt
         uses: ./.github/actions/apt-x32
+      - name: System info
+        run: |
+          echo "::group::Show host CPU info"
+          lscpu
+          echo "::endgroup::"
+          echo "::group::Show installed package versions"
+          dpkg -l
+          echo "::endgroup::"
       - name: ./configure
         uses: ./.github/actions/configure-x32
         with:
@@ -191,21 +352,21 @@
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   MACOS:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
     strategy:
       fail-fast: false
       matrix:
-        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
         debug: true, false
         zts: true, false
-    name: "${{ matrix.branch.name }}_MACOS_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: macos-12
+        os: '13', '14'
+        exclude:
+          - os: ${{ !inputs.run_macos_arm64 && '14' || '*never*' }}
+    name: "MACOS_${{ matrix.os == '13' && 'X64' || 'ARM64' }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
+    runs-on: macos-${{ matrix.os }}
     steps:
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: brew
         uses: ./.github/actions/brew
       - name: ./configure
@@ -216,35 +377,34 @@
             --${{ matrix.zts && 'enable' || 'disable' }}-zts
       - name: make
         run: |-
-          export PATH="/usr/local/opt/bison/bin:$PATH"
+          export PATH="$(brew --prefix)/opt/bison/bin:$PATH"
           make -j$(sysctl -n hw.logicalcpu) >/dev/null
       - name: make install
         run: sudo make install
       - name: Test
         uses: ./.github/actions/test-macos
       - name: Test Tracing JIT
+        if: matrix.os != '14' || !matrix.zts
         uses: ./.github/actions/test-macos
         with:
           jitType: tracing
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
-            -d opcache.protect_memory=1
       - name: Test OpCache
         uses: ./.github/actions/test-macos
         with:
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
-            -d opcache.protect_memory=1
       - name: Test Function JIT
+        if: matrix.os != '14' || !matrix.zts
         uses: ./.github/actions/test-macos
         with:
           jitType: function
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
-            -d opcache.protect_memory=1
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
       - name: Notify Slack
@@ -253,15 +413,38 @@
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   COVERAGE_DEBUG_NTS:
-    if: github.repository_owner == 'php' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-20.04
+    if: inputs.branch == 'master'
+    services:
+      mysql:
+        image: mysql:8.3
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_DATABASE: test
+          MYSQL_ROOT_PASSWORD: root
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: test
+      firebird:
+        image: jacobalberty/firebird
+        ports:
+          - 3050:3050
+        env:
+          ISC_PASSWORD: test
+          FIREBIRD_DATABASE: test.fdb
+          FIREBIRD_USER: test
+          FIREBIRD_PASSWORD: test
+    runs-on: ubuntu-22.04
     steps:
       - name: git checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
       - name: Create MSSQL container
         uses: ./.github/actions/setup-mssql
-      - name: Create Oracle container
-        uses: ./.github/actions/setup-oracle
       - name: apt
         uses: ./.github/actions/apt-x64
       - name: Install gcovr
@@ -280,27 +463,32 @@
       - name: Test OpCache
         uses: ./.github/actions/test-linux
         with:
+          jitType: tracing
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
-      - name: Upload Test Coverage to Codecov.io
-        if: always()
-        run: bash <(curl -s https://codecov.io/bash)
+      - uses: codecov/codecov-action@v4
+        if: ${{ !cancelled() }}
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+          verbose: true
       - name: Notify Slack
         if: failure()
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   COMMUNITY:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
     strategy:
       fail-fast: false
       matrix:
-        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
-    name: "${{ matrix.branch.name }}_COMMUNITY"
-    runs-on: ubuntu-20.04
+        type: 'asan', 'verify_type_inference'
+        exclude:
+          - type: ${{ !inputs.community_verify_type_inference && 'verify_type_inference' || '*never*' }}
+    name: "COMMUNITY_${{ matrix.type }}"
+    runs-on: ubuntu-${{ inputs.ubuntu_version }}
     env:
+      ASAN_OPTIONS: exitcode=139
       UBSAN_OPTIONS: print_stacktrace=1
       USE_ZEND_ALLOC: 0
       USE_TRACKED_ALLOC: 1
@@ -308,17 +496,17 @@
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: apt
         uses: ./.github/actions/apt-x64
       - name: ./configure
         uses: ./.github/actions/configure-x64
         with:
+          # CFLAGS removes O2, so we have to add it again...
           configurationParameters: >-
-            --enable-debug
             --enable-zts
-            CFLAGS='-fsanitize=undefined,address -fno-sanitize-recover -DZEND_TRACK_ARENA_ALLOC'
-            LDFLAGS='-fsanitize=undefined,address'
+            ${{ matrix.type == 'asan' && '--enable-debug CFLAGS="-fsanitize=undefined,address -fno-sanitize-recover -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address"' || '' }}
+            ${{ matrix.type == 'verify_type_inference' && 'CFLAGS="-DZEND_VERIFY_TYPE_INFERENCE -O2"' || '' }}
       - name: make
         run: make -j$(/usr/bin/nproc) >/dev/null
       - name: make install
@@ -328,28 +516,92 @@
           sudo service mysql start
           mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
           mysql -uroot -proot -e "SET GLOBAL local_infile = true"
-      - name: Enable Opcache and JIT
+      - name: Enable Opcache
         run: |
+          echo memory_limit=-1 >> /etc/php.d/opcache.ini
           echo zend_extension=opcache.so > /etc/php.d/opcache.ini
           echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
+          echo opcache.enable=1 >> /etc/php.d/opcache.ini
           echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
+          echo opcache.memory_consumption=256M >> /etc/php.d/opcache.ini
+          echo opcache.file_update_protection=0 >> /etc/php.d/opcache.ini
+          echo opcache.interned_strings_buffer=64 >> /etc/php.d/opcache.ini
+          echo opcache.max_accelerated_files=100000 >> /etc/php.d/opcache.ini
+      - name: Enable JIT
+        if: matrix.type != 'verify_type_inference'
+        run: |
+          echo opcache.jit=tracing >> /etc/php.d/opcache.ini
           echo opcache.jit_buffer_size=1G >> /etc/php.d/opcache.ini
+          echo opcache.jit_max_root_traces=100000 >> /etc/php.d/opcache.ini
+          echo opcache.jit_max_side_traces=100000 >> /etc/php.d/opcache.ini
+          echo opcache.jit_max_exit_counters=100000 >> /etc/php.d/opcache.ini
+          echo opcache.jit_hot_loop=1 >> /etc/php.d/opcache.ini
+          echo opcache.jit_hot_func=1 >> /etc/php.d/opcache.ini
+          echo opcache.jit_hot_return=1 >> /etc/php.d/opcache.ini
+          echo opcache.jit_hot_side_exit=1 >> /etc/php.d/opcache.ini
+          php -v
+      - name: Test AMPHP
+        if: ${{ !cancelled() }}
+        run: |
+          repositories="amp cache dns file http parallel parser pipeline process serialization socket sync websocket-client websocket-server"
+          X=0
+          for repository in $repositories; do
+            printf "Testing amp/%s\n" "$repository"
+            git clone "https://github.com/amphp/$repository.git" "amphp-$repository" --depth 1
+            cd "amphp-$repository"
+            git rev-parse HEAD
+            php /usr/bin/composer install --no-progress --ignore-platform-reqs
+            vendor/bin/phpunit || EXIT_CODE=$?
+            if  ${EXIT_CODE:-0} -gt 128 ; then
+              X=1;
+            fi
+            cd ..
+          done
+          exit $X
       - name: Test Laravel
-        if: matrix.branch.ref != 'PHP-8.0'
+        if: ${{ !cancelled() }}
         run: |
-          git clone https://github.com/laravel/framework.git --branch=master --depth=1
+          git clone https://github.com/laravel/framework.git --depth=1
           cd framework
           git rev-parse HEAD
           php /usr/bin/composer install --no-progress --ignore-platform-reqs
           # Hack to disable a test that hangs
           php -r '$c = file_get_contents("tests/Filesystem/FilesystemTest.php"); $c = str_replace("public function testSharedGet()", "#\\PHPUnit\\Framework\\Attributes\\Group('"'"'skip'"'"')\n    public function testSharedGet()", $c); file_put_contents("tests/Filesystem/FilesystemTest.php", $c);'
-          export ASAN_OPTIONS=exitcode=139
           php vendor/bin/phpunit --exclude-group skip || EXIT_CODE=$?
-          if  $EXIT_CODE -gt 128 ; then
+          if  ${EXIT_CODE:-0} -gt 128 ; then
+            exit 1
+          fi
+      - name: Test ReactPHP
+        if: ${{ !cancelled() }}
+        run: |
+          repositories="async cache child-process datagram dns event-loop promise promise-stream promise-timer stream"
+          X=0
+          for repository in $repositories; do
+            printf "Testing reactphp/%s\n" "$repository"
+            git clone "https://github.com/reactphp/$repository.git" "reactphp-$repository" --depth 1
+            cd "reactphp-$repository"
+            git rev-parse HEAD
+            php /usr/bin/composer install --no-progress --ignore-platform-reqs
+            vendor/bin/phpunit || EXIT_CODE=$?
+            if  $EXIT_CODE:-0} -gt 128 ; then
+              X=1;
+            fi
+            cd ..
+          done
+          exit $X
+      - name: Test Revolt PHP
+        if: ${{ !cancelled() }}
+        run: |
+          git clone https://github.com/revoltphp/event-loop.git --depth=1
+          cd event-loop
+          git rev-parse HEAD
+          php /usr/bin/composer install --no-progress --ignore-platform-reqs
+          vendor/bin/phpunit || EXIT_CODE=$?
+          if  ${EXIT_CODE:-0} -gt 128 ; then
             exit 1
           fi
       - name: Test Symfony
-        if: matrix.branch.ref != 'PHP-8.0'
+        if: ${{ !cancelled() && !inputs.skip_symfony }}
         run: |
           git clone https://github.com/symfony/symfony.git --depth=1
           cd symfony
@@ -360,30 +612,28 @@
           php -r '$c = file_get_contents("src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php"); $c = str_replace("public function testSanitizeDeepNestedString()", "/** @group skip */\n    public function testSanitizeDeepNestedString()", $c); file_put_contents("src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php", $c);'
           # Buggy FFI test in Symfony, see https://github.com/symfony/symfony/issues/47668
           php -r '$c = file_get_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php"); $c = str_replace("public function testCastNonTrailingCharPointer()", "/** @group skip */\n    public function testCastNonTrailingCharPointer()", $c); file_put_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php", $c);'
-          export ASAN_OPTIONS=exitcode=139
           export SYMFONY_DEPRECATIONS_HELPER=maxtotal=999
           X=0
           for component in $(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n'); do
             php ./phpunit $component --exclude-group tty,benchmark,intl-data,transient --exclude-group skip || EXIT_CODE=$?
-            if  $EXIT_CODE -gt 128 ; then
+            if  ${EXIT_CODE:-0} -gt 128 ; then
               X=1;
             fi
           done
           exit $X
       - name: Test PHPUnit
-        if: always()
+        if: ${{ !cancelled() }}
         run: |
           git clone https://github.com/sebastianbergmann/phpunit.git --branch=main --depth=1
           cd phpunit
           git rev-parse HEAD
-          export ASAN_OPTIONS=exitcode=139
           php /usr/bin/composer install --no-progress --ignore-platform-reqs
           php ./phpunit || EXIT_CODE=$?
-          if  $EXIT_CODE -gt 128 ; then
+          if  ${EXIT_CODE:-0} -gt 128 ; then
             exit 1
           fi
       - name: 'Symfony Preloading'
-        if: matrix.branch.ref != 'PHP-8.0'
+        if: ${{ !cancelled() && !inputs.skip_symfony }}
         run: |
           php /usr/bin/composer create-project symfony/symfony-demo symfony_demo --no-progress --ignore-platform-reqs
           cd symfony_demo
@@ -391,12 +641,11 @@
           sed -i 's/PHP_SAPI/"cli-server"/g' var/cache/dev/App_KernelDevDebugContainer.preload.php
           php -d opcache.preload=var/cache/dev/App_KernelDevDebugContainer.preload.php public/index.php
       - name: Test Wordpress
-        if: always()
+        if: ${{ !cancelled() && !inputs.skip_wordpress }}
         run: |
           git clone https://github.com/WordPress/wordpress-develop.git wordpress --depth=1
           cd wordpress
           git rev-parse HEAD
-          export ASAN_OPTIONS=exitcode=139
           php /usr/bin/composer install --no-progress --ignore-platform-reqs
           cp wp-tests-config-sample.php wp-tests-config.php
           sed -i 's/youremptytestdbnamehere/test/g' wp-tests-config.php
@@ -412,23 +661,38 @@
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   OPCACHE_VARIATION:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
-    name: "${{ matrix.branch.name }}_OPCACHE_VARIATION"
-    runs-on: ubuntu-20.04
+    services:
+      mysql:
+        image: mysql:8.3
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_DATABASE: test
+          MYSQL_ROOT_PASSWORD: root
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: test
+      firebird:
+        image: jacobalberty/firebird
+        ports:
+          - 3050:3050
+        env:
+          ISC_PASSWORD: test
+          FIREBIRD_DATABASE: test.fdb
+          FIREBIRD_USER: test
+          FIREBIRD_PASSWORD: test
+    name: OPCACHE_VARIATION
+    runs-on: ubuntu-${{ inputs.ubuntu_version }}
     steps:
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: Create MSSQL container
         uses: ./.github/actions/setup-mssql
-      - name: Create Oracle container
-        uses: ./.github/actions/setup-oracle
       - name: apt
         uses: ./.github/actions/apt-x64
       - name: ./configure
@@ -488,19 +752,13 @@
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   MSAN:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
-    name: "${{ matrix.branch.name }}_MSAN"
-    runs-on: ubuntu-22.04
+    name: MSAN
+    runs-on: ubuntu-${{ inputs.ubuntu_version }}
     steps:
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: apt
         uses: ./.github/actions/apt-x64
       - name: ./configure
@@ -547,7 +805,8 @@
             --enable-werror \
             --enable-memory-sanitizer \
             --with-config-file-path=/etc \
-            --with-config-file-scan-dir=/etc/php.d
+            --with-config-file-scan-dir=/etc/php.d \
+            --enable-dl-test=shared
       - name: make
         run: make -j$(/usr/bin/nproc) >/dev/null
       - name: make install
@@ -585,21 +844,13 @@
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
   LIBMYSQLCLIENT:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
-        exclude:
-          - branch: { name: 'PHP-80', ref: 'PHP-8.0' }
-    name: "${{ matrix.branch.name }}_LIBMYSQLCLIENT"
-    runs-on: ubuntu-20.04
+    name: LIBMYSQLCLIENT
+    runs-on: ubuntu-${{ inputs.ubuntu_version }}
     steps:
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: apt
         run: |
           sudo apt-get update -y | true
@@ -610,33 +861,28 @@
           mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
           # Ensure local_infile tests can run.
           mysql -uroot -proot -e "SET GLOBAL local_infile = true"
-      # Does not support caching_sha2_auth :(
-      # - name: Build mysql-5.6
-      #  uses: ./.github/actions/build-libmysqlclient
-      #  with:
-      #    libmysql: mysql-5.6.49-linux-glibc2.12-x86_64.tar.gz
-      # - name: Test mysql-5.6
-      #   uses: ./.github/actions/test-libmysqlclient
-      - name: Build mysql-5.7
+      - name: Build mysql-8.0
         uses: ./.github/actions/build-libmysqlclient
         with:
-          libmysql: mysql-5.7.44-linux-glibc2.12-x86_64.tar.gz
-          withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
-      - name: Test mysql-5.7
+          configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }}
+          libmysql: mysql-8.0.37-linux-glibc2.28-x86_64.tar.xz
+          withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
+      - name: Test mysql-8.0
         uses: ./.github/actions/test-libmysqlclient
         with:
-          withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
-      - name: Build mysql-8.0
+          withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
+      - name: Build mysql-8.4
+        if: ${{ !inputs.libmysqlclient_with_mysqli }}
         uses: ./.github/actions/build-libmysqlclient
         with:
-          # FIXME: There are new warnings
-          # configurationParameters: --enable-werror
-          libmysql: mysql-8.0.33-linux-glibc2.12-x86_64.tar.xz
-          withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
-      - name: Test mysql-8.0
+          configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }}
+          libmysql: mysql-8.4.0-linux-glibc2.28-x86_64.tar.xz
+          withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
+      - name: Test mysql-8.4
+        if: ${{ !inputs.libmysqlclient_with_mysqli }}
         uses: ./.github/actions/test-libmysqlclient
         with:
-          withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
+          withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
       - name: Notify Slack
@@ -644,36 +890,171 @@
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
+  PECL:
+    if: inputs.branch == 'master'
+    runs-on: ubuntu-22.04
+    env:
+      CC: ccache gcc
+      CXX: ccache g++
+    steps:
+      - name: git checkout PHP
+        uses: actions/checkout@v4
+        with:
+          path: php
+          ref: ${{ inputs.branch }}
+      - name: git checkout apcu
+        uses: actions/checkout@v4
+        with:
+          repository: krakjoe/apcu
+          path: apcu
+      - name: git checkout imagick
+        uses: actions/checkout@v4
+        with:
+          repository: Imagick/imagick
+          path: imagick
+      - name: git checkout memcached
+        uses: actions/checkout@v4
+        with:
+          repository: php-memcached-dev/php-memcached
+          path: memcached
+      - name: git checkout redis
+        uses: actions/checkout@v4
+        with:
+          repository: phpredis/phpredis
+          path: redis
+      - name: git checkout xdebug
+        if: false
+        uses: actions/checkout@v4
+        with:
+          repository: xdebug/xdebug
+          path: xdebug
+      - name: git checkout yaml
+        uses: actions/checkout@v4
+        with:
+          repository: php/pecl-file_formats-yaml
+          path: yaml
+      - name: apt
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends \
+            ccache \
+            libmemcached-dev \
+            bison \
+            re2c
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: "${{github.job}}-${{hashFiles('php/main/php_version.h')}}"
+          append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
+      - name: build PHP
+        run: |
+          cd php
+          ./buildconf --force
+          ./configure \
+            --enable-option-checking=fatal \
+            --prefix=/opt/php \
+            --enable-cli \
+            --disable-all \
+            --enable-session \
+            --enable-werror
+          make -j$(/usr/bin/nproc)
+          sudo make install
+      - name: build apcu
+        run: |
+          cd apcu
+          /opt/php/bin/phpize
+          ./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
+          make -j$(/usr/bin/nproc)
+      - name: build imagick
+        run: |
+          cd imagick
+          /opt/php/bin/phpize
+          ./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
+          make -j$(/usr/bin/nproc)
+      - name: build memcached
+        run: |
+          cd memcached
+          /opt/php/bin/phpize
+          ./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
+          make -j$(/usr/bin/nproc)
+      - name: build redis
+        run: |
+          cd redis
+          /opt/php/bin/phpize
+          ./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
+          make -j$(/usr/bin/nproc)
+      - name: build xdebug
+        if: false
+        run: |
+          cd xdebug
+          /opt/php/bin/phpize
+          ./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
+          make -j$(/usr/bin/nproc)
+      - name: build yaml
+        run: |
+          cd yaml
+          /opt/php/bin/phpize
+          ./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
+          make -j$(/usr/bin/nproc)
+      - name: Notify Slack
+        if: failure()
+        uses: ./.github/actions/notify-slack
+        with:
+          token: ${{ secrets.ACTION_MONITORING_SLACK }}
   WINDOWS:
-    needs: GENERATE_MATRIX
-    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
     strategy:
       fail-fast: false
       matrix:
-        include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.windows-matrix-include) }}
-    name: "${{ matrix.branch.name }}_WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: windows-2019
+        include:
+          - x64: true
+            zts: true
+            opcache: true
+            asan: false
+          - x64: false
+            zts: false
+            opcache: false
+            asan: false
+          - x64: true
+            zts: true
+            opcache: true
+            asan: true
+            branch: 'master'
+            timeout: 120
+    name: "WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || ''}}"
+    runs-on: windows-${{ inputs.windows_version }}
     env:
       PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
       PHP_BUILD_OBJ_DIR: C:\obj
       PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
       PHP_BUILD_SDK_BRANCH: php-sdk-2.3.0
-      PHP_BUILD_CRT: vs16
+      PHP_BUILD_CRT: ${{ inputs.windows_version == '2022' && 'vs17' || 'vs16' }}
       PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
       THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
       INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"
       PARALLEL: -j2
       OPCACHE: "${{ matrix.opcache && '1' || '0' }}"
+      ASAN: "${{ matrix.asan && '1' || '0' }}"
     steps:
       - name: git config
         run: git config --global core.autocrlf false && git config --global core.eol lf
       - name: git checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ matrix.branch.ref }}
+          ref: ${{ inputs.branch }}
       - name: Setup
         uses: ./.github/actions/setup-windows
       - name: Build
         run: .github/scripts/windows/build.bat
       - name: Test
         run: .github/scripts/windows/test.bat
+  FREEBSD:
+    name: FREEBSD
+    runs-on: ubuntu-latest
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
+      - name: FreeBSD
+        uses: ./.github/actions/freebsd

php-8.2.23.tar.xz/.github/workflows/push.yml -> php-8.2.28.tar.xz/.github/workflows/push.yml Changed

@@ -34,6 +34,7 @@
       - .circleci/**
     branches:
       - '**'
+  workflow_dispatch: ~
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.url || github.run_id }}
   cancel-in-progress: true
@@ -43,6 +44,22 @@
 jobs:
   LINUX_X64:
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
+    services:
+      mysql:
+        image: mysql:8.3
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_DATABASE: test
+          MYSQL_ROOT_PASSWORD: root
+      postgres:
+        image: postgres
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: test
     strategy:
       fail-fast: false
       matrix:
@@ -52,7 +69,7 @@
           - debug: false
             zts: true
     name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: git checkout
         uses: actions/checkout@v4
@@ -142,7 +159,7 @@
             -d opcache.enable_cli=1
   MACOS_DEBUG_NTS:
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - name: git checkout
         uses: actions/checkout@v4
@@ -200,3 +217,11 @@
         run: .github/scripts/windows/build.bat
       - name: Test
         run: .github/scripts/windows/test.bat
+  FREEBSD:
+    name: FREEBSD
+    runs-on: ubuntu-latest
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v4
+      - name: FreeBSD
+        uses: ./.github/actions/freebsd

php-8.2.28.tar.xz/.github/workflows/root.yml Added

@@ -0,0 +1,64 @@
+name: Nightly
+on:
+  schedule:
+   - cron: "0 1 * * *"
+  workflow_dispatch: ~
+permissions:
+  contents: read
+jobs:
+  GENERATE_MATRIX:
+    name: Generate Matrix
+    if: github.repository == 'php/php-src' || github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    outputs:
+      branches: ${{ steps.set-matrix.outputs.branches }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          # Set fetch-depth to 0 to clone the full repository
+          # including all branches. This is required to find
+          # the correct commit hashes.
+          fetch-depth: 0
+      - name: Grab the commit mapping
+        uses: actions/cache@v4
+        with:
+          path: branch-commit-cache.json
+          # The cache key needs to change every time for the
+          # cache to be updated after this job finishes.
+          key: nightly-${{ github.run_id }}-${{ github.run_attempt }}
+          restore-keys: |
+            nightly-
+      - name: Generate Matrix
+        id: set-matrix
+        run: php .github/nightly_matrix.php "${{ github.event_name }}" "${{ github.run_attempt }}" "${{ github.head_ref || github.ref_name }}"
+      - name: Notify Slack
+        if: failure()
+        uses: ./.github/actions/notify-slack
+        with:
+          token: ${{ secrets.ACTION_MONITORING_SLACK }}
+  NIGHTLY:
+    needs: GENERATE_MATRIX
+    name: ${{ matrix.branch.ref }}
+    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
+    uses: ./.github/workflows/nightly.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
+    with:
+      asan_ubuntu_version: ${{
+        (((matrix.branch.version0 == 8 && matrix.branch.version1 >= 5) || matrix.branch.version0 >= 9) && '24.04')
+        || '22.04' }}
+      branch: ${{ matrix.branch.ref }}
+      community_verify_type_inference: ${{ (matrix.branch.version0 == 8 && matrix.branch.version1 >= 4) || matrix.branch.version0 >= 9 }}
+      libmysqlclient_with_mysqli: ${{ (matrix.branch.version0 == 8 && matrix.branch.version1 == 1) }}
+      run_alpine: ${{ (matrix.branch.version0 == 8 && matrix.branch.version1 >= 4) || matrix.branch.version0 >= 9 }}
+      run_linux_ppc64: ${{ (matrix.branch.version0 == 8 && matrix.branch.version1 >= 4) || matrix.branch.version0 >= 9 }}
+      run_macos_arm64: ${{ (matrix.branch.version0 == 8 && matrix.branch.version1 >= 4) || matrix.branch.version0 >= 9 }}
+      ubuntu_version: ${{
+        (((matrix.branch.version0 == 8 && matrix.branch.version1 >= 5) || matrix.branch.version0 >= 9) && '24.04')
+        || '22.04' }}
+      windows_version: ${{ ((matrix.branch.version0 == 8 && matrix.branch.version1 >= 4) || matrix.branch.version0 >= 9) && '2022' || '2019' }}
+      skip_symfony: ${{ matrix.branch.version0 == 8 && matrix.branch.version1 == 1 }}
+      skip_wordpress: ${{ matrix.branch.version0 == 8 && matrix.branch.version1 == 1 }}
+    secrets: inherit

php-8.2.28.tar.xz/.github/workflows/windows-builds.yml Added

php-8.2.23.tar.xz/EXTENSIONS -> php-8.2.28.tar.xz/EXTENSIONS Changed

php-8.2.23.tar.xz/NEWS -> php-8.2.28.tar.xz/NEWS Changed

@@ -1,5 +1,461 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+13 Mar 2025, PHP 8.2.28
+
+- Core:
+  . Fixed bug GH-17211 (observer segfault on function loaded with dl()).
+    (Arnaud)
+
+- LibXML:
+  . Fixed GHSA-wg4p-4hqh-c3g9 (Reocurrence of #72714). (nielsdos)
+  . Fixed GHSA-p3x9-6h7p-cgfc (libxml streams use wrong `content-type` header
+    when requesting a redirected resource). (CVE-2025-1219) (timwolla)
+
+- Streams:
+  . Fixed GHSA-hgf54-96fm-v528 (Stream HTTP wrapper header check might omit
+    basic auth header). (CVE-2025-1736) (Jakub Zelenka)
+  . Fixed GHSA-52jp-hrpf-2jff (Stream HTTP wrapper truncate redirect location
+    to 1024 bytes). (CVE-2025-1861) (Jakub Zelenka)
+  . Fixed GHSA-pcmh-g36c-qc44 (Streams HTTP wrapper does not fail for headers
+    without colon). (CVE-2025-1734) (Jakub Zelenka)
+  . Fixed GHSA-v8xr-gpvj-cx9g (Header parser of `http` stream wrapper does not
+    handle folded headers). (CVE-2025-1217) (Jakub Zelenka)
+
+- Windows:
+  . Fixed phpize for Windows 11 (24H2). (bwoebi)
+
+19 Dec 2024, PHP 8.2.27
+
+- Calendar:
+  . Fixed jdtogregorian overflow. (David Carlier)
+  . Fixed cal_to_jd julian_days argument overflow. (David Carlier)
+
+- COM:
+  . Fixed bug GH-16991 (Getting typeinfo of non DISPATCH variant segfaults).
+    (cmb)
+
+- Core:
+  . Fail early in *nix configuration build script. (hakre)
+  . Fixed bug GH-16727 (Opcache bad signal 139 crash in ZTS bookworm
+    (frankenphp)). (nielsdos)
+  . Fixed bug GH-16799 (Assertion failure at Zend/zend_vm_execute.h:7469).
+    (nielsdos)
+  . Fixed bug GH-16630 (UAF in lexer with encoding translation and heredocs).
+    (nielsdos)
+  . Fix is_zend_ptr() huge block comparison. (nielsdos)
+  . Fixed potential OOB read in zend_dirname() on Windows. (cmb)
+
+- Curl:
+  . Fix various memory leaks in curl mime handling. (nielsdos)
+
+- FPM:
+  . Fixed GH-16432 (PHP-FPM 8.2 SIGSEGV in fpm_get_status). (Jakub Zelenka)
+
+- GD:
+  . Fixed GH-16776 (imagecreatefromstring overflow). (David Carlier)
+
+- GMP:
+  . Revert gmp_pow() overly restrictive overflow checks.
+    (David Carlier)
+
+- Hash:
+  . Fixed GH-16711: Segfault in mhash(). (Girgias)
+
+- Opcache:
+  . Fixed bug GH-16770 (Tracing JIT type mismatch when returning UNDEF).
+    (nielsdos, Dmitry)
+  . Fixed bug GH-16851 (JIT_G(enabled) not set correctly on other threads).
+    (dktapps)
+  . Fixed bug GH-16902 (Set of opcache tests fail zts+aarch64). (nielsdos)
+
+- OpenSSL:
+  . Prevent unexpected array entry conversion when reading key. (nielsdos)
+  . Fix various memory leaks related to openssl exports. (nielsdos)
+  . Fix memory leak in php_openssl_pkey_from_zval(). (nielsdos)
+
+- PDO:
+  . Fixed memory leak of `setFetchMode()`. (SakiTakamachi)
+
+- Phar:
+  . Fixed bug GH-16695 (phar:// tar parser and zero-length file header blocks).
+    (nielsdos, Hans Krentel)
+
+- PHPDBG:
+  . Fixed bug GH-15208 (Segfault with breakpoint map and phpdbg_clear()).
+    (nielsdos)
+
+- SAPI:
+  . Fixed bug GH-16998 (UBSAN warning in rfc1867). (nielsdos)
+
+- SimpleXML:
+  . Fixed bug GH-16808 (Segmentation fault in RecursiveIteratorIterator
+    ->current() with a xml element input). (nielsdos)
+
+- SNMP:
+  . Fixed bug GH-16959 (snmget modifies the object_id array).
+    (David Carlier)
+
+- Standard:
+  . Fixed bug GH-16905 (Internal iterator functions can't handle UNDEF
+    properties). (nielsdos)
+
+- Streams:
+  . Fixed network connect poll interuption handling. (Jakub Zelenka)
+
+- Windows:
+  . Fixed bug GH-16849 (Error dialog causes process to hang). (cmb)
+
+21 Nov 2024, PHP 8.2.26
+
+- CLI:
+  . Fixed bug GH-16373 (Shebang is not skipped for router script in cli-server
+    started through shebang). (ilutov)
+  . Fixed bug GHSA-4w77-75f9-2c8w (Heap-Use-After-Free in sapi_read_post_data
+    Processing in CLI SAPI Interface). (nielsdos)
+
+- COM:
+  . Fixed out of bound writes to SafeArray data. (cmb)
+
+- Core:
+  . Fixed bug GH-16168 (php 8.1 and earlier crash immediately when compiled
+    with Xcode 16 clang on macOS 15). (nielsdos)
+  . Fixed bug GH-16371 (Assertion failure in Zend/zend_weakrefs.c:646). (Arnaud)
+  . Fixed bug GH-16515 (Incorrect propagation of ZEND_ACC_RETURN_REFERENCE for
+    call trampoline). (ilutov)
+  . Fixed bug GH-16509 (Incorrect line number in function redeclaration error).
+    (ilutov)
+  . Fixed bug GH-16508 (Incorrect line number in inheritance errors of delayed
+    early bound classes). (ilutov)
+  . Fixed bug GH-16648 (Use-after-free during array sorting). (ilutov)
+  . Fixed bug GH-15915 (overflow with a high value for precision INI).
+    (David Carlier / cmb)
+
+- Curl:
+  . Fixed bug GH-16302 (CurlMultiHandle holds a reference to CurlHandle if
+    curl_multi_add_handle fails). (timwolla)
+
+- Date:
+  . Fixed bug GH-16454 (Unhandled INF in date_sunset() with tiny $utcOffset).
+    (cmb)
+  . Fixed bug GH-16037 (Assertion failure in ext/date/php_date.c). (Derick)
+  . Fixed bug GH-14732 (date_sun_info() fails for non-finite values). (cmb)
+
+- DBA:
+  . Fixed bug GH-16390 (dba_open() can segfault for "pathless" streams). (cmb)
+
+- DOM:
+  . Fixed bug GH-16316 (DOMXPath breaks when not initialized properly).
+    (nielsdos)
+  . Fixed bug GH-16473 (dom_import_simplexml stub is wrong). (nielsdos)
+  . Fixed bug GH-16533 (Segfault when adding attribute to parent that is not
+    an element). (nielsdos)
+  . Fixed bug GH-16535 (UAF when using document as a child). (nielsdos)
+  . Fixed bug GH-16593 (Assertion failure in DOM->replaceChild). (nielsdos)
+  . Fixed bug GH-16595 (Another UAF in DOM -> cloneNode). (nielsdos)
+
+- EXIF:
+  . Fixed bug GH-16409 (Segfault in exif_thumbnail when not dealing with a
+    real file). (nielsdos, cmb)
+
+- FFI:
+  . Fixed bug GH-16397 (Segmentation fault when comparing FFI object).
+    (nielsdos)
+
+- Filter:
+  . Fixed bug GH-16523 (FILTER_FLAG_HOSTNAME accepts ending hyphen). (cmb)
+
+- FPM:
+  . Fixed bug GH-16628 (FPM logs are getting corrupted with this log
+    statement). (nielsdos)
+
+- GD:
+  . Fixed bug GH-16334 (imageaffine overflow on matrix elements).
+    (David Carlier)
+  . Fixed bug GH-16427 (Unchecked libavif return values). (cmb)
+  . Fixed bug GH-16559 (UBSan abort in ext/gd/libgd/gd_interpolation.c:1007).
+    (nielsdos)
+
+- GMP:
+  . Fixed bug GH-16411 (gmp_export() can cause overflow). (cmb)
+  . Fixed bug GH-16501 (gmp_random_bits() can cause overflow).
+    (David Carlier)
+  . Fixed segfaults and other issues related to operator overloading with
+    GMP objects. (Girgias)
+
+- LDAP:
+  . Fixed bug GHSA-g665-fm4p-vhff (OOB access in ldap_escape). (CVE-2024-8932)
+    (nielsdos)
+
+- MBstring:
+  . Fixed bug GH-16361 (mb_substr overflow on start/length arguments).
+    (David Carlier)
+
+- MySQLnd:
+  . Fixed bug GHSA-h35g-vwh6-m678 (Leak partial content of the heap through
+    heap buffer over-read). (CVE-2024-8929) (Jakub Zelenka)
+
+- OpenSSL:
+  . Fixed bug GH-16357 (openssl may modify member types of certificate arrays).
+    (cmb)
+  . Fixed bug GH-16433 (Large values for openssl_csr_sign() $days overflow).
+    (cmb)
+  . Fix various memory leaks on error conditions in openssl_x509_parse().
+    (nielsdos)
+
+- PDO DBLIB:
+  . Fixed bug GHSA-5hqh-c84r-qjcv (Integer overflow in the dblib quoter causing
+    OOB writes). (CVE-2024-11236) (nielsdos)
+
+- PDO Firebird:
+  . Fixed bug GHSA-5hqh-c84r-qjcv (Integer overflow in the firebird quoter
+    causing OOB writes). (CVE-2024-11236) (nielsdos)
+
+- PDO ODBC:
+  . Fixed bug GH-16450 (PDO_ODBC can inject garbage into field values). (cmb)
+
+- Phar:
+  . Fixed bug GH-16406 (Assertion failure in ext/phar/phar.c:2808). (nielsdos)
+
+- PHPDBG:
+  . Fixed bug GH-16174 (Empty string is an invalid expression for ev). (cmb)
+
+- Reflection:
+  . Fixed bug GH-16601 (Memory leak in Reflection constructors). (nielsdos)
+
+- Session:
+  . Fixed bug GH-16385 (Unexpected null returned by session_set_cookie_params).
+    (nielsdos)
+  . Fixed bug GH-16290 (overflow on cookie_lifetime ini value).
+    (David Carlier)
+
+- SOAP:
+  . Fixed bug GH-16429 (Segmentation fault access null pointer in SoapClient).
+    (nielsdos)
+
+- Sockets:
+  . Fixed bug with overflow socket_recvfrom $length argument. (David Carlier)
+
+- SPL:
+  . Fixed bug GH-16337 (Use-after-free in SplHeap). (nielsdos)
+  . Fixed bug GH-16464 (Use-after-free in SplDoublyLinkedList::offsetSet()).
+    (ilutov)
+  . Fixed bug GH-16479 (Use-after-free in SplObjectStorage::setInfo()). (ilutov)
+  . Fixed bug GH-16478 (Use-after-free in SplFixedArray::unset()). (ilutov)
+  . Fixed bug GH-16588 (UAF in Observer->serialize). (nielsdos)
+  . Fix GH-16477 (Segmentation fault when calling __debugInfo() after failed
+    SplFileObject::__constructor). (Girgias)
+  . Fixed bug GH-16589 (UAF in SplDoublyLinked->serialize()). (nielsdos)
+  . Fixed bug GH-14687 (segfault on SplObjectIterator instance).
+    (David Carlier)
+  . Fixed bug GH-16604 (Memory leaks in SPL constructors). (nielsdos)
+  . Fixed bug GH-16646 (UAF in ArrayObject::unset() and
+    ArrayObject::exchangeArray()). (ilutov)
+
+- Standard:
+  . Fixed bug GH-16293 (Failed assertion when throwing in assert() callback with
+    bail enabled). (ilutov)
+
+- Streams:
+  . Fixed bug GHSA-c5f2-jwm7-mmq2 (Configuring a proxy in a stream context
+    might allow for CRLF injection in URIs). (CVE-2024-11234) (Jakub Zelenka)
+  . Fixed bug GHSA-r977-prxv-hc43 (Single byte overread with
+    convert.quoted-printable-decode filter). (CVE-2024-11233) (nielsdos)
+
+- SysVMsg:
+  . Fixed bug GH-16592 (msg_send() crashes when a type does not properly
+    serialized). (David Carlier / cmb)
+
+- SysVShm:
+  . Fixed bug GH-16591 (Assertion error in shm_put_var). (nielsdos, cmb)
+
+- XMLReader:
+  . Fixed bug GH-16292 (Segmentation fault in ext/xmlreader/php_xmlreader.c).
+    (nielsdos)
+
+- Zlib:
+  . Fixed bug GH-16326 (Memory management is broken for bad dictionaries.)
+    (cmb)
+
+24 Oct 2024, PHP 8.2.25
+
+- Calendar:
+  . Fixed GH-16240: jdtounix overflow on argument value. (David Carlier)
+  . Fixed GH-16241: easter_days/easter_date overflow on year argument.
+    (David Carlier)
+  . Fixed GH-16263: jddayofweek overflow. (cmb)
+  . Fixed GH-16234: jewishtojd overflow. (nielsdos)
+
+- CLI:
+  . Fixed bug GH-16137: duplicate http headers when set several times by
+    the client. (David Carlier)
+
+- Core:
+  . Fixed bug GH-15712: zend_strtod overflow with precision INI set on
+    large value. (David Carlier)
+  . Fixed bug GH-15905 (Assertion failure for TRACK_VARS_SERVER). (cmb)
+  . Fixed bug GH-15907 (Failed assertion when promoting Serialize deprecation to
+    exception). (ilutov)
+  . Fixed bug GH-15851 (Segfault when printing backtrace during cleanup of
+    nested generator frame). (ilutov)
+  . Fixed bug GH-15866 (Core dumped in Zend/zend_generators.c). (Arnaud)
+  . Fixed bug GH-16188 (Assertion failure in Zend/zend_exceptions.c). (Arnaud)
+  . Fixed bug GH-16233 (Observer segfault when calling user function in
+    internal function via trampoline). (nielsdos)
+
+- Date:
+  . Fixed bug GH-15582: Crash when not calling parent constructor of
+    DateTimeZone. (Derick)
+  . Fixed regression where signs after the first one were ignored while parsing
+    a signed integer, with the DateTimeInterface::modify() function. (Derick)
+
+- DOM:
+  . Fixed bug GH-16039 (Segmentation fault (access null pointer) in
+    ext/dom/parentnode/tree.c). (nielsdos)
+  . Fixed bug GH-16151 (Assertion failure in ext/dom/parentnode/tree.c).
+    (nielsdos)
+
+- GD:
+  . Fixed bug GH-16232 (bitshift overflow on wbmp file content reading /
+    fix backport from upstream). (David Carlier)
+  . Fixed bug GH-12264 (overflow/underflow on imagerotate degrees value)
+    (David Carlier)
+  . Fixed bug GH-16274 (imagescale underflow on RBG channels /
+    fix backport from upstream). (David Carlier)
+
+- LDAP:
+  . Fixed bug GH-16032 (Various NULL pointer dereferencements in
+    ldap_modify_batch()). (Girgias)
+  . Fixed bug GH-16101 (Segfault in ldap_list(), ldap_read(), and ldap_search()
+    when LDAPs array is not a list). (Girgias)
+  . Fix GH-16132 (php_ldap_do_modify() attempts to free pointer not allocated
+    by ZMM.). (Girgias)
+  . Fix GH-16136 (Memory leak in php_ldap_do_modify() when entry is not a
+    proper dictionary). (Girgias)
+
+- MBString:
+  . Fixed bug GH-16261 (Reference invariant broken in mb_convert_variables()).
+    (nielsdos)
+
+- OpenSSL:
+  . Fixed stub for openssl_csr_new. (Jakub Zelenka)
+
+- PCRE:
+  . Fixed bug GH-16189 (underflow on offset argument). (David Carlier)
+  . Fixed bug GH-16184 (UBSan address overflowed in ext/pcre/php_pcre.c).
+    (nielsdos)
+
+- PHPDBG:
+  . Fixed bug GH-15901 (phpdbg: Assertion failure on i funcs). (cmb)
+  . Fixed bug GH-16181 (phpdbg: exit in exception handler reports fatal error).
+    (cmb)
+
+- Reflection:
+  . Fixed bug GH-16187 (Assertion failure in ext/reflection/php_reflection.c).
+    (DanielEScherzer)
+
+- SAPI:
+  . Fixed bug GH-15395 (php-fpm: zend_mm_heap corrupted with cgi-fcgi request).
+    (Jakub Zelenka, David Carlier)
+
+- SimpleXML:
+  . Fixed bug GH-15837 (Segmentation fault in ext/simplexml/simplexml.c).
+    (nielsdos)
+
+- Sockets:
+  . Fixed bug GH-16267 (socket_strerror overflow on errno argument).
+    (David Carlier)
+
+- SOAP:
+  . Fixed bug #62900 (Wrong namespace on xsd import error message). (nielsdos)
+  . Fixed bug GH-16237 (Segmentation fault when cloning SoapServer). (nielsdos)
+  . Fix Soap leaking http_msg on error. (nielsdos)
+  . Fixed bug GH-16256 (Assertion failure in ext/soap/php_encoding.c:460).
+    (nielsdos)
+  . Fixed bug GH-16259 (Soap segfault when classmap instantiation fails).
+    (nielsdos)
+
+- Standard:
+  . Fixed bug GH-15613 (overflow on unpack call hex string repeater).
+    (David Carlier)
+  . Fixed bug GH-15937 (overflow on stream timeout option value).
+    (David Carlier)
+  . Fixed bug GH-16053 (Assertion failure in Zend/zend_hash.c). (Arnaud)
+
+- Streams:
+  . Fixed bugs GH-15908 and GH-15026 (leak / assertion failure in streams.c).
+    (nielsdos)
+  . Fixed bug GH-15980 (Signed integer overflow in main/streams/streams.c).
+    (cmb)
+
+- TSRM:
+  . Prevent closing of unrelated handles. (cmb)
+
+- XML:
+  . Fixed bug GH-15868 (Assertion failure in xml_parse_into_struct after
+    exception). (nielsdos)
+
+26 Sep 2024, PHP 8.2.24
+
+- CGI:
+  . Fixed bug GHSA-p99j-rfp4-xqvq (Bypass of CVE-2024-4577, Parameter Injection
+    Vulnerability). (CVE-2024-8926) (nielsdos)
+  . Fixed bug GHSA-94p6-54jq-9mwp (cgi.force_redirect configuration is
+    bypassable due to the environment variable collision). (CVE-2024-8927)
+    (nielsdos)
+
+- Core:
+  . Fixed bug GH-15408 (MSan false-positve on zend_max_execution_timer).
+    (zeriyoshi)
+  . Fixed bug GH-15515 (Configure error grep illegal option q). (Peter Kokot)
+  . Fixed bug GH-15514 (Configure error: genif.sh: syntax error). (Peter Kokot)
+  . Fixed bug GH-15565 (--disable-ipv6 during compilation produces error
+    EAI_SYSTEM not found). (nielsdos)
+  . Fixed bug GH-15587 (CRC32 API build error on arm 32-bit).
+    (Bernd Kuhls, Thomas Petazzoni)
+  . Fixed bug GH-15330 (Do not scan generator frames more than once). (Arnaud)
+  . Fixed uninitialized lineno in constant AST of internal enums. (ilutov)
+
+- Curl:
+  . FIxed bug GH-15547 (curl_multi_select overflow on timeout argument).
+    (David Carlier)
+
+- DOM:
+  . Fixed bug GH-15551 (Segmentation fault (access null pointer) in
+    ext/dom/xml_common.h). (nielsdos)
+
+- Fileinfo:
+  . Fixed bug GH-15752 (Incorrect error message for finfo_file
+    with an empty filename argument). (DanielEScherzer)
+
+- FPM:
+  . Fixed bug GHSA-865w-9rf3-2wh5 (Logs from childrens may be altered).
+    (CVE-2024-9026) (Jakub Zelenka)
+
+- MySQLnd:
+  . Fixed bug GH-15432 (Heap corruption when querying a vector). (cmb,
+    Kamil Tekiela)
+
+- Opcache:
+  . Fixed bug GH-15661 (Access null pointer in
+    Zend/Optimizer/zend_inference.c). (nielsdos)
+  . Fixed bug GH-15658 (Segmentation fault in Zend/zend_vm_execute.h).
+    (nielsdos)
+
+- SAPI:
+  . Fixed bug GHSA-9pqp-7h25-4f32 (Erroneous parsing of multipart form data).
+    (CVE-2024-8925) (Arnaud)
+
+- SOAP:
+  . Fixed bug #73182 (PHP SOAPClient does not support stream context HTTP
+    headers in array form). (nielsdos)
+
+- Standard:
+  . Fixed bug GH-15552 (Signed integer overflow in ext/standard/scanf.c). (cmb)
+
+- Streams:
+  . Fixed bug GH-15628 (php_stream_memory_get_buffer() not zero-terminated).
+    (cmb)
+
 29 Aug 2024, PHP 8.2.23
 
 - Core:
@@ -51,6 +507,10 @@
     (zend_hash_num_elements() Zend/zend_hash.h)). (nielsdos)
   . Fixed bug GH-15210 use-after-free on watchpoint allocations. (nielsdos)
 
+- Random:
+  . Fixed part of bug GH-15381, checking getrandom availability on solaris.
+    (David Carlier)
+
 - Soap:
   . Fixed bug #55639 (Digest autentication dont work). (nielsdos)
   . Fix SoapFault property destruction. (nielsdos)
@@ -60,6 +520,7 @@
 - Standard:
   . Fix passing non-finite timeout values in stream functions. (nielsdos)
   . Fixed GH-14780 p(f)sockopen timeout overflow. (David Carlier)
+  . Fixed GH-15653 overflow on fgetcsv length parameter. (David Carlier)
 
 - Streams:
   . Fixed bug GH-15028 (Memory leak in ext/phar/stream.c). (nielsdos)

php-8.2.23.tar.xz/TSRM/tsrm_win32.c -> php-8.2.28.tar.xz/TSRM/tsrm_win32.c Changed

php-8.2.23.tar.xz/Zend/Optimizer/zend_inference.c -> php-8.2.28.tar.xz/Zend/Optimizer/zend_inference.c Changed

php-8.2.28.tar.xz/Zend/tests/generators/gh15851.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh15330-001.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh15330-002.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh15330-003.phpt Added

@@ -0,0 +1,57 @@
+--TEST--
+GH-15330 003: Do not scan generator frames more than once
+--FILE--
+<?php
+
+class It implements \IteratorAggregate
+{
+    public function getIterator(): \Generator
+    {
+        yield 'foo';
+        Fiber::suspend();
+        var_dump("not executed");
+    }
+}
+
+class Canary {
+    public function __construct(public mixed $value) {}
+    public function __destruct() {
+        var_dump(__METHOD__);
+    }
+}
+
+function f($canary) {
+    var_dump(yield from new It());
+}
+
+$canary = new Canary(null);
+
+$iterable = f($canary);
+
+$fiber = new Fiber(function () use ($iterable, $canary) {
+    var_dump($canary, $iterable->current());
+    $iterable->next();
+    var_dump("not executed");
+});
+
+$canary->value = $fiber;
+
+$fiber->start();
+
+$iterable->current();
+
+$fiber = $iterable = $canary = null;
+
+gc_collect_cycles();
+
+?>
+==DONE==
+--EXPECTF--
+object(Canary)#%d (1) {
+  "value"=>
+  object(Fiber)#%d (0) {
+  }
+}
+string(3) "foo"
+string(18) "Canary::__destruct"
+==DONE==

php-8.2.28.tar.xz/Zend/tests/gh15330-004.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh15330-005.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh15330-006.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh15712.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh15866.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh15907.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh16188.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh16293_001.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh16293_002.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh16371.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh16508.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh16509.inc Added

php-8.2.28.tar.xz/Zend/tests/gh16509.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh16515.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh16630.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh16648.phpt Added

php-8.2.28.tar.xz/Zend/tests/gh16799.phpt Added

php-8.2.23.tar.xz/Zend/zend.c -> php-8.2.28.tar.xz/Zend/zend.c Changed

@@ -705,6 +705,7 @@
 static void compiler_globals_ctor(zend_compiler_globals *compiler_globals) /* {{{ */
 {
 	compiler_globals->compiled_filename = NULL;
+	compiler_globals->zend_lineno = 0;
 
 	compiler_globals->function_table = (HashTable *) malloc(sizeof(HashTable));
 	zend_hash_init(compiler_globals->function_table, 1024, NULL, ZEND_FUNCTION_DTOR, 1);
@@ -775,6 +776,7 @@
 	zend_init_call_trampoline_op();
 	memset(&executor_globals->trampoline, 0, sizeof(zend_op_array));
 	executor_globals->capture_warnings_during_sccp = 0;
+	executor_globals->user_error_handler_error_reporting = 0;
 	ZVAL_UNDEF(&executor_globals->user_error_handler);
 	ZVAL_UNDEF(&executor_globals->user_exception_handler);
 	executor_globals->in_autoload = NULL;
@@ -801,6 +803,8 @@
 	executor_globals->record_errors = false;
 	executor_globals->num_errors = 0;
 	executor_globals->errors = NULL;
+	executor_globals->filename_override = NULL;
+	executor_globals->lineno_override = -1;
 #ifdef ZEND_MAX_EXECUTION_TIMERS
 	executor_globals->pid = 0;
 	executor_globals->oldact = (struct sigaction){0};

php-8.2.23.tar.xz/Zend/zend.h -> php-8.2.28.tar.xz/Zend/zend.h Changed

php-8.2.23.tar.xz/Zend/zend_API.c -> php-8.2.28.tar.xz/Zend/zend_API.c Changed

php-8.2.23.tar.xz/Zend/zend_alloc.c -> php-8.2.28.tar.xz/Zend/zend_alloc.c Changed

php-8.2.23.tar.xz/Zend/zend_builtin_functions.c -> php-8.2.28.tar.xz/Zend/zend_builtin_functions.c Changed

php-8.2.23.tar.xz/Zend/zend_closures.c -> php-8.2.28.tar.xz/Zend/zend_closures.c Changed

php-8.2.23.tar.xz/Zend/zend_compile.c -> php-8.2.28.tar.xz/Zend/zend_compile.c Changed

@@ -1072,7 +1072,7 @@
 		zend_error_noreturn(error_level, "Cannot redeclare %s() (previously declared in %s:%d)",
 					op_array ? ZSTR_VAL(op_array->function_name) : ZSTR_VAL(old_function->common.function_name),
 					ZSTR_VAL(old_function->op_array.filename),
-					old_function->op_array.opcodes0.lineno);
+					old_function->op_array.line_start);
 	} else {
 		zend_error_noreturn(error_level, "Cannot redeclare %s()",
 			op_array ? ZSTR_VAL(op_array->function_name) : ZSTR_VAL(old_function->common.function_name));
@@ -1997,7 +1997,7 @@
 	}
 
 	/* Strip trailing slashes */
-	while (end >= path && IS_SLASH_P(end)) {
+	while (end >= path && IS_SLASH_P_EX(end, end == path)) {
 		end--;
 	}
 	if (end < path) {
@@ -2008,7 +2008,7 @@
 	}
 
 	/* Strip filename */
-	while (end >= path && !IS_SLASH_P(end)) {
+	while (end >= path && !IS_SLASH_P_EX(end, end == path)) {
 		end--;
 	}
 	if (end < path) {
@@ -2019,7 +2019,7 @@
 	}
 
 	/* Strip slashes which came before the file name */
-	while (end >= path && IS_SLASH_P(end)) {
+	while (end >= path && IS_SLASH_P_EX(end, end == path)) {
 		end--;
 	}
 	if (end < path) {
@@ -7516,6 +7516,7 @@
 	} else if (toplevel) {
 		/* Only register the function after a successful compile */
 		if (UNEXPECTED(zend_hash_add_ptr(CG(function_table), lcname, op_array) == NULL)) {
+			CG(zend_lineno) = decl->start_lineno;
 			do_bind_function_error(lcname, op_array, true);
 		}
 	}
@@ -8042,7 +8043,13 @@
 	}
 
 	opline->op1_type = IS_CONST;
-	LITERAL_STR(opline->op1, lcname);
+	/* It's possible that `lcname` is not an interned string because it was not yet in the interned string table.
+	 * However, by this point another thread may have caused `lcname` to be added in the interned string table.
+	 * This will cause `lcname` to get freed once it is found in the interned string table. If we were to use
+	 * LITERAL_STR() here we would not change the `lcname` pointer to the new value, and it would point to the
+	 * now-freed string. This will cause issues when we use `lcname` in the code below. We solve this by using
+	 * zend_add_literal_string() which gives us the new value. */
+	opline->op1.constant = zend_add_literal_string(&lcname);
 
 	if (decl->flags & ZEND_ACC_ANON_CLASS) {
 		opline->opcode = ZEND_DECLARE_ANON_CLASS;

php-8.2.23.tar.xz/Zend/zend_enum.c -> php-8.2.28.tar.xz/Zend/zend_enum.c Changed

php-8.2.23.tar.xz/Zend/zend_exceptions.c -> php-8.2.28.tar.xz/Zend/zend_exceptions.c Changed

@@ -115,15 +115,18 @@
 	ex = &zv;
 	do {
 		ancestor = zend_read_property_ex(i_get_exception_base(add_previous), add_previous, ZSTR_KNOWN(ZEND_STR_PREVIOUS), 1, &rv);
+		ZVAL_DEREF(ancestor);
 		while (Z_TYPE_P(ancestor) == IS_OBJECT) {
 			if (Z_OBJ_P(ancestor) == Z_OBJ_P(ex)) {
 				OBJ_RELEASE(add_previous);
 				return;
 			}
 			ancestor = zend_read_property_ex(i_get_exception_base(Z_OBJ_P(ancestor)), Z_OBJ_P(ancestor), ZSTR_KNOWN(ZEND_STR_PREVIOUS), 1, &rv);
+			ZVAL_DEREF(ancestor);
 		}
 		base_ce = i_get_exception_base(Z_OBJ_P(ex));
 		previous = zend_read_property_ex(base_ce, Z_OBJ_P(ex), ZSTR_KNOWN(ZEND_STR_PREVIOUS), 1, &rv);
+		ZVAL_DEREF(previous);
 		if (Z_TYPE_P(previous) == IS_NULL) {
 			zend_update_property_ex(base_ce, Z_OBJ_P(ex), ZSTR_KNOWN(ZEND_STR_PREVIOUS), &pv);
 			GC_DELREF(add_previous);
@@ -630,6 +633,7 @@
 		RETURN_THROWS();
 	}
 
+	ZVAL_DEREF(trace);
 	/* Type should be guaranteed by property type. */
 	ZEND_ASSERT(Z_TYPE_P(trace) == IS_ARRAY);
 	RETURN_NEW_STR(zend_trace_to_string(Z_ARRVAL_P(trace), /* include_main */ true));
@@ -643,7 +647,7 @@
 
 	ZEND_PARSE_PARAMETERS_NONE();
 
-	ZVAL_COPY(return_value, GET_PROPERTY_SILENT(ZEND_THIS, ZEND_STR_PREVIOUS));
+	ZVAL_COPY_DEREF(return_value, GET_PROPERTY_SILENT(ZEND_THIS, ZEND_STR_PREVIOUS));
 } /* }}} */
 
 /* {{{ Obtain the string representation of the Exception object */
@@ -723,7 +727,8 @@
 
 		Z_PROTECT_RECURSION_P(exception);
 		exception = GET_PROPERTY(exception, ZEND_STR_PREVIOUS);
-		if (exception && Z_TYPE_P(exception) == IS_OBJECT && Z_IS_RECURSIVE_P(exception)) {
+		ZVAL_DEREF(exception);
+		if (Z_TYPE_P(exception) == IS_OBJECT && Z_IS_RECURSIVE_P(exception)) {
 			break;
 		}
 	}
@@ -731,13 +736,14 @@
 
 	exception = ZEND_THIS;
 	/* Reset apply counts */
-	while (exception && Z_TYPE_P(exception) == IS_OBJECT && (base_ce = i_get_exception_base(Z_OBJ_P(exception))) && instanceof_function(Z_OBJCE_P(exception), base_ce)) {
+	while (Z_TYPE_P(exception) == IS_OBJECT && (base_ce = i_get_exception_base(Z_OBJ_P(exception))) && instanceof_function(Z_OBJCE_P(exception), base_ce)) {
 		if (Z_IS_RECURSIVE_P(exception)) {
 			Z_UNPROTECT_RECURSION_P(exception);
 		} else {
 			break;
 		}
 		exception = GET_PROPERTY(exception, ZEND_STR_PREVIOUS);
+		ZVAL_DEREF(exception);
 	}
 
 	exception = ZEND_THIS;

php-8.2.23.tar.xz/Zend/zend_execute.c -> php-8.2.28.tar.xz/Zend/zend_execute.c Changed

@@ -4437,7 +4437,20 @@
 
 ZEND_API HashTable *zend_unfinished_execution_gc_ex(zend_execute_data *execute_data, zend_execute_data *call, zend_get_gc_buffer *gc_buffer, bool suspended_by_yield)
 {
-	if (!EX(func) || !ZEND_USER_CODE(EX(func)->common.type)) {
+	if (!EX(func)) {
+		return NULL;
+	}
+
+	if (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) {
+		zend_get_gc_buffer_add_obj(gc_buffer, Z_OBJ(execute_data->This));
+	}
+
+	if (EX_CALL_INFO() & ZEND_CALL_CLOSURE) {
+		zend_get_gc_buffer_add_obj(gc_buffer, ZEND_CLOSURE_OBJECT(EX(func)));
+	}
+
+	if (!ZEND_USER_CODE(EX(func)->common.type)) {
+		ZEND_ASSERT(!(EX_CALL_INFO() & (ZEND_CALL_HAS_SYMBOL_TABLE|ZEND_CALL_FREE_EXTRA_ARGS|ZEND_CALL_HAS_EXTRA_NAMED_PARAMS)));
 		return NULL;
 	}
 
@@ -4458,12 +4471,6 @@
 		}
 	}
 
-	if (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) {
-		zend_get_gc_buffer_add_obj(gc_buffer, Z_OBJ(execute_data->This));
-	}
-	if (EX_CALL_INFO() & ZEND_CALL_CLOSURE) {
-		zend_get_gc_buffer_add_obj(gc_buffer, ZEND_CLOSURE_OBJECT(EX(func)));
-	}
 	if (EX_CALL_INFO() & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS) {
 		zval extra_named_params;
 		ZVAL_ARR(&extra_named_params, EX(extra_named_params));

php-8.2.23.tar.xz/Zend/zend_fibers.c -> php-8.2.28.tar.xz/Zend/zend_fibers.c Changed

@@ -19,6 +19,7 @@
 
 #include "zend.h"
 #include "zend_API.h"
+#include "zend_gc.h"
 #include "zend_ini.h"
 #include "zend_vm.h"
 #include "zend_exceptions.h"
@@ -27,6 +28,7 @@
 #include "zend_mmap.h"
 #include "zend_compile.h"
 #include "zend_closures.h"
+#include "zend_generators.h"
 
 #include "zend_fibers.h"
 #include "zend_fibers_arginfo.h"
@@ -682,7 +684,25 @@
 	HashTable *lastSymTable = NULL;
 	zend_execute_data *ex = fiber->execute_data;
 	for (; ex; ex = ex->prev_execute_data) {
-		HashTable *symTable = zend_unfinished_execution_gc_ex(ex, ex->func && ZEND_USER_CODE(ex->func->type) ? ex->call : NULL, buf, false);
+		HashTable *symTable;
+		if (ZEND_CALL_INFO(ex) & ZEND_CALL_GENERATOR) {
+			/* The generator object is stored in ex->return_value */
+			zend_generator *generator = (zend_generator*)ex->return_value;
+			/* There are two cases to consider:
+			 * - If the generator is currently running, the Generator's GC
+			 *   handler will ignore it because it is not collectable. However,
+			 *   in this context the generator is suspended in Fiber::suspend()
+			 *   and may be collectable, so we can inspect it.
+			 * - If the generator is not running, the Generator's GC handler
+			 *   will inspect it. In this case we have to skip the frame.
+			 */
+			if (!(generator->flags & ZEND_GENERATOR_CURRENTLY_RUNNING)) {
+				continue;
+			}
+			symTable = zend_generator_frame_gc(buf, generator);
+		} else {
+			symTable = zend_unfinished_execution_gc_ex(ex, ex->func && ZEND_USER_CODE(ex->func->type) ? ex->call : NULL, buf, false);
+		}
 		if (symTable) {
 			if (lastSymTable) {
 				zval *val;

php-8.2.23.tar.xz/Zend/zend_generators.c -> php-8.2.28.tar.xz/Zend/zend_generators.c Changed

@@ -218,43 +218,30 @@
 	}
 }
 
-/* In the context of zend_generator_dtor_storage during shutdown, check if
- * the intermediate node 'generator' is running in a fiber */
+/* Check if the node 'generator' is running in a fiber */
 static inline bool check_node_running_in_fiber(zend_generator *generator) {
-	ZEND_ASSERT(EG(flags) & EG_FLAGS_IN_SHUTDOWN);
 	ZEND_ASSERT(generator->execute_data);
 
-	if (generator->flags & ZEND_GENERATOR_IN_FIBER) {
+	if (EXPECTED(generator->flags & ZEND_GENERATOR_IN_FIBER)) {
 		return true;
 	}
 
-	if (generator->node.children == 0) {
+	if (EXPECTED(generator->node.children == 0)) {
 		return false;
 	}
 
-	if (generator->flags & ZEND_GENERATOR_DTOR_VISITED) {
-		return false;
-	}
-	generator->flags |= ZEND_GENERATOR_DTOR_VISITED;
-
 	if (generator->node.children == 1) {
-		if (check_node_running_in_fiber(generator->node.child.single)) {
-			goto in_fiber;
-		}
-		return false;
+		return check_node_running_in_fiber(generator->node.child.single);
 	}
 
 	zend_generator *child;
 	ZEND_HASH_FOREACH_PTR(generator->node.child.ht, child) {
 		if (check_node_running_in_fiber(child)) {
-			goto in_fiber;
+			return true;
 		}
 	} ZEND_HASH_FOREACH_END();
-	return false;
 
-in_fiber:
-	generator->flags |= ZEND_GENERATOR_IN_FIBER;
-	return true;
+	return false;
 }
 
 static void zend_generator_dtor_storage(zend_object *object) /* {{{ */
@@ -398,32 +385,11 @@
 }
 /* }}} */
 
-static HashTable *zend_generator_get_gc(zend_object *object, zval **table, int *n) /* {{{ */
+HashTable *zend_generator_frame_gc(zend_get_gc_buffer *gc_buffer, zend_generator *generator)
 {
-	zend_generator *generator = (zend_generator*)object;
 	zend_execute_data *execute_data = generator->execute_data;
 	zend_execute_data *call = NULL;
 
-	if (!execute_data) {
-		/* If the generator has been closed, it can only hold on to three values: The value, key
-		 * and retval. These three zvals are stored sequentially starting at &generator->value. */
-		*table = &generator->value;
-		*n = 3;
-		return NULL;
-	}
-
-	if (generator->flags & ZEND_GENERATOR_CURRENTLY_RUNNING) {
-		/* If the generator is currently running, we certainly won't be able to GC any values it
-		 * holds on to. The execute_data state might be inconsistent during execution (e.g. because
-		 * GC has been triggered in the middle of a variable reassignment), so we should not try
-		 * to inspect it here. */
-		*table = NULL;
-		*n = 0;
-		return NULL;
-	}
-
-
-	zend_get_gc_buffer *gc_buffer = zend_get_gc_buffer_create();
 	zend_get_gc_buffer_add_zval(gc_buffer, &generator->value);
 	zend_get_gc_buffer_add_zval(gc_buffer, &generator->key);
 	zend_get_gc_buffer_add_zval(gc_buffer, &generator->retval);
@@ -434,7 +400,7 @@
 		call = zend_generator_revert_call_stack(generator->frozen_call_stack);
 	}
 
-	zend_unfinished_execution_gc_ex(execute_data, call, gc_buffer, true);
+	HashTable *ht = zend_unfinished_execution_gc_ex(execute_data, call, gc_buffer, true);
 
 	if (UNEXPECTED(generator->frozen_call_stack)) {
 		zend_generator_revert_call_stack(call);
@@ -444,12 +410,37 @@
 		zend_get_gc_buffer_add_obj(gc_buffer, &generator->node.parent->std);
 	}
 
-	zend_get_gc_buffer_use(gc_buffer, table, n);
-	if (EX_CALL_INFO() & ZEND_CALL_HAS_SYMBOL_TABLE) {
-		return execute_data->symbol_table;
-	} else {
+	return ht;
+}
+
+static HashTable *zend_generator_get_gc(zend_object *object, zval **table, int *n) /* {{{ */
+{
+	zend_generator *generator = (zend_generator*)object;
+	zend_execute_data *execute_data = generator->execute_data;
+
+	if (!execute_data) {
+		/* If the generator has been closed, it can only hold on to three values: The value, key
+		 * and retval. These three zvals are stored sequentially starting at &generator->value. */
+		*table = &generator->value;
+		*n = 3;
 		return NULL;
 	}
+
+	if (generator->flags & ZEND_GENERATOR_CURRENTLY_RUNNING) {
+		/* If the generator is currently running, we certainly won't be able to GC any values it
+		 * holds on to. The execute_data state might be inconsistent during execution (e.g. because
+		 * GC has been triggered in the middle of a variable reassignment), so we should not try
+		 * to inspect it here. */
+		*table = NULL;
+		*n = 0;
+		return NULL;
+	}
+
+	zend_get_gc_buffer *gc_buffer = zend_get_gc_buffer_create();
+	HashTable *ht = zend_generator_frame_gc(gc_buffer, generator);
+	zend_get_gc_buffer_use(gc_buffer, table, n);
+
+	return ht;
 }
 /* }}} */

php-8.2.23.tar.xz/Zend/zend_generators.h -> php-8.2.28.tar.xz/Zend/zend_generators.h Changed

php-8.2.23.tar.xz/Zend/zend_hash.c -> php-8.2.28.tar.xz/Zend/zend_hash.c Changed

@@ -2863,13 +2863,12 @@
 	q->h = h;
 }
 
-ZEND_API void ZEND_FASTCALL zend_hash_sort_ex(HashTable *ht, sort_func_t sort, bucket_compare_func_t compar, bool renumber)
+static void zend_hash_sort_internal(HashTable *ht, sort_func_t sort, bucket_compare_func_t compar, bool renumber)
 {
 	Bucket *p;
 	uint32_t i, j;
 
 	IS_CONSISTENT(ht);
-	HT_ASSERT_RC1(ht);
 
 	if (!(ht->nNumOfElements>1) && !(renumber && ht->nNumOfElements>0)) {
 		/* Doesn't require sorting */
@@ -2956,6 +2955,33 @@
 	}
 }
 
+ZEND_API void ZEND_FASTCALL zend_hash_sort_ex(HashTable *ht, sort_func_t sort, bucket_compare_func_t compar, bool renumber)
+{
+	HT_ASSERT_RC1(ht);
+	zend_hash_sort_internal(ht, sort, compar, renumber);
+}
+
+void ZEND_FASTCALL zend_array_sort_ex(HashTable *ht, sort_func_t sort, bucket_compare_func_t compar, bool renumber)
+{
+	HT_ASSERT_RC1(ht);
+
+	/* Unpack the array early to avoid RCn assertion failures. */
+	if (HT_IS_PACKED(ht)) {
+		zend_hash_packed_to_hash(ht);
+	}
+
+	/* Adding a refcount prevents the array from going away. */
+	GC_ADDREF(ht);
+
+	zend_hash_sort_internal(ht, sort, compar, renumber);
+
+	if (UNEXPECTED(GC_DELREF(ht) == 0)) {
+		zend_array_destroy(ht);
+	} else {
+		gc_check_possible_root((zend_refcounted *)ht);
+	}
+}
+
 static zend_always_inline int zend_hash_compare_impl(HashTable *ht1, HashTable *ht2, compare_func_t compar, bool ordered) {
 	uint32_t idx1, idx2;
 	zend_string *key1, *key2;

php-8.2.23.tar.xz/Zend/zend_hash.h -> php-8.2.28.tar.xz/Zend/zend_hash.h Changed

@@ -296,12 +296,20 @@
 typedef int (*bucket_compare_func_t)(Bucket *a, Bucket *b);
 ZEND_API int   zend_hash_compare(HashTable *ht1, HashTable *ht2, compare_func_t compar, bool ordered);
 ZEND_API void  ZEND_FASTCALL zend_hash_sort_ex(HashTable *ht, sort_func_t sort_func, bucket_compare_func_t compare_func, bool renumber);
+void  ZEND_FASTCALL zend_array_sort_ex(HashTable *ht, sort_func_t sort_func, bucket_compare_func_t compare_func, bool renumber);
 ZEND_API zval* ZEND_FASTCALL zend_hash_minmax(const HashTable *ht, compare_func_t compar, uint32_t flag);
 
 static zend_always_inline void ZEND_FASTCALL zend_hash_sort(HashTable *ht, bucket_compare_func_t compare_func, zend_bool renumber) {
 	zend_hash_sort_ex(ht, zend_sort, compare_func, renumber);
 }
 
+/* Use this variant over zend_hash_sort() when sorting user arrays that may
+ * trigger user code. It will ensure the user code cannot free the array during
+ * sorting. */
+static zend_always_inline void zend_array_sort(HashTable *ht, bucket_compare_func_t compare_func, bool renumber) {
+	zend_array_sort_ex(ht, zend_sort, compare_func, renumber);
+}
+
 static zend_always_inline uint32_t zend_hash_num_elements(const HashTable *ht) {
 	return ht->nNumOfElements;
 }

php-8.2.23.tar.xz/Zend/zend_inheritance.c -> php-8.2.28.tar.xz/Zend/zend_inheritance.c Changed

php-8.2.23.tar.xz/Zend/zend_ini_parser.c -> php-8.2.28.tar.xz/Zend/zend_ini_parser.c Changed

@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.8.2.  */
+/* A Bison parser, made by GNU Bison 3.7.5.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -46,10 +46,10 @@
    USER NAME SPACE" below.  */
 
 /* Identify Bison output, and Bison version.  */
-#define YYBISON 30802
+#define YYBISON 30705
 
 /* Bison version string.  */
-#define YYBISON_VERSION "3.8.2"
+#define YYBISON_VERSION "3.7.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -595,18 +595,12 @@
 # define YY_USE(E) /* empty */
 #endif
 
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
-# if __GNUC__ * 100 + __GNUC_MINOR__ < 407
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
-    _Pragma ("GCC diagnostic push")                                     \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")
-# else
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                            \
     _Pragma ("GCC diagnostic push")                                     \
     _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# endif
 # define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
     _Pragma ("GCC diagnostic pop")
 #else
@@ -822,7 +816,7 @@
 };
 
 #if INI_DEBUG
-/* YYRLINEYYN -- Source line where rule number YYN was defined.  */
+  /* YYRLINEYYN -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline =
 {
        0,   315,   315,   316,   320,   327,   338,   347,   348,   352,
@@ -865,6 +859,19 @@
 }
 #endif
 
+#ifdef YYPRINT
+/* YYTOKNUMNUM -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_int16 yytoknum =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,    61,    58,
+      44,    46,    34,    39,    94,    43,    45,    47,    42,    37,
+      36,   126,    60,    62,    63,    64,   123,   125,   124,    38,
+      33,    93,    40,    41
+};
+#endif
+
 #define YYPACT_NINF (-25)
 
 #define yypact_value_is_default(Yyn) \
@@ -875,8 +882,8 @@
 #define yytable_value_is_error(Yyn) \
   0
 
-/* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
+  /* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
 static const yytype_int8 yypact =
 {
      -25,     9,   -25,    73,   -17,    81,   -25,   -25,   -25,   -25,
@@ -889,9 +896,9 @@
      -25,   -25
 };
 
-/* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE does not specify something else to do.  Zero
-   means the default is an error.  */
+  /* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_int8 yydefact =
 {
        3,     0,     1,    10,     7,    17,     8,     2,    42,    41,
@@ -904,23 +911,23 @@
        6,    32
 };
 
-/* YYPGOTONTERM-NUM.  */
+  /* YYPGOTONTERM-NUM.  */
 static const yytype_int8 yypgoto =
 {
      -25,   -25,   -25,   -25,    -9,   -25,   -23,   -25,    50,     4,
       -3,    44,   -24
 };
 
-/* YYDEFGOTONTERM-NUM.  */
+  /* YYDEFGOTONTERM-NUM.  */
 static const yytype_int8 yydefgoto =
 {
        0,     1,     7,    15,    43,    26,    31,    16,    44,    45,
       28,    18,    29
 };
 
-/* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule whose
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+  /* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int8 yytable =
 {
       17,    19,    46,    50,    20,    21,    22,    23,    24,     2,
@@ -955,8 +962,8 @@
       -1,    -1,    22,    22
 };
 
-/* YYSTOSSTATE-NUM -- The symbol kind of the accessing symbol of
-   state STATE-NUM.  */
+  /* YYSTOSSTATE-NUM -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_int8 yystos =
 {
        0,    45,     0,     3,     9,    10,    17,    46,     4,     5,
@@ -969,7 +976,7 @@
       48,    22
 };
 
-/* YYR1RULE-NUM -- Symbol kind of the left-hand side of rule RULE-NUM.  */
+  /* YYR1YYN -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_int8 yyr1 =
 {
        0,    44,    45,    45,    46,    46,    46,    46,    46,    47,
@@ -980,7 +987,7 @@
       56
 };
 
-/* YYR2RULE-NUM -- Number of symbols on the right-hand side of rule RULE-NUM.  */
+  /* YYR2YYN -- Number of symbols on the right hand side of rule YYN.  */
 static const yytype_int8 yyr2 =
 {
        0,     2,     2,     0,     3,     3,     5,     1,     1,     1,
@@ -1000,7 +1007,6 @@
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
 #define YYERROR         goto yyerrorlab
-#define YYNOMEM         goto yyexhaustedlab
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
@@ -1041,7 +1047,10 @@
     YYFPRINTF Args;                             \
 } while (0)
 
-
+/* This macro is provided for backward compatibility. */
+# ifndef YY_LOCATION_PRINT
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 
 
 # define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
@@ -1068,6 +1077,10 @@
   YY_USE (yyoutput);
   if (!yyvaluep)
     return;
+# ifdef YYPRINT
+  if (yykind < YYNTOKENS)
+    YYPRINT (yyo, yytoknumyykind, *yyvaluep);
+# endif
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   YY_USE (yykind);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
@@ -1616,7 +1629,6 @@
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yychar = INI_EMPTY; /* Cause a token to be read.  */
-
   goto yysetstate;
 
 
@@ -1642,7 +1654,7 @@
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
-    YYNOMEM;
+    goto yyexhaustedlab;
 #else
     {
       /* Get the current used size of the three stacks, in elements.  */
@@ -1670,7 +1682,7 @@
 # else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-        YYNOMEM;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
         yystacksize = YYMAXDEPTH;
@@ -1681,7 +1693,7 @@
           YY_CAST (union yyalloc *,
                    YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
         if (! yyptr)
-          YYNOMEM;
+          goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
@@ -1703,7 +1715,6 @@
     }
 #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
-
   if (yystate == YYFINAL)
     YYACCEPT;
 
@@ -2103,7 +2114,7 @@
           }
         yyerror (yymsgp);
         if (yysyntax_error_status == YYENOMEM)
-          YYNOMEM;
+          goto yyexhaustedlab;
       }
     }
 
@@ -2139,7 +2150,6 @@
      label yyerrorlab therefore never appears in user code.  */
   if (0)
     YYERROR;
-  ++yynerrs;
 
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
@@ -2200,7 +2210,7 @@
 `-------------------------------------*/
 yyacceptlab:
   yyresult = 0;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
 /*-----------------------------------.
@@ -2208,22 +2218,24 @@
 `-----------------------------------*/
 yyabortlab:
   yyresult = 1;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
-/*-----------------------------------------------------------.
-| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here.  |
-`-----------------------------------------------------------*/
+#if 1
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
 yyexhaustedlab:
   yyerror (YY_("memory exhausted"));
   yyresult = 2;
-  goto yyreturnlab;
+  goto yyreturn;
+#endif
 
 
-/*----------------------------------------------------------.
-| yyreturnlab -- parsing is finished, clean up and return.  |
-`----------------------------------------------------------*/
-yyreturnlab:
+/*-------------------------------------------------------.
+| yyreturn -- parsing is finished, clean up and return.  |
+`-------------------------------------------------------*/
+yyreturn:
   if (yychar != INI_EMPTY)
     {
       /* Make sure we have latest lookahead translation.  See comments at

php-8.2.23.tar.xz/Zend/zend_ini_parser.h -> php-8.2.28.tar.xz/Zend/zend_ini_parser.h Changed

php-8.2.23.tar.xz/Zend/zend_ini_parser.output -> php-8.2.28.tar.xz/Zend/zend_ini_parser.output Changed

php-8.2.23.tar.xz/Zend/zend_ini_scanner.c -> php-8.2.28.tar.xz/Zend/zend_ini_scanner.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 3.1 */
+/* Generated by re2c 2.0.3 */
 /*
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
@@ -379,278 +379,6 @@
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
-	static const unsigned char yybm_INITIAL = {
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 160,   0, 144, 144,   0, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		240, 128, 128, 144, 128, 144, 128, 144, 
-		128, 128, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 128, 144, 128, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 128, 144, 144, 128, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 128, 128, 128, 128, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-		144, 144, 144, 144, 144, 144, 144, 144, 
-	};
-	static const unsigned char yybm_ST_OFFSET = {
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 140, 128, 132, 132, 128, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		140, 132, 128, 132, 192, 132, 132,   0, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		180, 180, 180, 180, 180, 180, 180, 180, 
-		180, 180, 132, 128, 132, 132, 132, 132, 
-		132, 164, 164, 164, 164, 164, 164, 164, 
-		164, 164, 164, 164, 164, 164, 164, 164, 
-		164, 164, 164, 164, 164, 164, 164, 164, 
-		164, 164, 164, 132, 192, 128, 132, 164, 
-		132, 164, 164, 164, 164, 164, 164, 164, 
-		164, 164, 164, 164, 164, 164, 164, 164, 
-		164, 164, 164, 164, 164, 164, 164, 164, 
-		164, 164, 164, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-	};
-	static const unsigned char yybm_ST_SECTION_VALUE = {
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 140, 128, 132, 132, 128, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		140, 132, 128, 132, 192, 132, 132,   0, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		180, 180, 180, 180, 180, 180, 180, 180, 
-		180, 180, 132, 128, 132, 132, 132, 132, 
-		132, 164, 164, 164, 164, 164, 164, 164, 
-		164, 164, 164, 164, 164, 164, 164, 164, 
-		164, 164, 164, 164, 164, 164, 164, 164, 
-		164, 164, 164, 132, 192, 128, 132, 164, 
-		132, 164, 164, 164, 164, 164, 164, 164, 
-		164, 164, 164, 164, 164, 164, 164, 164, 
-		164, 164, 164, 164, 164, 164, 164, 164, 
-		164, 164, 164, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-		132, 132, 132, 132, 132, 132, 132, 132, 
-	};
-	static const unsigned char yybm_ST_VALUE = {
-		 80,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  84,  64,  82,  82,  64,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 84,  80,  80,  82, 208,  82,  80,  16, 
-		 80,  80,  82,  82,  82,  82,  82,  82, 
-		122, 122, 122, 122, 122, 122, 122, 122, 
-		122, 122,  82,  80,  82,  80,  82,  82, 
-		 82, 114, 114, 114, 114, 114, 114, 114, 
-		114, 114, 114, 114, 114, 114, 114, 114, 
-		114, 114, 114, 114, 114, 114, 114, 114, 
-		114, 114, 114,  82,  82,  82,  80, 114, 
-		 82, 114, 114, 114, 114, 114, 114, 114, 
-		114, 114, 114, 114, 114, 114, 114, 114, 
-		114, 114, 114, 114, 114, 114, 114, 114, 
-		114, 114, 114,  82,  80,  82,  80,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-		 82,  82,  82,  82,  82,  82,  82,  82, 
-	};
-	static const unsigned char yybm_ST_SECTION_RAW = {
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64, 192,   0,  64,  64,   0,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		192,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,   0,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-	};
-	static const unsigned char yybm_ST_DOUBLE_QUOTES = {
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0, 128,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		128,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-	};
-	static const unsigned char yybm_ST_VARNAME = {
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128,   0,   0, 128, 128,   0, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128,   0,   0, 128,   0, 128,   0, 128, 
-		  0,   0, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128,   0, 128,   0, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128,   0, 128, 128,   0, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128,   0,   0,   0,   0, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-	};
-	static const unsigned char yybm_ST_RAW = {
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64, 192,   0,  64,  64,   0,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		192,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-	};
 	if (YYGETCONDITION() < 4) {
 		if (YYGETCONDITION() < 2) {
 			if (YYGETCONDITION() < 1) {
@@ -682,16 +410,51 @@
 	}
 /* *********************************** */
 yyc_INITIAL:
-	YYDEBUG(0, *YYCURSOR);
-	YYFILL(5);
-	yych = *YYCURSOR;
-	if (yybm_INITIAL0+yych & 64) {
-		goto yy9;
-	}
-	switch (yych) {
-		case '\t': goto yy4;
-		case '\n': goto yy6;
-		case '\r': goto yy8;
+	{
+		static const unsigned char yybm = {
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 160,   0, 144, 144,   0, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			240, 128, 128, 144, 128, 144, 128, 144, 
+			128, 128, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 128, 144, 128, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 128, 144, 144, 128, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 128, 128, 128, 128, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+		};
+		YYDEBUG(0, *YYCURSOR);
+		YYFILL(5);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 64) {
+			goto yy11;
+		}
+		switch (yych) {
+		case '\t':	goto yy5;
+		case '\n':	goto yy8;
+		case '\r':	goto yy10;
 		case ' ':
 		case '!':
 		case '"':
@@ -703,38 +466,38 @@
 		case '{':
 		case '|':
 		case '}':
-		case '~': goto yy10;
-		case ';': goto yy11;
-		case '=': goto yy12;
+		case '~':	goto yy13;
+		case ';':	goto yy15;
+		case '=':	goto yy17;
 		case 'F':
-		case 'f': goto yy13;
+		case 'f':	goto yy20;
 		case 'N':
-		case 'n': goto yy14;
+		case 'n':	goto yy21;
 		case 'O':
-		case 'o': goto yy15;
+		case 'o':	goto yy22;
 		case 'T':
-		case 't': goto yy16;
+		case 't':	goto yy23;
 		case 'Y':
-		case 'y': goto yy17;
-		case '': goto yy18;
-		default: goto yy1;
-	}
-yy1:
-	YYDEBUG(1, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
+		case 'y':	goto yy24;
+		case '':	goto yy25;
+		default:	goto yy2;
+		}
 yy2:
-	YYDEBUG(2, *YYCURSOR);
-	if (yybm_INITIAL0+yych & 16) {
-		goto yy1;
-	}
-	if (yych <= '=') goto yy3;
-	if (yych <= '') goto yy19;
+		YYDEBUG(2, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 yy3:
-	YYDEBUG(3, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get option name */
+		YYDEBUG(3, *YYCURSOR);
+		if (yybm0+yych & 16) {
+			goto yy2;
+		}
+		if (yych <= '=') goto yy4;
+		if (yych <= '') goto yy27;
+yy4:
+		YYDEBUG(4, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get option name */
 	/* Eat leading whitespace */
 	EAT_LEADING_WHITESPACE();
 
@@ -743,122 +506,128 @@
 
 	RETURN_TOKEN(TC_LABEL, yytext, yyleng);
 }
-yy4:
-	YYDEBUG(4, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_INITIAL0+yych & 32) {
-		goto yy4;
-	}
-	if (yych <= '\r') {
-		if (yych <= 0x08) goto yy5;
-		if (yych <= '\n') goto yy6;
-		if (yych >= '\r') goto yy8;
-	} else {
-		if (yych <= ';') {
-			if (yych >= ';') goto yy11;
+yy5:
+		YYDEBUG(5, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(6, *YYCURSOR);
+		if (yybm0+yych & 32) {
+			goto yy5;
+		}
+		if (yych <= '\r') {
+			if (yych <= 0x08) goto yy7;
+			if (yych <= '\n') goto yy8;
+			if (yych >= '\r') goto yy10;
 		} else {
-			if (yych == '=') goto yy12;
+			if (yych <= ';') {
+				if (yych >= ';') goto yy15;
+			} else {
+				if (yych == '=') goto yy17;
+			}
 		}
-	}
-yy5:
-	YYDEBUG(5, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy7:
+		YYDEBUG(7, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* eat whitespace */
 	goto restart;
 }
-yy6:
-	YYDEBUG(6, *YYCURSOR);
-	++YYCURSOR;
-yy7:
-	YYDEBUG(7, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy8:
+		YYDEBUG(8, *YYCURSOR);
+		++YYCURSOR;
+yy9:
+		YYDEBUG(9, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy8:
-	YYDEBUG(8, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy6;
-	goto yy7;
-yy9:
-	YYDEBUG(9, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_INITIAL0+yych & 64) {
+yy10:
+		YYDEBUG(10, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy8;
 		goto yy9;
-	}
-	if (yych <= '\'') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x08) goto yy1;
-				if (yych <= '\t') goto yy4;
-				goto yy6;
-			} else {
-				if (yych == '\r') goto yy8;
-				goto yy1;
-			}
-		} else {
-			if (yych <= '$') {
-				if (yych == '#') goto yy1;
-				goto yy3;
-			} else {
-				if (yych == '&') goto yy3;
-				goto yy1;
-			}
-		}
-	} else {
-		if (yych <= 'Z') {
-			if (yych <= ';') {
-				if (yych <= ')') goto yy3;
-				if (yych <= ':') goto yy1;
-				goto yy11;
+yy11:
+		YYDEBUG(11, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(12, *YYCURSOR);
+		if (yybm0+yych & 64) {
+			goto yy11;
+		}
+		if (yych <= '\'') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy2;
+					if (yych <= '\t') goto yy5;
+					goto yy8;
+				} else {
+					if (yych == '\r') goto yy10;
+					goto yy2;
+				}
 			} else {
-				if (yych == '=') goto yy12;
-				goto yy1;
+				if (yych <= '$') {
+					if (yych == '#') goto yy2;
+					goto yy4;
+				} else {
+					if (yych == '&') goto yy4;
+					goto yy2;
+				}
 			}
 		} else {
-			if (yych <= '^') {
-				if (yych <= '') goto yy19;
-				if (yych <= '') goto yy1;
-				goto yy3;
+			if (yych <= 'Z') {
+				if (yych <= ';') {
+					if (yych <= ')') goto yy4;
+					if (yych <= ':') goto yy2;
+					goto yy15;
+				} else {
+					if (yych == '=') goto yy17;
+					goto yy2;
+				}
 			} else {
-				if (yych <= 'z') goto yy1;
-				if (yych <= '~') goto yy3;
-				goto yy1;
+				if (yych <= '^') {
+					if (yych <= '') goto yy27;
+					if (yych <= '') goto yy2;
+					goto yy4;
+				} else {
+					if (yych <= 'z') goto yy2;
+					if (yych <= '~') goto yy4;
+					goto yy2;
+				}
 			}
 		}
-	}
-yy10:
-	YYDEBUG(10, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Disallow these chars outside option values */
+yy13:
+		YYDEBUG(13, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(14, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Disallow these chars outside option values */
 	return yytext0;
 }
-yy11:
-	YYDEBUG(11, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_INITIAL0+yych & 128) {
-		goto yy11;
-	}
-	if (yych <= '\n') goto yy20;
-	goto yy22;
-yy12:
-	YYDEBUG(12, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy12;
-	if (yych == ' ') goto yy12;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Start option value */
+yy15:
+		YYDEBUG(15, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(16, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy15;
+		}
+		if (yych <= '\n') goto yy30;
+		goto yy32;
+yy17:
+		YYDEBUG(17, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(18, *YYCURSOR);
+		if (yych == '\t') goto yy17;
+		if (yych == ' ') goto yy17;
+		YYDEBUG(19, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Start option value */
 	if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) {
 		BEGIN(ST_RAW);
 	} else {
@@ -866,61 +635,62 @@
 	}
 	return '=';
 }
-yy13:
-	YYDEBUG(13, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy23;
-	if (yych == 'a') goto yy23;
-	goto yy2;
-yy14:
-	YYDEBUG(14, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= 'U') {
-		if (yych == 'O') goto yy24;
-		if (yych <= 'T') goto yy2;
-		goto yy26;
-	} else {
-		if (yych <= 'o') {
-			if (yych <= 'n') goto yy2;
-			goto yy24;
-		} else {
-			if (yych == 'u') goto yy26;
-			goto yy2;
+yy20:
+		YYDEBUG(20, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'A') goto yy33;
+		if (yych == 'a') goto yy33;
+		goto yy3;
+yy21:
+		YYDEBUG(21, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= 'U') {
+			if (yych == 'O') goto yy34;
+			if (yych <= 'T') goto yy3;
+			goto yy36;
+		} else {
+			if (yych <= 'o') {
+				if (yych <= 'n') goto yy3;
+				goto yy34;
+			} else {
+				if (yych == 'u') goto yy36;
+				goto yy3;
+			}
 		}
-	}
-yy15:
-	YYDEBUG(15, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= 'N') {
-		if (yych == 'F') goto yy27;
-		if (yych <= 'M') goto yy2;
-		goto yy28;
-	} else {
-		if (yych <= 'f') {
-			if (yych <= 'e') goto yy2;
-			goto yy27;
+yy22:
+		YYDEBUG(22, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= 'N') {
+			if (yych == 'F') goto yy37;
+			if (yych <= 'M') goto yy3;
+			goto yy38;
 		} else {
-			if (yych == 'n') goto yy28;
-			goto yy2;
+			if (yych <= 'f') {
+				if (yych <= 'e') goto yy3;
+				goto yy37;
+			} else {
+				if (yych == 'n') goto yy38;
+				goto yy3;
+			}
 		}
-	}
-yy16:
-	YYDEBUG(16, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy30;
-	if (yych == 'r') goto yy30;
-	goto yy2;
-yy17:
-	YYDEBUG(17, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy31;
-	if (yych == 'e') goto yy31;
-	goto yy2;
-yy18:
-	YYDEBUG(18, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Section start */
+yy23:
+		YYDEBUG(23, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'R') goto yy41;
+		if (yych == 'r') goto yy41;
+		goto yy3;
+yy24:
+		YYDEBUG(24, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy42;
+		if (yych == 'e') goto yy42;
+		goto yy3;
+yy25:
+		YYDEBUG(25, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(26, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Section start */
 	/* Enter section data lookup state */
 	if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) {
 		BEGIN(ST_SECTION_RAW);
@@ -929,15 +699,17 @@
 	}
 	return TC_SECTION;
 }
-yy19:
-	YYDEBUG(19, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy19;
-	if (yych == ' ') goto yy19;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Start of option with offset */
+yy27:
+		YYDEBUG(27, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(28, *YYCURSOR);
+		if (yych == '\t') goto yy27;
+		if (yych == ' ') goto yy27;
+		YYDEBUG(29, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Start of option with offset */
 	/* Eat leading whitespace */
 	EAT_LEADING_WHITESPACE();
 
@@ -949,2468 +721,2697 @@
 
 	RETURN_TOKEN(TC_OFFSET, yytext, yyleng);
 }
-yy20:
-	YYDEBUG(20, *YYCURSOR);
-	++YYCURSOR;
-yy21:
-	YYDEBUG(21, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Comment */
+yy30:
+		YYDEBUG(30, *YYCURSOR);
+		++YYCURSOR;
+yy31:
+		YYDEBUG(31, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Comment */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy22:
-	YYDEBUG(22, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy20;
-	goto yy21;
-yy23:
-	YYDEBUG(23, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy32;
-	if (yych == 'l') goto yy32;
-	goto yy2;
-yy24:
-	YYDEBUG(24, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '\'') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x08) goto yy2;
-				if (yych <= '\t') goto yy33;
+yy32:
+		YYDEBUG(32, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy30;
+		goto yy31;
+yy33:
+		YYDEBUG(33, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy43;
+		if (yych == 'l') goto yy43;
+		goto yy3;
+yy34:
+		YYDEBUG(34, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\'') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy3;
+					if (yych <= '\t') goto yy44;
+				} else {
+					if (yych != '\r') goto yy3;
+				}
 			} else {
-				if (yych != '\r') goto yy2;
+				if (yych <= '#') {
+					if (yych <= ' ') goto yy46;
+					if (yych >= '#') goto yy3;
+				} else {
+					if (yych == '%') goto yy3;
+					if (yych >= '\'') goto yy3;
+				}
 			}
 		} else {
-			if (yych <= '#') {
-				if (yych <= ' ') goto yy34;
-				if (yych >= '#') goto yy2;
+			if (yych <= 'N') {
+				if (yych <= ';') {
+					if (yych <= ')') goto yy35;
+					if (yych <= ':') goto yy3;
+				} else {
+					if (yych == '=') goto yy35;
+					if (yych <= 'M') goto yy3;
+					goto yy48;
+				}
 			} else {
-				if (yych == '%') goto yy2;
-				if (yych >= '\'') goto yy2;
+				if (yych <= 'm') {
+					if (yych != '^') goto yy3;
+				} else {
+					if (yych <= 'n') goto yy48;
+					if (yych <= 'z') goto yy3;
+					if (yych >= 0x7F) goto yy3;
+				}
 			}
 		}
-	} else {
-		if (yych <= 'N') {
-			if (yych <= ';') {
-				if (yych <= ')') goto yy25;
-				if (yych <= ':') goto yy2;
+yy35:
+		YYDEBUG(35, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
+	RETURN_TOKEN(BOOL_FALSE, "", 0);
+}
+yy36:
+		YYDEBUG(36, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy49;
+		if (yych == 'l') goto yy49;
+		goto yy3;
+yy37:
+		YYDEBUG(37, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'F') goto yy46;
+		if (yych == 'f') goto yy46;
+		goto yy3;
+yy38:
+		YYDEBUG(38, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(39, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy2;
+					if (yych <= '\t') goto yy50;
+				} else {
+					if (yych != '\r') goto yy2;
+				}
 			} else {
-				if (yych == '=') goto yy25;
-				if (yych <= 'M') goto yy2;
-				goto yy35;
+				if (yych <= '#') {
+					if (yych <= ' ') goto yy38;
+					if (yych >= '#') goto yy2;
+				} else {
+					if (yych == '%') goto yy2;
+				}
 			}
 		} else {
-			if (yych <= 'm') {
-				if (yych != '^') goto yy2;
+			if (yych <= '=') {
+				if (yych <= ':') {
+					if (yych <= '\'') goto yy2;
+					if (yych >= '*') goto yy2;
+				} else {
+					if (yych == '<') goto yy2;
+				}
 			} else {
-				if (yych <= 'n') goto yy35;
-				if (yych <= 'z') goto yy2;
-				if (yych >= 0x7F) goto yy2;
+				if (yych <= '') {
+					if (yych == '') goto yy27;
+					goto yy2;
+				} else {
+					if (yych <= '^') goto yy40;
+					if (yych <= 'z') goto yy2;
+					if (yych >= 0x7F) goto yy2;
+				}
 			}
 		}
-	}
-yy25:
-	YYDEBUG(25, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
-	RETURN_TOKEN(BOOL_FALSE, "", 0);
+yy40:
+		YYDEBUG(40, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* TRUE value (when used outside option value/offset this causes parse error!) */
+	RETURN_TOKEN(BOOL_TRUE, "1", 1);
 }
-yy26:
-	YYDEBUG(26, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy36;
-	if (yych == 'l') goto yy36;
-	goto yy2;
-yy27:
-	YYDEBUG(27, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'F') goto yy34;
-	if (yych == 'f') goto yy34;
-	goto yy2;
-yy28:
-	YYDEBUG(28, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '&') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x08) goto yy1;
-				if (yych <= '\t') goto yy37;
-			} else {
-				if (yych != '\r') goto yy1;
+yy41:
+		YYDEBUG(41, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'U') goto yy52;
+		if (yych == 'u') goto yy52;
+		goto yy3;
+yy42:
+		YYDEBUG(42, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'S') goto yy38;
+		if (yych == 's') goto yy38;
+		goto yy3;
+yy43:
+		YYDEBUG(43, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'S') goto yy48;
+		if (yych == 's') goto yy48;
+		goto yy3;
+yy44:
+		YYDEBUG(44, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(45, *YYCURSOR);
+		if (yych == '\t') goto yy44;
+		if (yych == ' ') goto yy44;
+		goto yy35;
+yy46:
+		YYDEBUG(46, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(47, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy2;
+					if (yych <= '\t') goto yy44;
+					goto yy35;
+				} else {
+					if (yych == '\r') goto yy35;
+					goto yy2;
+				}
+			} else {
+				if (yych <= '#') {
+					if (yych <= ' ') goto yy46;
+					if (yych <= '"') goto yy35;
+					goto yy2;
+				} else {
+					if (yych == '%') goto yy2;
+					goto yy35;
+				}
 			}
 		} else {
-			if (yych <= '#') {
-				if (yych <= ' ') goto yy28;
-				if (yych >= '#') goto yy1;
+			if (yych <= '=') {
+				if (yych <= ':') {
+					if (yych <= '\'') goto yy2;
+					if (yych <= ')') goto yy35;
+					goto yy2;
+				} else {
+					if (yych == '<') goto yy2;
+					goto yy35;
+				}
 			} else {
-				if (yych == '%') goto yy1;
+				if (yych <= '') {
+					if (yych == '') goto yy27;
+					goto yy2;
+				} else {
+					if (yych <= '^') goto yy35;
+					if (yych <= 'z') goto yy2;
+					if (yych <= '~') goto yy35;
+					goto yy2;
+				}
 			}
 		}
-	} else {
-		if (yych <= '=') {
-			if (yych <= ':') {
-				if (yych <= '\'') goto yy1;
-				if (yych >= '*') goto yy1;
+yy48:
+		YYDEBUG(48, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy46;
+		if (yych == 'e') goto yy46;
+		goto yy3;
+yy49:
+		YYDEBUG(49, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy53;
+		if (yych == 'l') goto yy53;
+		goto yy3;
+yy50:
+		YYDEBUG(50, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(51, *YYCURSOR);
+		if (yych == '\t') goto yy50;
+		if (yych == ' ') goto yy50;
+		goto yy40;
+yy52:
+		YYDEBUG(52, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy38;
+		if (yych == 'e') goto yy38;
+		goto yy3;
+yy53:
+		YYDEBUG(53, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(54, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy2;
+					if (yych <= '\t') goto yy56;
+				} else {
+					if (yych != '\r') goto yy2;
+				}
 			} else {
-				if (yych == '<') goto yy1;
+				if (yych <= '#') {
+					if (yych <= ' ') goto yy53;
+					if (yych >= '#') goto yy2;
+				} else {
+					if (yych == '%') goto yy2;
+				}
 			}
 		} else {
-			if (yych <= '') {
-				if (yych == '') goto yy19;
-				goto yy1;
+			if (yych <= '=') {
+				if (yych <= ':') {
+					if (yych <= '\'') goto yy2;
+					if (yych >= '*') goto yy2;
+				} else {
+					if (yych == '<') goto yy2;
+				}
 			} else {
-				if (yych <= '^') goto yy29;
-				if (yych <= 'z') goto yy1;
-				if (yych >= 0x7F) goto yy1;
+				if (yych <= '') {
+					if (yych == '') goto yy27;
+					goto yy2;
+				} else {
+					if (yych <= '^') goto yy55;
+					if (yych <= 'z') goto yy2;
+					if (yych >= 0x7F) goto yy2;
+				}
 			}
 		}
-	}
-yy29:
-	YYDEBUG(29, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* TRUE value (when used outside option value/offset this causes parse error!) */
-	RETURN_TOKEN(BOOL_TRUE, "1", 1);
+yy55:
+		YYDEBUG(55, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(NULL_NULL, "", 0);
 }
-yy30:
-	YYDEBUG(30, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'U') goto yy38;
-	if (yych == 'u') goto yy38;
-	goto yy2;
-yy31:
-	YYDEBUG(31, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy28;
-	if (yych == 's') goto yy28;
-	goto yy2;
-yy32:
-	YYDEBUG(32, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy35;
-	if (yych == 's') goto yy35;
-	goto yy2;
-yy33:
-	YYDEBUG(33, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy33;
-	if (yych == ' ') goto yy33;
-	goto yy25;
-yy34:
-	YYDEBUG(34, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '&') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x08) goto yy1;
-				if (yych <= '\t') goto yy33;
-				goto yy25;
-			} else {
-				if (yych == '\r') goto yy25;
-				goto yy1;
+yy56:
+		YYDEBUG(56, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(57, *YYCURSOR);
+		if (yych == '\t') goto yy56;
+		if (yych == ' ') goto yy56;
+		goto yy55;
+	}
+/* *********************************** */
+yyc_ST_OFFSET:
+	{
+		static const unsigned char yybm = {
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 140, 128, 132, 132, 128, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			140, 132, 128, 132, 192, 132, 132,   0, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			180, 180, 180, 180, 180, 180, 180, 180, 
+			180, 180, 132, 128, 132, 132, 132, 132, 
+			132, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 132, 192, 128, 132, 164, 
+			132, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+		};
+		YYDEBUG(58, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 8) {
+			goto yy63;
+		}
+		if (yych <= '/') {
+			if (yych <= '"') {
+				if (yych <= '\f') {
+					if (yych <= 0x08) goto yy60;
+					if (yych <= '\n') goto yy65;
+				} else {
+					if (yych <= '\r') goto yy65;
+					if (yych >= '"') goto yy67;
+				}
+			} else {
+				if (yych <= '&') {
+					if (yych == '$') goto yy69;
+				} else {
+					if (yych <= '\'') goto yy70;
+					if (yych <= ',') goto yy60;
+					if (yych <= '.') goto yy71;
+				}
 			}
 		} else {
-			if (yych <= '#') {
-				if (yych <= ' ') goto yy34;
-				if (yych <= '"') goto yy25;
-				goto yy1;
+			if (yych <= '') {
+				if (yych <= ';') {
+					if (yych <= '9') goto yy72;
+					if (yych >= ';') goto yy65;
+				} else {
+					if (yych <= '@') goto yy60;
+					if (yych <= 'Z') goto yy75;
+				}
 			} else {
-				if (yych == '%') goto yy1;
-				goto yy25;
+				if (yych <= '^') {
+					if (yych <= '\\') goto yy78;
+					if (yych <= '') goto yy79;
+				} else {
+					if (yych == '`') goto yy60;
+					if (yych <= 'z') goto yy75;
+				}
 			}
 		}
-	} else {
-		if (yych <= '=') {
-			if (yych <= ':') {
-				if (yych <= '\'') goto yy1;
-				if (yych <= ')') goto yy25;
-				goto yy1;
-			} else {
-				if (yych == '<') goto yy1;
-				goto yy25;
+yy60:
+		YYDEBUG(60, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy61:
+		YYDEBUG(61, *YYCURSOR);
+		if (yybm0+yych & 4) {
+			goto yy60;
+		}
+		if (yych <= '"') goto yy62;
+		if (yych <= '$') goto yy81;
+		if (yych <= ';') goto yy62;
+		if (yych <= '\\') goto yy78;
+yy62:
+		YYDEBUG(62, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get rest as section/offset value */
+	RETURN_TOKEN(TC_STRING, yytext, yyleng);
+}
+yy63:
+		YYDEBUG(63, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(64, *YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy63;
+		}
+		if (yych <= '$') {
+			if (yych <= '\r') {
+				if (yych <= 0x08) goto yy60;
+				if (yych <= '\n') goto yy62;
+				if (yych <= '\f') goto yy60;
+				goto yy62;
+			} else {
+				if (yych == '"') goto yy67;
+				if (yych <= '#') goto yy60;
+				goto yy81;
 			}
 		} else {
-			if (yych <= '') {
-				if (yych == '') goto yy19;
-				goto yy1;
+			if (yych <= ';') {
+				if (yych == '\'') goto yy62;
+				if (yych <= ':') goto yy60;
+				goto yy62;
 			} else {
-				if (yych <= '^') goto yy25;
-				if (yych <= 'z') goto yy1;
-				if (yych <= '~') goto yy25;
-				goto yy1;
+				if (yych <= '') goto yy60;
+				if (yych <= '\\') goto yy78;
+				if (yych <= '') goto yy79;
+				goto yy60;
 			}
 		}
-	}
-yy35:
-	YYDEBUG(35, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy34;
-	if (yych == 'e') goto yy34;
-	goto yy2;
-yy36:
-	YYDEBUG(36, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy39;
-	if (yych == 'l') goto yy39;
-	goto yy2;
-yy37:
-	YYDEBUG(37, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy37;
-	if (yych == ' ') goto yy37;
-	goto yy29;
-yy38:
-	YYDEBUG(38, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy28;
-	if (yych == 'e') goto yy28;
-	goto yy2;
-yy39:
-	YYDEBUG(39, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '&') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x08) goto yy1;
-				if (yych <= '\t') goto yy41;
-			} else {
-				if (yych != '\r') goto yy1;
+yy65:
+		YYDEBUG(65, *YYCURSOR);
+		++YYCURSOR;
+yy66:
+		YYDEBUG(66, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	return 0;
+}
+yy67:
+		YYDEBUG(67, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(68, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Double quoted '"' string start */
+	yy_push_state(ST_DOUBLE_QUOTES);
+	return '"';
+}
+yy69:
+		YYDEBUG(69, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy66;
+			if (yych <= '') goto yy60;
+			goto yy83;
+		} else {
+			if (yych == '{') goto yy85;
+			goto yy60;
+		}
+yy70:
+		YYDEBUG(70, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yybm0+yych & 128) {
+			goto yy87;
+		}
+		goto yy66;
+yy71:
+		YYDEBUG(71, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') goto yy61;
+		if (yych <= '9') goto yy89;
+		goto yy61;
+yy72:
+		YYDEBUG(72, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(73, *YYCURSOR);
+		if (yybm0+yych & 16) {
+			goto yy72;
+		}
+		if (yych <= '&') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy74;
+				if (yych <= '\f') goto yy60;
+			} else {
+				if (yych <= '"') {
+					if (yych <= '!') goto yy60;
+				} else {
+					if (yych == '$') goto yy81;
+					goto yy60;
+				}
 			}
 		} else {
-			if (yych <= '#') {
-				if (yych <= ' ') goto yy39;
-				if (yych >= '#') goto yy1;
+			if (yych <= ':') {
+				if (yych <= '\'') goto yy74;
+				if (yych == '.') goto yy89;
+				goto yy60;
 			} else {
-				if (yych == '%') goto yy1;
+				if (yych <= '') {
+					if (yych >= '<') goto yy60;
+				} else {
+					if (yych <= '\\') goto yy78;
+					if (yych >= '^') goto yy60;
+				}
 			}
 		}
-	} else {
-		if (yych <= '=') {
-			if (yych <= ':') {
-				if (yych <= '\'') goto yy1;
-				if (yych >= '*') goto yy1;
+yy74:
+		YYDEBUG(74, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get number option value as string */
+	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
+}
+yy75:
+		YYDEBUG(75, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(76, *YYCURSOR);
+		if (yybm0+yych & 32) {
+			goto yy75;
+		}
+		if (yych <= '$') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy77;
+				if (yych <= '\f') goto yy60;
 			} else {
-				if (yych == '<') goto yy1;
+				if (yych == '"') goto yy77;
+				if (yych <= '#') goto yy60;
+				goto yy81;
 			}
 		} else {
-			if (yych <= '') {
-				if (yych == '') goto yy19;
-				goto yy1;
+			if (yych <= ';') {
+				if (yych == '\'') goto yy77;
+				if (yych <= ':') goto yy60;
 			} else {
-				if (yych <= '^') goto yy40;
-				if (yych <= 'z') goto yy1;
-				if (yych >= 0x7F) goto yy1;
+				if (yych <= '') goto yy60;
+				if (yych <= '\\') goto yy78;
+				if (yych >= '^') goto yy60;
 			}
 		}
-	}
-yy40:
-	YYDEBUG(40, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(NULL_NULL, "", 0);
-}
-yy41:
-	YYDEBUG(41, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy41;
-	if (yych == ' ') goto yy41;
-	goto yy40;
-/* *********************************** */
-yyc_ST_OFFSET:
-	YYDEBUG(42, *YYCURSOR);
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_ST_OFFSET0+yych & 8) {
-		goto yy46;
-	}
-	if (yych <= '/') {
-		if (yych <= '"') {
-			if (yych <= '\f') {
-				if (yych <= 0x08) goto yy43;
-				if (yych <= '\n') goto yy47;
-			} else {
-				if (yych <= '\r') goto yy47;
-				if (yych >= '"') goto yy49;
-			}
-		} else {
-			if (yych <= '&') {
-				if (yych == '$') goto yy50;
-			} else {
-				if (yych <= '\'') goto yy51;
-				if (yych <= ',') goto yy43;
-				if (yych <= '.') goto yy52;
-			}
-		}
-	} else {
-		if (yych <= '') {
-			if (yych <= ';') {
-				if (yych <= '9') goto yy53;
-				if (yych >= ';') goto yy47;
-			} else {
-				if (yych <= '@') goto yy43;
-				if (yych <= 'Z') goto yy55;
-			}
-		} else {
-			if (yych <= '^') {
-				if (yych <= '\\') goto yy57;
-				if (yych <= '') goto yy58;
-			} else {
-				if (yych == '`') goto yy43;
-				if (yych <= 'z') goto yy55;
-			}
-		}
-	}
-yy43:
-	YYDEBUG(43, *YYCURSOR);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-yy44:
-	YYDEBUG(44, *YYCURSOR);
-	if (yybm_ST_OFFSET0+yych & 4) {
-		goto yy43;
-	}
-	if (yych <= '"') goto yy45;
-	if (yych <= '$') goto yy59;
-	if (yych <= ';') goto yy45;
-	if (yych <= '\\') goto yy57;
-yy45:
-	YYDEBUG(45, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get rest as section/offset value */
-	RETURN_TOKEN(TC_STRING, yytext, yyleng);
-}
-yy46:
-	YYDEBUG(46, *YYCURSOR);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_OFFSET0+yych & 8) {
-		goto yy46;
-	}
-	if (yych <= '$') {
-		if (yych <= '\r') {
-			if (yych <= 0x08) goto yy43;
-			if (yych <= '\n') goto yy45;
-			if (yych <= '\f') goto yy43;
-			goto yy45;
-		} else {
-			if (yych == '"') goto yy49;
-			if (yych <= '#') goto yy43;
-			goto yy59;
-		}
-	} else {
-		if (yych <= ';') {
-			if (yych == '\'') goto yy45;
-			if (yych <= ':') goto yy43;
-			goto yy45;
-		} else {
-			if (yych <= '') goto yy43;
-			if (yych <= '\\') goto yy57;
-			if (yych <= '') goto yy58;
-			goto yy43;
-		}
-	}
-yy47:
-	YYDEBUG(47, *YYCURSOR);
-	++YYCURSOR;
-yy48:
-	YYDEBUG(48, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	return 0;
-}
-yy49:
-	YYDEBUG(49, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Double quoted '"' string start */
-	yy_push_state(ST_DOUBLE_QUOTES);
-	return '"';
-}
-yy50:
-	YYDEBUG(50, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= 0x00) goto yy48;
-		if (yych <= '') goto yy43;
-		goto yy61;
-	} else {
-		if (yych == '{') goto yy62;
-		goto yy43;
-	}
-yy51:
-	YYDEBUG(51, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yybm_ST_OFFSET0+yych & 128) {
-		goto yy63;
-	}
-	goto yy48;
-yy52:
-	YYDEBUG(52, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy44;
-	if (yych <= '9') goto yy64;
-	goto yy44;
-yy53:
-	YYDEBUG(53, *YYCURSOR);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_OFFSET0+yych & 16) {
-		goto yy53;
-	}
-	if (yych <= '&') {
-		if (yych <= '\r') {
-			if (yych == '\n') goto yy54;
-			if (yych <= '\f') goto yy43;
-		} else {
-			if (yych <= '"') {
-				if (yych <= '!') goto yy43;
-			} else {
-				if (yych == '$') goto yy59;
-				goto yy43;
-			}
-		}
-	} else {
-		if (yych <= ':') {
-			if (yych <= '\'') goto yy54;
-			if (yych == '.') goto yy64;
-			goto yy43;
-		} else {
-			if (yych <= '') {
-				if (yych >= '<') goto yy43;
-			} else {
-				if (yych <= '\\') goto yy57;
-				if (yych >= '^') goto yy43;
-			}
-		}
-	}
-yy54:
-	YYDEBUG(54, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get number option value as string */
-	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
-}
-yy55:
-	YYDEBUG(55, *YYCURSOR);
-	yyaccept = 2;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_OFFSET0+yych & 32) {
-		goto yy55;
-	}
-	if (yych <= '$') {
-		if (yych <= '\r') {
-			if (yych == '\n') goto yy56;
-			if (yych <= '\f') goto yy43;
-		} else {
-			if (yych == '"') goto yy56;
-			if (yych <= '#') goto yy43;
-			goto yy59;
-		}
-	} else {
-		if (yych <= ';') {
-			if (yych == '\'') goto yy56;
-			if (yych <= ':') goto yy43;
-		} else {
-			if (yych <= '') goto yy43;
-			if (yych <= '\\') goto yy57;
-			if (yych >= '^') goto yy43;
-		}
-	}
-yy56:
-	YYDEBUG(56, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get constant option value */
+yy77:
+		YYDEBUG(77, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get constant option value */
 	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-yy57:
-	YYDEBUG(57, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	goto yy43;
-yy58:
-	YYDEBUG(58, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* End of section or an option offset */
+yy78:
+		YYDEBUG(78, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		goto yy60;
+yy79:
+		YYDEBUG(79, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(80, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* End of section or an option offset */
 	BEGIN(INITIAL);
 	return '';
 }
-yy59:
-	YYDEBUG(59, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= 0x00) goto yy60;
-		if (yych <= '') goto yy43;
-		goto yy61;
-	} else {
-		if (yych != '{') goto yy43;
-	}
-yy60:
-	YYDEBUG(60, *YYCURSOR);
-	YYCURSOR = YYMARKER;
-	if (yyaccept <= 1) {
-		if (yyaccept == 0) {
-			goto yy45;
-		} else {
-			goto yy54;
-		}
-	} else {
-		goto yy56;
-	}
-yy61:
-	YYDEBUG(61, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_OFFSET0+yych & 64) {
-		goto yy61;
-	}
-	goto yy43;
-yy62:
-	YYDEBUG(62, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Variable start */
-	yy_push_state(ST_VARNAME);
-	return TC_DOLLAR_CURLY;
-}
-yy63:
-	YYDEBUG(63, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_OFFSET0+yych & 128) {
-		goto yy63;
-	}
-	goto yy65;
-yy64:
-	YYDEBUG(64, *YYCURSOR);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '&') {
-		if (yych <= '\r') {
-			if (yych == '\n') goto yy54;
-			if (yych <= '\f') goto yy43;
-			goto yy54;
-		} else {
-			if (yych <= '"') {
-				if (yych <= '!') goto yy43;
-				goto yy54;
-			} else {
-				if (yych == '$') goto yy59;
-				goto yy43;
-			}
-		}
-	} else {
-		if (yych <= ':') {
-			if (yych <= '\'') goto yy54;
-			if (yych <= '/') goto yy43;
-			if (yych <= '9') goto yy64;
-			goto yy43;
-		} else {
-			if (yych <= '') {
-				if (yych <= ';') goto yy54;
-				goto yy43;
-			} else {
-				if (yych <= '\\') goto yy57;
-				if (yych <= '') goto yy54;
-				goto yy43;
-			}
-		}
-	}
-yy65:
-	YYDEBUG(65, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Raw string */
-	/* Eat leading and trailing single quotes */
-	if (yytext0 == '\'' && yytextyyleng - 1 == '\'') {
-		SCNG(yy_text)++;
-		yyleng = yyleng - 2;
-	}
-	RETURN_TOKEN(TC_RAW, yytext, yyleng);
-}
-/* *********************************** */
-yyc_ST_SECTION_VALUE:
-	YYDEBUG(66, *YYCURSOR);
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_VALUE0+yych & 8) {
-		goto yy70;
-	}
-	if (yych <= '/') {
-		if (yych <= '"') {
-			if (yych <= '\f') {
-				if (yych <= 0x08) goto yy67;
-				if (yych <= '\n') goto yy71;
-			} else {
-				if (yych <= '\r') goto yy71;
-				if (yych >= '"') goto yy73;
-			}
-		} else {
-			if (yych <= '&') {
-				if (yych == '$') goto yy74;
-			} else {
-				if (yych <= '\'') goto yy75;
-				if (yych <= ',') goto yy67;
-				if (yych <= '.') goto yy76;
-			}
-		}
-	} else {
-		if (yych <= '') {
-			if (yych <= ';') {
-				if (yych <= '9') goto yy77;
-				if (yych >= ';') goto yy71;
-			} else {
-				if (yych <= '@') goto yy67;
-				if (yych <= 'Z') goto yy79;
-			}
-		} else {
-			if (yych <= '^') {
-				if (yych <= '\\') goto yy81;
-				if (yych <= '') goto yy82;
-			} else {
-				if (yych == '`') goto yy67;
-				if (yych <= 'z') goto yy79;
-			}
-		}
-	}
-yy67:
-	YYDEBUG(67, *YYCURSOR);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-yy68:
-	YYDEBUG(68, *YYCURSOR);
-	if (yybm_ST_SECTION_VALUE0+yych & 4) {
-		goto yy67;
-	}
-	if (yych <= '"') goto yy69;
-	if (yych <= '$') goto yy84;
-	if (yych <= ';') goto yy69;
-	if (yych <= '\\') goto yy81;
-yy69:
-	YYDEBUG(69, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get rest as section/offset value */
-	RETURN_TOKEN(TC_STRING, yytext, yyleng);
-}
-yy70:
-	YYDEBUG(70, *YYCURSOR);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_VALUE0+yych & 8) {
-		goto yy70;
-	}
-	if (yych <= '$') {
-		if (yych <= '\r') {
-			if (yych <= 0x08) goto yy67;
-			if (yych <= '\n') goto yy69;
-			if (yych <= '\f') goto yy67;
-			goto yy69;
-		} else {
-			if (yych == '"') goto yy73;
-			if (yych <= '#') goto yy67;
-			goto yy84;
-		}
-	} else {
-		if (yych <= ';') {
-			if (yych == '\'') goto yy69;
-			if (yych <= ':') goto yy67;
-			goto yy69;
-		} else {
-			if (yych <= '') goto yy67;
-			if (yych <= '\\') goto yy81;
-			if (yych <= '') goto yy69;
-			goto yy67;
-		}
-	}
-yy71:
-	YYDEBUG(71, *YYCURSOR);
-	++YYCURSOR;
-yy72:
-	YYDEBUG(72, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	return 0;
-}
-yy73:
-	YYDEBUG(73, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Double quoted '"' string start */
-	yy_push_state(ST_DOUBLE_QUOTES);
-	return '"';
-}
-yy74:
-	YYDEBUG(74, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= 0x00) goto yy72;
-		if (yych <= '') goto yy67;
-		goto yy86;
-	} else {
-		if (yych == '{') goto yy87;
-		goto yy67;
-	}
-yy75:
-	YYDEBUG(75, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yybm_ST_SECTION_VALUE0+yych & 128) {
-		goto yy88;
-	}
-	goto yy72;
-yy76:
-	YYDEBUG(76, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy68;
-	if (yych <= '9') goto yy89;
-	goto yy68;
-yy77:
-	YYDEBUG(77, *YYCURSOR);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_VALUE0+yych & 16) {
-		goto yy77;
-	}
-	if (yych <= '&') {
-		if (yych <= '\r') {
-			if (yych == '\n') goto yy78;
-			if (yych <= '\f') goto yy67;
+yy81:
+		YYDEBUG(81, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy82;
+			if (yych <= '') goto yy60;
+			goto yy83;
 		} else {
-			if (yych <= '"') {
-				if (yych <= '!') goto yy67;
-			} else {
-				if (yych == '$') goto yy84;
-				goto yy67;
-			}
+			if (yych != '{') goto yy60;
 		}
-	} else {
-		if (yych <= ':') {
-			if (yych <= '\'') goto yy78;
-			if (yych == '.') goto yy89;
-			goto yy67;
-		} else {
-			if (yych <= '') {
-				if (yych >= '<') goto yy67;
+yy82:
+		YYDEBUG(82, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept <= 1) {
+			if (yyaccept == 0) {
+				goto yy62;
 			} else {
-				if (yych <= '\\') goto yy81;
-				if (yych >= '^') goto yy67;
+				goto yy74;
 			}
-		}
-	}
-yy78:
-	YYDEBUG(78, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get number option value as string */
-	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
-}
-yy79:
-	YYDEBUG(79, *YYCURSOR);
-	yyaccept = 2;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_VALUE0+yych & 32) {
-		goto yy79;
-	}
-	if (yych <= '$') {
-		if (yych <= '\r') {
-			if (yych == '\n') goto yy80;
-			if (yych <= '\f') goto yy67;
 		} else {
-			if (yych == '"') goto yy80;
-			if (yych <= '#') goto yy67;
-			goto yy84;
+			goto yy77;
 		}
-	} else {
-		if (yych <= ';') {
-			if (yych == '\'') goto yy80;
-			if (yych <= ':') goto yy67;
-		} else {
-			if (yych <= '') goto yy67;
-			if (yych <= '\\') goto yy81;
-			if (yych >= '^') goto yy67;
-		}
-	}
-yy80:
-	YYDEBUG(80, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get constant option value */
-	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
-}
-yy81:
-	YYDEBUG(81, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	goto yy67;
-yy82:
-	YYDEBUG(82, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy83;
-		if (yych <= '\t') goto yy82;
-		if (yych <= '\n') goto yy90;
-	} else {
-		if (yych <= '\r') goto yy91;
-		if (yych == ' ') goto yy82;
-	}
 yy83:
-	YYDEBUG(83, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* End of section */
-	BEGIN(INITIAL);
-	SCNG(lineno)++;
-	return '';
-}
-yy84:
-	YYDEBUG(84, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= 0x00) goto yy85;
-		if (yych <= '') goto yy67;
-		goto yy86;
-	} else {
-		if (yych != '{') goto yy67;
-	}
+		YYDEBUG(83, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(84, *YYCURSOR);
+		if (yybm0+yych & 64) {
+			goto yy83;
+		}
+		goto yy60;
 yy85:
-	YYDEBUG(85, *YYCURSOR);
-	YYCURSOR = YYMARKER;
-	if (yyaccept <= 1) {
-		if (yyaccept == 0) {
-			goto yy69;
-		} else {
-			goto yy78;
-		}
-	} else {
-		goto yy80;
-	}
-yy86:
-	YYDEBUG(86, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_VALUE0+yych & 64) {
-		goto yy86;
-	}
-	goto yy67;
-yy87:
-	YYDEBUG(87, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Variable start */
+		YYDEBUG(85, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(86, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Variable start */
 	yy_push_state(ST_VARNAME);
 	return TC_DOLLAR_CURLY;
 }
-yy88:
-	YYDEBUG(88, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_VALUE0+yych & 128) {
-		goto yy88;
-	}
-	goto yy92;
+yy87:
+		YYDEBUG(87, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(88, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy87;
+		}
+		goto yy91;
 yy89:
-	YYDEBUG(89, *YYCURSOR);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '&') {
-		if (yych <= '\r') {
-			if (yych == '\n') goto yy78;
-			if (yych <= '\f') goto yy67;
-			goto yy78;
-		} else {
-			if (yych <= '"') {
-				if (yych <= '!') goto yy67;
-				goto yy78;
-			} else {
-				if (yych == '$') goto yy84;
-				goto yy67;
-			}
-		}
-	} else {
-		if (yych <= ':') {
-			if (yych <= '\'') goto yy78;
-			if (yych <= '/') goto yy67;
-			if (yych <= '9') goto yy89;
-			goto yy67;
-		} else {
-			if (yych <= '') {
-				if (yych <= ';') goto yy78;
-				goto yy67;
-			} else {
-				if (yych <= '\\') goto yy81;
-				if (yych <= '') goto yy78;
-				goto yy67;
-			}
-		}
-	}
-yy90:
-	YYDEBUG(90, *YYCURSOR);
-	++YYCURSOR;
-	goto yy83;
-yy91:
-	YYDEBUG(91, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy90;
-	goto yy83;
-yy92:
-	YYDEBUG(92, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Raw string */
-	/* Eat leading and trailing single quotes */
-	if (yytext0 == '\'' && yytextyyleng - 1 == '\'') {
-		SCNG(yy_text)++;
-		yyleng = yyleng - 2;
-	}
-	RETURN_TOKEN(TC_RAW, yytext, yyleng);
-}
-/* *********************************** */
-yyc_ST_VALUE:
-	YYDEBUG(93, *YYCURSOR);
-	YYFILL(6);
-	yych = *YYCURSOR;
-	if (yybm_ST_VALUE0+yych & 4) {
-		goto yy99;
-	}
-	switch (yych) {
-		case 0x00: goto yy94;
-		case '\t':
-		case '\n': goto yy101;
-		case '\r': goto yy103;
-		case ' ':
-		case '!':
-		case '&':
-		case '(':
-		case ')':
-		case '^':
-		case '|':
-		case '~': goto yy104;
-		case '"': goto yy105;
-		case '$': goto yy106;
-		case '\'': goto yy107;
-		case '-':
-		case '.': goto yy108;
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		case '8':
-		case '9': goto yy109;
-		case ';': goto yy111;
-		case '=': goto yy112;
-		case 'A':
-		case 'B':
-		case 'C':
-		case 'D':
-		case 'E':
-		case 'G':
-		case 'H':
-		case 'I':
-		case 'J':
-		case 'K':
-		case 'L':
-		case 'M':
-		case 'P':
-		case 'Q':
-		case 'R':
-		case 'S':
-		case 'U':
-		case 'V':
-		case 'W':
-		case 'X':
-		case 'Z':
-		case '_':
-		case 'a':
-		case 'b':
-		case 'c':
-		case 'd':
-		case 'e':
-		case 'g':
-		case 'h':
-		case 'i':
-		case 'j':
-		case 'k':
-		case 'l':
-		case 'm':
-		case 'p':
-		case 'q':
-		case 'r':
-		case 's':
-		case 'u':
-		case 'v':
-		case 'w':
-		case 'x':
-		case 'z': goto yy113;
-		case 'F':
-		case 'f': goto yy115;
-		case 'N':
-		case 'n': goto yy116;
-		case 'O':
-		case 'o': goto yy117;
-		case 'T':
-		case 't': goto yy118;
-		case 'Y':
-		case 'y': goto yy119;
-		default: goto yy96;
-	}
-yy94:
-	YYDEBUG(94, *YYCURSOR);
-	++YYCURSOR;
-yy95:
-	YYDEBUG(95, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* End of option value (if EOF is reached before EOL */
-	BEGIN(INITIAL);
-	return END_OF_LINE;
-}
-yy96:
-	YYDEBUG(96, *YYCURSOR);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-yy97:
-	YYDEBUG(97, *YYCURSOR);
-	if (yybm_ST_VALUE0+yych & 2) {
-		goto yy96;
-	}
-	if (yych <= '"') goto yy98;
-	if (yych <= '$') goto yy120;
-yy98:
-	YYDEBUG(98, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get everything else as option/offset value */
-	RETURN_TOKEN(TC_STRING, yytext, yyleng);
-}
-yy99:
-	YYDEBUG(99, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_ST_VALUE0+yych & 4) {
-		goto yy99;
-	}
-	if (yych <= '\r') {
-		if (yych <= 0x08) goto yy100;
-		if (yych <= '\n') goto yy101;
-		if (yych >= '\r') goto yy103;
-	} else {
-		if (yych <= '"') {
-			if (yych >= '"') goto yy105;
-		} else {
-			if (yych == ';') goto yy111;
-		}
-	}
-yy100:
-	YYDEBUG(100, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng);
-}
-yy101:
-	YYDEBUG(101, *YYCURSOR);
-	++YYCURSOR;
-yy102:
-	YYDEBUG(102, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* End of option value */
-	BEGIN(INITIAL);
-	SCNG(lineno)++;
-	return END_OF_LINE;
-}
-yy103:
-	YYDEBUG(103, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy101;
-	goto yy102;
-yy104:
-	YYDEBUG(104, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy104;
-	if (yych == ' ') goto yy104;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Boolean operators */
-	return yytext0;
-}
-yy105:
-	YYDEBUG(105, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Double quoted '"' string start */
-	yy_push_state(ST_DOUBLE_QUOTES);
-	return '"';
-}
-yy106:
-	YYDEBUG(106, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= 0x00) goto yy95;
-		if (yych <= '') goto yy96;
-		goto yy122;
-	} else {
-		if (yych == '{') goto yy123;
-		goto yy96;
-	}
-yy107:
-	YYDEBUG(107, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yybm_ST_VALUE0+yych & 64) {
-		goto yy124;
-	}
-	goto yy95;
-yy108:
-	YYDEBUG(108, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy97;
-	if (yych <= '9') goto yy125;
-	goto yy97;
-yy109:
-	YYDEBUG(109, *YYCURSOR);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VALUE0+yych & 8) {
-		goto yy109;
-	}
-	if (yych <= '-') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy110;
-				if (yych <= 0x08) goto yy96;
-			} else {
-				if (yych != '\r') goto yy96;
-			}
-		} else {
-			if (yych <= '$') {
-				if (yych <= '"') goto yy110;
-				if (yych <= '#') goto yy96;
-				goto yy120;
-			} else {
-				if (yych <= '%') goto yy96;
-				if (yych >= '*') goto yy96;
-			}
-		}
-	} else {
-		if (yych <= '') {
-			if (yych <= ';') {
-				if (yych <= '.') goto yy125;
-				if (yych <= ':') goto yy96;
-			} else {
-				if (yych != '=') goto yy96;
-			}
-		} else {
-			if (yych <= '|') {
-				if (yych <= '^') goto yy110;
-				if (yych <= '{') goto yy96;
-			} else {
-				if (yych != '~') goto yy96;
-			}
-		}
-	}
-yy110:
-	YYDEBUG(110, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get number option value as string */
-	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
-}
-yy111:
-	YYDEBUG(111, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_ST_VALUE0+yych & 16) {
-		goto yy111;
-	}
-	if (yych <= '\n') goto yy126;
-	goto yy128;
-yy112:
-	YYDEBUG(112, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Make = used in option value to trigger error */
-	yyless(0);
-	BEGIN(INITIAL);
-	return END_OF_LINE;
-}
-yy113:
-	YYDEBUG(113, *YYCURSOR);
-	yyaccept = 2;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VALUE0+yych & 32) {
-		goto yy113;
-	}
-	if (yych <= ')') {
-		if (yych <= '\r') {
-			if (yych <= 0x08) {
-				if (yych >= 0x01) goto yy96;
-			} else {
-				if (yych <= '\n') goto yy114;
-				if (yych <= '\f') goto yy96;
-			}
-		} else {
-			if (yych <= '#') {
-				if (yych <= 0x1F) goto yy96;
-				if (yych >= '#') goto yy96;
-			} else {
-				if (yych <= '$') goto yy120;
-				if (yych <= '%') goto yy96;
-			}
-		}
-	} else {
-		if (yych <= '') {
-			if (yych <= ';') {
-				if (yych <= ':') goto yy96;
-			} else {
-				if (yych != '=') goto yy96;
-			}
-		} else {
-			if (yych <= '|') {
-				if (yych <= '^') goto yy114;
-				if (yych <= '{') goto yy96;
-			} else {
-				if (yych != '~') goto yy96;
-			}
-		}
-	}
-yy114:
-	YYDEBUG(114, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get constant option value */
-	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
-}
-yy115:
-	YYDEBUG(115, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '<') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
-		} else {
-			if (yych <= '/') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				goto yy97;
-			} else {
-				if (yych <= '9') goto yy113;
-				if (yych == ';') goto yy114;
-				goto yy97;
-			}
-		}
-	} else {
-		if (yych <= '_') {
-			if (yych <= 'A') {
-				if (yych <= '=') goto yy114;
-				if (yych <= '@') goto yy97;
-				goto yy129;
-			} else {
-				if (yych <= 'Z') goto yy113;
-				if (yych <= '') goto yy97;
-				if (yych <= '^') goto yy114;
-				goto yy113;
-			}
-		} else {
-			if (yych <= '{') {
-				if (yych <= '`') goto yy97;
-				if (yych <= 'a') goto yy129;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
-			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
-			}
-		}
-	}
-yy116:
-	YYDEBUG(116, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'N') {
-		if (yych <= '%') {
-			if (yych <= '\f') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				if (yych <= '\n') goto yy114;
-				goto yy97;
-			} else {
-				if (yych <= '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				if (yych <= '"') goto yy114;
-				goto yy97;
+		YYDEBUG(89, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(90, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy74;
+				if (yych <= '\f') goto yy60;
+				goto yy74;
+			} else {
+				if (yych <= '"') {
+					if (yych <= '!') goto yy60;
+					goto yy74;
+				} else {
+					if (yych == '$') goto yy81;
+					goto yy60;
+				}
 			}
 		} else {
 			if (yych <= ':') {
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				if (yych <= '9') goto yy113;
-				goto yy97;
-			} else {
-				if (yych <= '<') {
-					if (yych <= ';') goto yy114;
-					goto yy97;
+				if (yych <= '\'') goto yy74;
+				if (yych <= '/') goto yy60;
+				if (yych <= '9') goto yy89;
+				goto yy60;
+			} else {
+				if (yych <= '') {
+					if (yych <= ';') goto yy74;
+					goto yy60;
 				} else {
-					if (yych <= '=') goto yy114;
-					if (yych <= '@') goto yy97;
-					goto yy113;
+					if (yych <= '\\') goto yy78;
+					if (yych <= '') goto yy74;
+					goto yy60;
 				}
 			}
 		}
-	} else {
-		if (yych <= 'n') {
-			if (yych <= 'Z') {
-				if (yych <= 'O') goto yy130;
-				if (yych == 'U') goto yy132;
-				goto yy113;
+yy91:
+		YYDEBUG(91, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(92, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Raw string */
+	/* Eat leading and trailing single quotes */
+	if (yytext0 == '\'' && yytextyyleng - 1 == '\'') {
+		SCNG(yy_text)++;
+		yyleng = yyleng - 2;
+	}
+	RETURN_TOKEN(TC_RAW, yytext, yyleng);
+}
+	}
+/* *********************************** */
+yyc_ST_SECTION_VALUE:
+	{
+		static const unsigned char yybm = {
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 140, 128, 132, 132, 128, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			140, 132, 128, 132, 192, 132, 132,   0, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			180, 180, 180, 180, 180, 180, 180, 180, 
+			180, 180, 132, 128, 132, 132, 132, 132, 
+			132, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 132, 192, 128, 132, 164, 
+			132, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+		};
+		YYDEBUG(93, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 8) {
+			goto yy98;
+		}
+		if (yych <= '/') {
+			if (yych <= '"') {
+				if (yych <= '\f') {
+					if (yych <= 0x08) goto yy95;
+					if (yych <= '\n') goto yy100;
+				} else {
+					if (yych <= '\r') goto yy100;
+					if (yych >= '"') goto yy102;
+				}
 			} else {
-				if (yych <= '^') {
-					if (yych <= '') goto yy97;
-					goto yy114;
+				if (yych <= '&') {
+					if (yych == '$') goto yy104;
 				} else {
-					if (yych == '`') goto yy97;
-					goto yy113;
+					if (yych <= '\'') goto yy105;
+					if (yych <= ',') goto yy95;
+					if (yych <= '.') goto yy106;
 				}
 			}
 		} else {
-			if (yych <= 'z') {
-				if (yych <= 'o') goto yy130;
-				if (yych == 'u') goto yy132;
-				goto yy113;
+			if (yych <= '') {
+				if (yych <= ';') {
+					if (yych <= '9') goto yy107;
+					if (yych >= ';') goto yy100;
+				} else {
+					if (yych <= '@') goto yy95;
+					if (yych <= 'Z') goto yy110;
+				}
 			} else {
-				if (yych <= '|') {
-					if (yych <= '{') goto yy97;
-					goto yy114;
+				if (yych <= '^') {
+					if (yych <= '\\') goto yy113;
+					if (yych <= '') goto yy114;
 				} else {
-					if (yych == '~') goto yy114;
-					goto yy97;
+					if (yych == '`') goto yy95;
+					if (yych <= 'z') goto yy110;
 				}
 			}
 		}
-	}
-yy117:
-	YYDEBUG(117, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'E') {
-		if (yych <= '%') {
-			if (yych <= '\f') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				if (yych <= '\n') goto yy114;
+yy95:
+		YYDEBUG(95, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy96:
+		YYDEBUG(96, *YYCURSOR);
+		if (yybm0+yych & 4) {
+			goto yy95;
+		}
+		if (yych <= '"') goto yy97;
+		if (yych <= '$') goto yy117;
+		if (yych <= ';') goto yy97;
+		if (yych <= '\\') goto yy113;
+yy97:
+		YYDEBUG(97, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get rest as section/offset value */
+	RETURN_TOKEN(TC_STRING, yytext, yyleng);
+}
+yy98:
+		YYDEBUG(98, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(99, *YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy98;
+		}
+		if (yych <= '$') {
+			if (yych <= '\r') {
+				if (yych <= 0x08) goto yy95;
+				if (yych <= '\n') goto yy97;
+				if (yych <= '\f') goto yy95;
 				goto yy97;
 			} else {
-				if (yych <= '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				if (yych <= '"') goto yy114;
-				goto yy97;
+				if (yych == '"') goto yy102;
+				if (yych <= '#') goto yy95;
+				goto yy117;
 			}
 		} else {
-			if (yych <= ':') {
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				if (yych <= '9') goto yy113;
+			if (yych <= ';') {
+				if (yych == '\'') goto yy97;
+				if (yych <= ':') goto yy95;
 				goto yy97;
 			} else {
-				if (yych <= '<') {
-					if (yych <= ';') goto yy114;
-					goto yy97;
-				} else {
-					if (yych <= '=') goto yy114;
-					if (yych <= '@') goto yy97;
-					goto yy113;
-				}
+				if (yych <= '') goto yy95;
+				if (yych <= '\\') goto yy113;
+				if (yych <= '') goto yy97;
+				goto yy95;
 			}
 		}
-	} else {
-		if (yych <= 'e') {
-			if (yych <= 'Z') {
-				if (yych <= 'F') goto yy133;
-				if (yych == 'N') goto yy134;
-				goto yy113;
-			} else {
-				if (yych <= '^') {
-					if (yych <= '') goto yy97;
-					goto yy114;
+yy100:
+		YYDEBUG(100, *YYCURSOR);
+		++YYCURSOR;
+yy101:
+		YYDEBUG(101, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	return 0;
+}
+yy102:
+		YYDEBUG(102, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(103, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Double quoted '"' string start */
+	yy_push_state(ST_DOUBLE_QUOTES);
+	return '"';
+}
+yy104:
+		YYDEBUG(104, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy101;
+			if (yych <= '') goto yy95;
+			goto yy119;
+		} else {
+			if (yych == '{') goto yy121;
+			goto yy95;
+		}
+yy105:
+		YYDEBUG(105, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yybm0+yych & 128) {
+			goto yy123;
+		}
+		goto yy101;
+yy106:
+		YYDEBUG(106, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') goto yy96;
+		if (yych <= '9') goto yy125;
+		goto yy96;
+yy107:
+		YYDEBUG(107, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(108, *YYCURSOR);
+		if (yybm0+yych & 16) {
+			goto yy107;
+		}
+		if (yych <= '&') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy109;
+				if (yych <= '\f') goto yy95;
+			} else {
+				if (yych <= '"') {
+					if (yych <= '!') goto yy95;
 				} else {
-					if (yych == '`') goto yy97;
-					goto yy113;
+					if (yych == '$') goto yy117;
+					goto yy95;
 				}
 			}
 		} else {
-			if (yych <= 'z') {
-				if (yych <= 'f') goto yy133;
-				if (yych == 'n') goto yy134;
-				goto yy113;
+			if (yych <= ':') {
+				if (yych <= '\'') goto yy109;
+				if (yych == '.') goto yy125;
+				goto yy95;
 			} else {
-				if (yych <= '|') {
-					if (yych <= '{') goto yy97;
-					goto yy114;
+				if (yych <= '') {
+					if (yych >= '<') goto yy95;
 				} else {
-					if (yych == '~') goto yy114;
-					goto yy97;
+					if (yych <= '\\') goto yy113;
+					if (yych >= '^') goto yy95;
 				}
 			}
 		}
-	}
-yy118:
-	YYDEBUG(118, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
-			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
-			}
+yy109:
+		YYDEBUG(109, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get number option value as string */
+	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
+}
+yy110:
+		YYDEBUG(110, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(111, *YYCURSOR);
+		if (yybm0+yych & 32) {
+			goto yy110;
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'R') goto yy136;
-				goto yy113;
+		if (yych <= '$') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy112;
+				if (yych <= '\f') goto yy95;
 			} else {
-				if (yych <= '') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych == '"') goto yy112;
+				if (yych <= '#') goto yy95;
+				goto yy117;
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 'r') goto yy136;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= ';') {
+				if (yych == '\'') goto yy112;
+				if (yych <= ':') goto yy95;
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
+				if (yych <= '') goto yy95;
+				if (yych <= '\\') goto yy113;
+				if (yych >= '^') goto yy95;
 			}
 		}
-	}
-yy119:
-	YYDEBUG(119, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
+yy112:
+		YYDEBUG(112, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get constant option value */
+	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
+}
+yy113:
+		YYDEBUG(113, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		goto yy95;
+yy114:
+		YYDEBUG(114, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(115, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy116;
+			if (yych <= '\t') goto yy114;
+			if (yych <= '\n') goto yy127;
 		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
-			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
-			}
+			if (yych <= '\r') goto yy128;
+			if (yych == ' ') goto yy114;
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'E') goto yy137;
-				goto yy113;
-			} else {
-				if (yych <= '') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
-			}
+yy116:
+		YYDEBUG(116, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* End of section */
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return '';
+}
+yy117:
+		YYDEBUG(117, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy118;
+			if (yych <= '') goto yy95;
+			goto yy119;
 		} else {
-			if (yych <= '{') {
-				if (yych == 'e') goto yy137;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
-			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
-			}
+			if (yych != '{') goto yy95;
 		}
-	}
-yy120:
-	YYDEBUG(120, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= 0x00) goto yy121;
-		if (yych <= '') goto yy96;
-		goto yy122;
-	} else {
-		if (yych != '{') goto yy96;
-	}
-yy121:
-	YYDEBUG(121, *YYCURSOR);
-	YYCURSOR = YYMARKER;
-	if (yyaccept <= 2) {
+yy118:
+		YYDEBUG(118, *YYCURSOR);
+		YYCURSOR = YYMARKER;
 		if (yyaccept <= 1) {
 			if (yyaccept == 0) {
-				goto yy98;
-			} else {
-				goto yy110;
-			}
-		} else {
-			goto yy114;
-		}
-	} else {
-		if (yyaccept <= 4) {
-			if (yyaccept == 3) {
-				goto yy131;
+				goto yy97;
 			} else {
-				goto yy135;
+				goto yy109;
 			}
 		} else {
-			goto yy148;
+			goto yy112;
 		}
-	}
-yy122:
-	YYDEBUG(122, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VALUE0+yych & 128) {
-		goto yy138;
-	}
-	goto yy96;
-yy123:
-	YYDEBUG(123, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Variable start */
+yy119:
+		YYDEBUG(119, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(120, *YYCURSOR);
+		if (yybm0+yych & 64) {
+			goto yy119;
+		}
+		goto yy95;
+yy121:
+		YYDEBUG(121, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(122, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Variable start */
 	yy_push_state(ST_VARNAME);
 	return TC_DOLLAR_CURLY;
 }
-yy124:
-	YYDEBUG(124, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VALUE0+yych & 64) {
-		goto yy124;
-	}
-	goto yy139;
+yy123:
+		YYDEBUG(123, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(124, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy123;
+		}
+		goto yy129;
 yy125:
-	YYDEBUG(125, *YYCURSOR);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy110;
-				if (yych <= 0x08) goto yy96;
-				goto yy110;
-			} else {
-				if (yych == '\r') goto yy110;
-				goto yy96;
+		YYDEBUG(125, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(126, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy109;
+				if (yych <= '\f') goto yy95;
+				goto yy109;
+			} else {
+				if (yych <= '"') {
+					if (yych <= '!') goto yy95;
+					goto yy109;
+				} else {
+					if (yych == '$') goto yy117;
+					goto yy95;
+				}
 			}
 		} else {
-			if (yych <= '$') {
-				if (yych <= '"') goto yy110;
-				if (yych <= '#') goto yy96;
-				goto yy120;
-			} else {
-				if (yych <= '%') goto yy96;
-				if (yych <= ')') goto yy110;
-				goto yy96;
-			}
-		}
-	} else {
-		if (yych <= '') {
-			if (yych <= ';') {
+			if (yych <= ':') {
+				if (yych <= '\'') goto yy109;
+				if (yych <= '/') goto yy95;
 				if (yych <= '9') goto yy125;
-				if (yych <= ':') goto yy96;
-				goto yy110;
-			} else {
-				if (yych == '=') goto yy110;
-				goto yy96;
-			}
-		} else {
-			if (yych <= '|') {
-				if (yych <= '^') goto yy110;
-				if (yych <= '{') goto yy96;
-				goto yy110;
+				goto yy95;
 			} else {
-				if (yych == '~') goto yy110;
-				goto yy96;
+				if (yych <= '') {
+					if (yych <= ';') goto yy109;
+					goto yy95;
+				} else {
+					if (yych <= '\\') goto yy113;
+					if (yych <= '') goto yy109;
+					goto yy95;
+				}
 			}
 		}
-	}
-yy126:
-	YYDEBUG(126, *YYCURSOR);
-	++YYCURSOR;
 yy127:
-	YYDEBUG(127, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Comment */
+		YYDEBUG(127, *YYCURSOR);
+		++YYCURSOR;
+		goto yy116;
+yy128:
+		YYDEBUG(128, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy127;
+		goto yy116;
+yy129:
+		YYDEBUG(129, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(130, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Raw string */
+	/* Eat leading and trailing single quotes */
+	if (yytext0 == '\'' && yytextyyleng - 1 == '\'') {
+		SCNG(yy_text)++;
+		yyleng = yyleng - 2;
+	}
+	RETURN_TOKEN(TC_RAW, yytext, yyleng);
+}
+	}
+/* *********************************** */
+yyc_ST_VALUE:
+	{
+		static const unsigned char yybm = {
+			 80,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  84,  64,  82,  82,  64,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 84,  80,  80,  82, 208,  82,  80,  16, 
+			 80,  80,  82,  82,  82,  82,  82,  82, 
+			122, 122, 122, 122, 122, 122, 122, 122, 
+			122, 122,  82,  80,  82,  80,  82,  82, 
+			 82, 114, 114, 114, 114, 114, 114, 114, 
+			114, 114, 114, 114, 114, 114, 114, 114, 
+			114, 114, 114, 114, 114, 114, 114, 114, 
+			114, 114, 114,  82,  82,  82,  80, 114, 
+			 82, 114, 114, 114, 114, 114, 114, 114, 
+			114, 114, 114, 114, 114, 114, 114, 114, 
+			114, 114, 114, 114, 114, 114, 114, 114, 
+			114, 114, 114,  82,  80,  82,  80,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+		};
+		YYDEBUG(131, *YYCURSOR);
+		YYFILL(6);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 4) {
+			goto yy138;
+		}
+		switch (yych) {
+		case 0x00:	goto yy133;
+		case '\t':
+		case '\n':	goto yy141;
+		case '\r':	goto yy143;
+		case ' ':
+		case '!':
+		case '&':
+		case '(':
+		case ')':
+		case '^':
+		case '|':
+		case '~':	goto yy144;
+		case '"':	goto yy147;
+		case '$':	goto yy149;
+		case '\'':	goto yy150;
+		case '-':
+		case '.':	goto yy151;
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':	goto yy152;
+		case ';':	goto yy155;
+		case '=':	goto yy157;
+		case 'A':
+		case 'B':
+		case 'C':
+		case 'D':
+		case 'E':
+		case 'G':
+		case 'H':
+		case 'I':
+		case 'J':
+		case 'K':
+		case 'L':
+		case 'M':
+		case 'P':
+		case 'Q':
+		case 'R':
+		case 'S':
+		case 'U':
+		case 'V':
+		case 'W':
+		case 'X':
+		case 'Z':
+		case '_':
+		case 'a':
+		case 'b':
+		case 'c':
+		case 'd':
+		case 'e':
+		case 'g':
+		case 'h':
+		case 'i':
+		case 'j':
+		case 'k':
+		case 'l':
+		case 'm':
+		case 'p':
+		case 'q':
+		case 'r':
+		case 's':
+		case 'u':
+		case 'v':
+		case 'w':
+		case 'x':
+		case 'z':	goto yy159;
+		case 'F':
+		case 'f':	goto yy162;
+		case 'N':
+		case 'n':	goto yy163;
+		case 'O':
+		case 'o':	goto yy164;
+		case 'T':
+		case 't':	goto yy165;
+		case 'Y':
+		case 'y':	goto yy166;
+		default:	goto yy135;
+		}
+yy133:
+		YYDEBUG(133, *YYCURSOR);
+		++YYCURSOR;
+yy134:
+		YYDEBUG(134, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* End of option value (if EOF is reached before EOL */
 	BEGIN(INITIAL);
-	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy128:
-	YYDEBUG(128, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy126;
-	goto yy127;
-yy129:
-	YYDEBUG(129, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
-			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
-			}
+yy135:
+		YYDEBUG(135, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy136:
+		YYDEBUG(136, *YYCURSOR);
+		if (yybm0+yych & 2) {
+			goto yy135;
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'L') goto yy140;
-				goto yy113;
-			} else {
-				if (yych <= '') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
-			}
-		} else {
-			if (yych <= '{') {
-				if (yych == 'l') goto yy140;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
-			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
-			}
+		if (yych <= '"') goto yy137;
+		if (yych <= '$') goto yy167;
+yy137:
+		YYDEBUG(137, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get everything else as option/offset value */
+	RETURN_TOKEN(TC_STRING, yytext, yyleng);
+}
+yy138:
+		YYDEBUG(138, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(139, *YYCURSOR);
+		if (yybm0+yych & 4) {
+			goto yy138;
 		}
-	}
-yy130:
-	YYDEBUG(130, *YYCURSOR);
-	yyaccept = 3;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '<') {
-		if (yych <= ' ') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy131;
-				if (yych <= 0x08) goto yy97;
-				if (yych <= '\t') goto yy141;
-			} else {
-				if (yych == '\r') goto yy131;
-				if (yych <= 0x1F) goto yy97;
-				goto yy141;
-			}
+		if (yych <= '\r') {
+			if (yych <= 0x08) goto yy140;
+			if (yych <= '\n') goto yy141;
+			if (yych >= '\r') goto yy143;
 		} else {
-			if (yych <= '/') {
-				if (yych <= '"') goto yy131;
-				if (yych <= '%') goto yy97;
-				if (yych >= '*') goto yy97;
+			if (yych <= '"') {
+				if (yych >= '"') goto yy147;
 			} else {
-				if (yych <= '9') goto yy113;
-				if (yych != ';') goto yy97;
+				if (yych == ';') goto yy155;
 			}
 		}
-	} else {
-		if (yych <= '_') {
-			if (yych <= 'N') {
-				if (yych <= '=') goto yy131;
-				if (yych <= '@') goto yy97;
-				if (yych <= 'M') goto yy113;
-				goto yy142;
+yy140:
+		YYDEBUG(140, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng);
+}
+yy141:
+		YYDEBUG(141, *YYCURSOR);
+		++YYCURSOR;
+yy142:
+		YYDEBUG(142, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* End of option value */
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return END_OF_LINE;
+}
+yy143:
+		YYDEBUG(143, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy141;
+		goto yy142;
+yy144:
+		YYDEBUG(144, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(145, *YYCURSOR);
+		if (yych == '\t') goto yy144;
+		if (yych == ' ') goto yy144;
+		YYDEBUG(146, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Boolean operators */
+	return yytext0;
+}
+yy147:
+		YYDEBUG(147, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(148, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Double quoted '"' string start */
+	yy_push_state(ST_DOUBLE_QUOTES);
+	return '"';
+}
+yy149:
+		YYDEBUG(149, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy134;
+			if (yych <= '') goto yy135;
+			goto yy169;
+		} else {
+			if (yych == '{') goto yy170;
+			goto yy135;
+		}
+yy150:
+		YYDEBUG(150, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yybm0+yych & 64) {
+			goto yy172;
+		}
+		goto yy134;
+yy151:
+		YYDEBUG(151, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') goto yy136;
+		if (yych <= '9') goto yy174;
+		goto yy136;
+yy152:
+		YYDEBUG(152, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(153, *YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy152;
+		}
+		if (yych <= '-') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy154;
+					if (yych <= 0x08) goto yy135;
+				} else {
+					if (yych != '\r') goto yy135;
+				}
 			} else {
-				if (yych <= 'Z') goto yy113;
-				if (yych <= '') goto yy97;
-				if (yych >= '_') goto yy113;
+				if (yych <= '$') {
+					if (yych <= '"') goto yy154;
+					if (yych <= '#') goto yy135;
+					goto yy167;
+				} else {
+					if (yych <= '%') goto yy135;
+					if (yych >= '*') goto yy135;
+				}
 			}
 		} else {
-			if (yych <= 'z') {
-				if (yych <= '`') goto yy97;
-				if (yych == 'n') goto yy142;
-				goto yy113;
+			if (yych <= '') {
+				if (yych <= ';') {
+					if (yych <= '.') goto yy174;
+					if (yych <= ':') goto yy135;
+				} else {
+					if (yych != '=') goto yy135;
+				}
 			} else {
 				if (yych <= '|') {
-					if (yych <= '{') goto yy97;
+					if (yych <= '^') goto yy154;
+					if (yych <= '{') goto yy135;
 				} else {
-					if (yych != '~') goto yy97;
+					if (yych != '~') goto yy135;
 				}
 			}
 		}
-	}
-yy131:
-	YYDEBUG(131, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
-	RETURN_TOKEN(BOOL_FALSE, "", 0);
+yy154:
+		YYDEBUG(154, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get number option value as string */
+	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
+}
+yy155:
+		YYDEBUG(155, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(156, *YYCURSOR);
+		if (yybm0+yych & 16) {
+			goto yy155;
+		}
+		if (yych <= '\n') goto yy176;
+		goto yy178;
+yy157:
+		YYDEBUG(157, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(158, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Make = used in option value to trigger error */
+	yyless(0);
+	BEGIN(INITIAL);
+	return END_OF_LINE;
 }
-yy132:
-	YYDEBUG(132, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
+yy159:
+		YYDEBUG(159, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(160, *YYCURSOR);
+		if (yybm0+yych & 32) {
+			goto yy159;
+		}
+		if (yych <= ')') {
+			if (yych <= '\r') {
+				if (yych <= 0x08) {
+					if (yych >= 0x01) goto yy135;
+				} else {
+					if (yych <= '\n') goto yy161;
+					if (yych <= '\f') goto yy135;
+				}
+			} else {
+				if (yych <= '#') {
+					if (yych <= 0x1F) goto yy135;
+					if (yych >= '#') goto yy135;
+				} else {
+					if (yych <= '$') goto yy167;
+					if (yych <= '%') goto yy135;
+				}
 			}
 		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
+			if (yych <= '') {
+				if (yych <= ';') {
+					if (yych <= ':') goto yy135;
+				} else {
+					if (yych != '=') goto yy135;
+				}
 			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
+				if (yych <= '|') {
+					if (yych <= '^') goto yy161;
+					if (yych <= '{') goto yy135;
+				} else {
+					if (yych != '~') goto yy135;
+				}
 			}
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'L') goto yy143;
-				goto yy113;
+yy161:
+		YYDEBUG(161, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get constant option value */
+	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
+}
+yy162:
+		YYDEBUG(162, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '<') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= '') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= '/') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					goto yy136;
+				} else {
+					if (yych <= '9') goto yy159;
+					if (yych == ';') goto yy161;
+					goto yy136;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 'l') goto yy143;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= '_') {
+				if (yych <= 'A') {
+					if (yych <= '=') goto yy161;
+					if (yych <= '@') goto yy136;
+					goto yy179;
+				} else {
+					if (yych <= 'Z') goto yy159;
+					if (yych <= '') goto yy136;
+					if (yych <= '^') goto yy161;
+					goto yy159;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
+				if (yych <= '{') {
+					if (yych <= '`') goto yy136;
+					if (yych <= 'a') goto yy179;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	}
-yy133:
-	YYDEBUG(133, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
+yy163:
+		YYDEBUG(163, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'N') {
+			if (yych <= '%') {
+				if (yych <= '\f') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					if (yych <= '\n') goto yy161;
+					goto yy136;
+				} else {
+					if (yych <= '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					if (yych <= '"') goto yy161;
+					goto yy136;
+				}
+			} else {
+				if (yych <= ':') {
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					if (yych <= '9') goto yy159;
+					goto yy136;
+				} else {
+					if (yych <= '<') {
+						if (yych <= ';') goto yy161;
+						goto yy136;
+					} else {
+						if (yych <= '=') goto yy161;
+						if (yych <= '@') goto yy136;
+						goto yy159;
+					}
+				}
 			}
 		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
+			if (yych <= 'n') {
+				if (yych <= 'Z') {
+					if (yych <= 'O') goto yy180;
+					if (yych == 'U') goto yy182;
+					goto yy159;
+				} else {
+					if (yych <= '^') {
+						if (yych <= '') goto yy136;
+						goto yy161;
+					} else {
+						if (yych == '`') goto yy136;
+						goto yy159;
+					}
+				}
 			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
+				if (yych <= 'z') {
+					if (yych <= 'o') goto yy180;
+					if (yych == 'u') goto yy182;
+					goto yy159;
+				} else {
+					if (yych <= '|') {
+						if (yych <= '{') goto yy136;
+						goto yy161;
+					} else {
+						if (yych == '~') goto yy161;
+						goto yy136;
+					}
+				}
 			}
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'F') goto yy144;
-				goto yy113;
+yy164:
+		YYDEBUG(164, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'E') {
+			if (yych <= '%') {
+				if (yych <= '\f') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					if (yych <= '\n') goto yy161;
+					goto yy136;
+				} else {
+					if (yych <= '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					if (yych <= '"') goto yy161;
+					goto yy136;
+				}
 			} else {
-				if (yych <= '') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= ':') {
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					if (yych <= '9') goto yy159;
+					goto yy136;
+				} else {
+					if (yych <= '<') {
+						if (yych <= ';') goto yy161;
+						goto yy136;
+					} else {
+						if (yych <= '=') goto yy161;
+						if (yych <= '@') goto yy136;
+						goto yy159;
+					}
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 'f') goto yy144;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= 'e') {
+				if (yych <= 'Z') {
+					if (yych <= 'F') goto yy183;
+					if (yych == 'N') goto yy184;
+					goto yy159;
+				} else {
+					if (yych <= '^') {
+						if (yych <= '') goto yy136;
+						goto yy161;
+					} else {
+						if (yych == '`') goto yy136;
+						goto yy159;
+					}
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
+				if (yych <= 'z') {
+					if (yych <= 'f') goto yy183;
+					if (yych == 'n') goto yy184;
+					goto yy159;
+				} else {
+					if (yych <= '|') {
+						if (yych <= '{') goto yy136;
+						goto yy161;
+					} else {
+						if (yych == '~') goto yy161;
+						goto yy136;
+					}
+				}
 			}
 		}
-	}
-yy134:
-	YYDEBUG(134, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_VALUE0+yych & 32) {
-		goto yy113;
-	}
-	if (yych <= ')') {
-		if (yych <= '\f') {
-			if (yych <= 0x08) {
-				if (yych >= 0x01) goto yy97;
+yy165:
+		YYDEBUG(165, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= '\t') goto yy145;
-				if (yych >= '\v') goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= ' ') {
-				if (yych <= '\r') goto yy135;
-				if (yych <= 0x1F) goto yy97;
-				goto yy145;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'R') goto yy186;
+					goto yy159;
+				} else {
+					if (yych <= '') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych <= '"') goto yy135;
-				if (yych <= '%') goto yy97;
+				if (yych <= '{') {
+					if (yych == 'r') goto yy186;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	} else {
-		if (yych <= '') {
-			if (yych <= ';') {
-				if (yych <= ':') goto yy97;
+yy166:
+		YYDEBUG(166, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych != '=') goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '|') {
-				if (yych <= '^') goto yy135;
-				if (yych <= '{') goto yy97;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'E') goto yy187;
+					goto yy159;
+				} else {
+					if (yych <= '') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych != '~') goto yy97;
+				if (yych <= '{') {
+					if (yych == 'e') goto yy187;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	}
-yy135:
-	YYDEBUG(135, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* TRUE value (when used outside option value/offset this causes parse error!) */
-	RETURN_TOKEN(BOOL_TRUE, "1", 1);
-}
-yy136:
-	YYDEBUG(136, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
+yy167:
+		YYDEBUG(167, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy168;
+			if (yych <= '') goto yy135;
+			goto yy169;
+		} else {
+			if (yych != '{') goto yy135;
+		}
+yy168:
+		YYDEBUG(168, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept <= 2) {
+			if (yyaccept <= 1) {
+				if (yyaccept == 0) {
+					goto yy137;
+				} else {
+					goto yy154;
+				}
+			} else {
+				goto yy161;
 			}
 		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
+			if (yyaccept <= 4) {
+				if (yyaccept == 3) {
+					goto yy181;
+				} else {
+					goto yy185;
+				}
 			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
+				goto yy202;
 			}
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'U') goto yy146;
-				goto yy113;
+yy169:
+		YYDEBUG(169, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 128) {
+			goto yy188;
+		}
+		goto yy135;
+yy170:
+		YYDEBUG(170, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(171, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Variable start */
+	yy_push_state(ST_VARNAME);
+	return TC_DOLLAR_CURLY;
+}
+yy172:
+		YYDEBUG(172, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(173, *YYCURSOR);
+		if (yybm0+yych & 64) {
+			goto yy172;
+		}
+		goto yy190;
+yy174:
+		YYDEBUG(174, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(175, *YYCURSOR);
+		if (yych <= '/') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy154;
+					if (yych <= 0x08) goto yy135;
+					goto yy154;
+				} else {
+					if (yych == '\r') goto yy154;
+					goto yy135;
+				}
 			} else {
-				if (yych <= '') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= '$') {
+					if (yych <= '"') goto yy154;
+					if (yych <= '#') goto yy135;
+					goto yy167;
+				} else {
+					if (yych <= '%') goto yy135;
+					if (yych <= ')') goto yy154;
+					goto yy135;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 'u') goto yy146;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= '') {
+				if (yych <= ';') {
+					if (yych <= '9') goto yy174;
+					if (yych <= ':') goto yy135;
+					goto yy154;
+				} else {
+					if (yych == '=') goto yy154;
+					goto yy135;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
+				if (yych <= '|') {
+					if (yych <= '^') goto yy154;
+					if (yych <= '{') goto yy135;
+					goto yy154;
+				} else {
+					if (yych == '~') goto yy154;
+					goto yy135;
+				}
 			}
 		}
-	}
-yy137:
-	YYDEBUG(137, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
+yy176:
+		YYDEBUG(176, *YYCURSOR);
+		++YYCURSOR;
+yy177:
+		YYDEBUG(177, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Comment */
+	BEGIN(INITIAL);
+	SCNG(lineno)++;
+	return END_OF_LINE;
+}
+yy178:
+		YYDEBUG(178, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy176;
+		goto yy177;
+yy179:
+		YYDEBUG(179, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'L') goto yy192;
+					goto yy159;
+				} else {
+					if (yych <= '') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
+				if (yych <= '{') {
+					if (yych == 'l') goto yy192;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'S') goto yy134;
-				goto yy113;
+yy180:
+		YYDEBUG(180, *YYCURSOR);
+		yyaccept = 3;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '<') {
+			if (yych <= ' ') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy181;
+					if (yych <= 0x08) goto yy136;
+					if (yych <= '\t') goto yy193;
+				} else {
+					if (yych == '\r') goto yy181;
+					if (yych <= 0x1F) goto yy136;
+					goto yy193;
+				}
 			} else {
-				if (yych <= '') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= '/') {
+					if (yych <= '"') goto yy181;
+					if (yych <= '%') goto yy136;
+					if (yych >= '*') goto yy136;
+				} else {
+					if (yych <= '9') goto yy159;
+					if (yych != ';') goto yy136;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 's') goto yy134;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= '_') {
+				if (yych <= 'N') {
+					if (yych <= '=') goto yy181;
+					if (yych <= '@') goto yy136;
+					if (yych <= 'M') goto yy159;
+					goto yy195;
+				} else {
+					if (yych <= 'Z') goto yy159;
+					if (yych <= '') goto yy136;
+					if (yych >= '_') goto yy159;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
+				if (yych <= 'z') {
+					if (yych <= '`') goto yy136;
+					if (yych == 'n') goto yy195;
+					goto yy159;
+				} else {
+					if (yych <= '|') {
+						if (yych <= '{') goto yy136;
+					} else {
+						if (yych != '~') goto yy136;
+					}
+				}
 			}
 		}
-	}
-yy138:
-	YYDEBUG(138, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VALUE0+yych & 128) {
-		goto yy138;
-	}
-	if (yych <= 0x00) goto yy98;
-	if (yych == '\\') goto yy122;
-	goto yy96;
-yy139:
-	YYDEBUG(139, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Raw string */
-	/* Eat leading and trailing single quotes */
-	if (yytext0 == '\'' && yytextyyleng - 1 == '\'') {
-		SCNG(yy_text)++;
-		yyleng = yyleng - 2;
-	}
-	RETURN_TOKEN(TC_RAW, yytext, yyleng);
+yy181:
+		YYDEBUG(181, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
+	RETURN_TOKEN(BOOL_FALSE, "", 0);
 }
-yy140:
-	YYDEBUG(140, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
+yy182:
+		YYDEBUG(182, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'L') goto yy196;
+					goto yy159;
+				} else {
+					if (yych <= '') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
+				if (yych <= '{') {
+					if (yych == 'l') goto yy196;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'S') goto yy142;
-				goto yy113;
-			} else {
-				if (yych <= '') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
-			}
-		} else {
-			if (yych <= '{') {
-				if (yych == 's') goto yy142;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+yy183:
+		YYDEBUG(183, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
-			}
-		}
-	}
-yy141:
-	YYDEBUG(141, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy141;
-	if (yych == ' ') goto yy141;
-	goto yy131;
-yy142:
-	YYDEBUG(142, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'F') goto yy197;
+					goto yy159;
+				} else {
+					if (yych <= '') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
+				if (yych <= '{') {
+					if (yych == 'f') goto yy197;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'E') goto yy144;
-				goto yy113;
+yy184:
+		YYDEBUG(184, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 32) {
+			goto yy159;
+		}
+		if (yych <= ')') {
+			if (yych <= '\f') {
+				if (yych <= 0x08) {
+					if (yych >= 0x01) goto yy136;
+				} else {
+					if (yych <= '\t') goto yy198;
+					if (yych >= '\v') goto yy136;
+				}
 			} else {
-				if (yych <= '') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= ' ') {
+					if (yych <= '\r') goto yy185;
+					if (yych <= 0x1F) goto yy136;
+					goto yy198;
+				} else {
+					if (yych <= '"') goto yy185;
+					if (yych <= '%') goto yy136;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 'e') goto yy144;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= '') {
+				if (yych <= ';') {
+					if (yych <= ':') goto yy136;
+				} else {
+					if (yych != '=') goto yy136;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
+				if (yych <= '|') {
+					if (yych <= '^') goto yy185;
+					if (yych <= '{') goto yy136;
+				} else {
+					if (yych != '~') goto yy136;
+				}
 			}
 		}
-	}
-yy143:
-	YYDEBUG(143, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
+yy185:
+		YYDEBUG(185, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* TRUE value (when used outside option value/offset this causes parse error!) */
+	RETURN_TOKEN(BOOL_TRUE, "1", 1);
+}
+yy186:
+		YYDEBUG(186, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'U') goto yy200;
+					goto yy159;
+				} else {
+					if (yych <= '') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
+				if (yych <= '{') {
+					if (yych == 'u') goto yy200;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'L') goto yy147;
-				goto yy113;
+yy187:
+		YYDEBUG(187, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= '') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 'l') goto yy147;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'S') goto yy184;
+					goto yy159;
+				} else {
+					if (yych <= '') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
+				if (yych <= '{') {
+					if (yych == 's') goto yy184;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
+yy188:
+		YYDEBUG(188, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(189, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy188;
+		}
+		if (yych <= 0x00) goto yy137;
+		if (yych == '\\') goto yy169;
+		goto yy135;
+yy190:
+		YYDEBUG(190, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(191, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Raw string */
+	/* Eat leading and trailing single quotes */
+	if (yytext0 == '\'' && yytextyyleng - 1 == '\'') {
+		SCNG(yy_text)++;
+		yyleng = yyleng - 2;
 	}
-yy144:
-	YYDEBUG(144, *YYCURSOR);
-	yyaccept = 3;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_VALUE0+yych & 32) {
-		goto yy113;
-	}
-	if (yych <= ')') {
-		if (yych <= '\f') {
-			if (yych <= 0x08) {
-				if (yych <= 0x00) goto yy131;
-				goto yy97;
+	RETURN_TOKEN(TC_RAW, yytext, yyleng);
+}
+yy192:
+		YYDEBUG(192, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= '\t') goto yy141;
-				if (yych <= '\n') goto yy131;
-				goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= ' ') {
-				if (yych <= '\r') goto yy131;
-				if (yych <= 0x1F) goto yy97;
-				goto yy141;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'S') goto yy195;
+					goto yy159;
+				} else {
+					if (yych <= '') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych <= '"') goto yy131;
-				if (yych <= '%') goto yy97;
-				goto yy131;
+				if (yych <= '{') {
+					if (yych == 's') goto yy195;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	} else {
-		if (yych <= '') {
-			if (yych <= ';') {
-				if (yych <= ':') goto yy97;
-				goto yy131;
+yy193:
+		YYDEBUG(193, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(194, *YYCURSOR);
+		if (yych == '\t') goto yy193;
+		if (yych == ' ') goto yy193;
+		goto yy181;
+yy195:
+		YYDEBUG(195, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych == '=') goto yy131;
-				goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '|') {
-				if (yych <= '^') goto yy131;
-				if (yych <= '{') goto yy97;
-				goto yy131;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'E') goto yy197;
+					goto yy159;
+				} else {
+					if (yych <= '') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych == '~') goto yy131;
-				goto yy97;
+				if (yych <= '{') {
+					if (yych == 'e') goto yy197;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	}
-yy145:
-	YYDEBUG(145, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy145;
-	if (yych == ' ') goto yy145;
-	goto yy135;
-yy146:
-	YYDEBUG(146, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
+yy196:
+		YYDEBUG(196, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
+			} else {
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'L') goto yy201;
+					goto yy159;
+				} else {
+					if (yych <= '') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
+				if (yych <= '{') {
+					if (yych == 'l') goto yy201;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'E') goto yy134;
-				goto yy113;
+yy197:
+		YYDEBUG(197, *YYCURSOR);
+		yyaccept = 3;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 32) {
+			goto yy159;
+		}
+		if (yych <= ')') {
+			if (yych <= '\f') {
+				if (yych <= 0x08) {
+					if (yych <= 0x00) goto yy181;
+					goto yy136;
+				} else {
+					if (yych <= '\t') goto yy193;
+					if (yych <= '\n') goto yy181;
+					goto yy136;
+				}
 			} else {
-				if (yych <= '') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= ' ') {
+					if (yych <= '\r') goto yy181;
+					if (yych <= 0x1F) goto yy136;
+					goto yy193;
+				} else {
+					if (yych <= '"') goto yy181;
+					if (yych <= '%') goto yy136;
+					goto yy181;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 'e') goto yy134;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= '') {
+				if (yych <= ';') {
+					if (yych <= ':') goto yy136;
+					goto yy181;
+				} else {
+					if (yych == '=') goto yy181;
+					goto yy136;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
+				if (yych <= '|') {
+					if (yych <= '^') goto yy181;
+					if (yych <= '{') goto yy136;
+					goto yy181;
+				} else {
+					if (yych == '~') goto yy181;
+					goto yy136;
+				}
 			}
 		}
-	}
-yy147:
-	YYDEBUG(147, *YYCURSOR);
-	yyaccept = 5;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_VALUE0+yych & 32) {
-		goto yy113;
-	}
-	if (yych <= ')') {
-		if (yych <= '\f') {
-			if (yych <= 0x08) {
-				if (yych >= 0x01) goto yy97;
+yy198:
+		YYDEBUG(198, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(199, *YYCURSOR);
+		if (yych == '\t') goto yy198;
+		if (yych == ' ') goto yy198;
+		goto yy185;
+yy200:
+		YYDEBUG(200, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= '\t') goto yy149;
-				if (yych >= '\v') goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= ' ') {
-				if (yych <= '\r') goto yy148;
-				if (yych <= 0x1F) goto yy97;
-				goto yy149;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'E') goto yy184;
+					goto yy159;
+				} else {
+					if (yych <= '') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych <= '"') goto yy148;
-				if (yych <= '%') goto yy97;
+				if (yych <= '{') {
+					if (yych == 'e') goto yy184;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	} else {
-		if (yych <= '') {
-			if (yych <= ';') {
-				if (yych <= ':') goto yy97;
+yy201:
+		YYDEBUG(201, *YYCURSOR);
+		yyaccept = 5;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 32) {
+			goto yy159;
+		}
+		if (yych <= ')') {
+			if (yych <= '\f') {
+				if (yych <= 0x08) {
+					if (yych >= 0x01) goto yy136;
+				} else {
+					if (yych <= '\t') goto yy203;
+					if (yych >= '\v') goto yy136;
+				}
 			} else {
-				if (yych != '=') goto yy97;
+				if (yych <= ' ') {
+					if (yych <= '\r') goto yy202;
+					if (yych <= 0x1F) goto yy136;
+					goto yy203;
+				} else {
+					if (yych <= '"') goto yy202;
+					if (yych <= '%') goto yy136;
+				}
 			}
 		} else {
-			if (yych <= '|') {
-				if (yych <= '^') goto yy148;
-				if (yych <= '{') goto yy97;
+			if (yych <= '') {
+				if (yych <= ';') {
+					if (yych <= ':') goto yy136;
+				} else {
+					if (yych != '=') goto yy136;
+				}
 			} else {
-				if (yych != '~') goto yy97;
+				if (yych <= '|') {
+					if (yych <= '^') goto yy202;
+					if (yych <= '{') goto yy136;
+				} else {
+					if (yych != '~') goto yy136;
+				}
 			}
 		}
-	}
-yy148:
-	YYDEBUG(148, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy202:
+		YYDEBUG(202, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(NULL_NULL, "", 0);
 }
-yy149:
-	YYDEBUG(149, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy149;
-	if (yych == ' ') goto yy149;
-	goto yy148;
+yy203:
+		YYDEBUG(203, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(204, *YYCURSOR);
+		if (yych == '\t') goto yy203;
+		if (yych == ' ') goto yy203;
+		goto yy202;
+	}
 /* *********************************** */
 yyc_ST_SECTION_RAW:
-	YYDEBUG(150, *YYCURSOR);
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_RAW0+yych & 64) {
-		goto yy151;
-	}
-	if (yych <= '\r') goto yy152;
-	goto yy153;
-yy151:
-	YYDEBUG(151, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_RAW0+yych & 64) {
-		goto yy151;
-	}
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
+	{
+		static const unsigned char yybm = {
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64, 192,   0,  64,  64,   0,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			192,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,   0,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+		};
+		YYDEBUG(205, *YYCURSOR);
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 64) {
+			goto yy207;
+		}
+		if (yych <= '\r') goto yy210;
+		goto yy212;
+yy207:
+		YYDEBUG(207, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(208, *YYCURSOR);
+		if (yybm0+yych & 64) {
+			goto yy207;
+		}
+		YYDEBUG(209, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-yy152:
-	YYDEBUG(152, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy210:
+		YYDEBUG(210, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(211, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	return 0;
 }
-yy153:
-	YYDEBUG(153, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_RAW0+yych & 128) {
-		goto yy153;
-	}
-	if (yych <= 0x08) goto yy154;
-	if (yych <= '\n') goto yy155;
-	if (yych == '\r') goto yy156;
-yy154:
-	YYDEBUG(154, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* End of section */
+yy212:
+		YYDEBUG(212, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(213, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy212;
+		}
+		if (yych <= 0x08) goto yy214;
+		if (yych <= '\n') goto yy215;
+		if (yych == '\r') goto yy216;
+yy214:
+		YYDEBUG(214, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* End of section */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return '';
 }
-yy155:
-	YYDEBUG(155, *YYCURSOR);
-	++YYCURSOR;
-	goto yy154;
-yy156:
-	YYDEBUG(156, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy155;
-	goto yy154;
+yy215:
+		YYDEBUG(215, *YYCURSOR);
+		++YYCURSOR;
+		goto yy214;
+yy216:
+		YYDEBUG(216, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy215;
+		goto yy214;
+	}
 /* *********************************** */
 yyc_ST_DOUBLE_QUOTES:
-	YYDEBUG(157, *YYCURSOR);
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych == '"') goto yy159;
-	if (yych == '$') goto yy160;
-	++YYCURSOR;
-yy158:
-	YYDEBUG(158, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Escape double quoted string contents */
+	{
+		static const unsigned char yybm = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0, 128,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			128,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+		};
+		YYDEBUG(217, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych == '"') goto yy221;
+		if (yych == '$') goto yy224;
+		YYDEBUG(219, *YYCURSOR);
+		++YYCURSOR;
+yy220:
+		YYDEBUG(220, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Escape double quoted string contents */
 	if (YYCURSOR > YYLIMIT) {
 		return 0;
 	}
@@ -3449,49 +3450,91 @@
 	zend_ini_escape_string(ini_lval, yytext, yyleng, '"');
 	return TC_QUOTED_STRING;
 }
-yy159:
-	YYDEBUG(159, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_DOUBLE_QUOTES0+yych & 128) {
-		goto yy159;
-	}
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Double quoted '"' string ends */
+yy221:
+		YYDEBUG(221, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(222, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy221;
+		}
+		YYDEBUG(223, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Double quoted '"' string ends */
 	yy_pop_state();
 	return '"';
 }
-yy160:
-	YYDEBUG(160, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych != '{') goto yy158;
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Variable start */
+yy224:
+		YYDEBUG(224, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych != '{') goto yy220;
+		YYDEBUG(225, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(226, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Variable start */
 	yy_push_state(ST_VARNAME);
 	return TC_DOLLAR_CURLY;
 }
+	}
 /* *********************************** */
 yyc_ST_VARNAME:
-	YYDEBUG(161, *YYCURSOR);
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VARNAME0+yych & 128) {
-		goto yy162;
-	}
-	if (yych == '}') goto yy164;
-	goto yy163;
-yy162:
-	YYDEBUG(162, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VARNAME0+yych & 128) {
-		goto yy162;
-	}
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Variable name */
+	{
+		static const unsigned char yybm = {
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128,   0,   0, 128, 128,   0, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128,   0,   0, 128,   0, 128,   0, 128, 
+			  0,   0, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0, 128,   0, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0, 128, 128,   0, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(227, *YYCURSOR);
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 128) {
+			goto yy229;
+		}
+		if (yych == '}') goto yy234;
+		goto yy232;
+yy229:
+		YYDEBUG(229, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(230, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy229;
+		}
+		YYDEBUG(231, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Variable name */
 	/* Eat leading whitespace */
 	EAT_LEADING_WHITESPACE();
 
@@ -3500,57 +3543,97 @@
 
 	RETURN_TOKEN(TC_VARNAME, yytext, yyleng);
 }
-yy163:
-	YYDEBUG(163, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy232:
+		YYDEBUG(232, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(233, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	return 0;
 }
-yy164:
-	YYDEBUG(164, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Variable end */
+yy234:
+		YYDEBUG(234, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(235, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Variable end */
 	yy_pop_state();
 	return '}';
 }
+	}
 /* *********************************** */
 yyc_ST_RAW:
-	YYDEBUG(165, *YYCURSOR);
-	YYFILL(3);
-	yych = *YYCURSOR;
-	if (yych <= '\f') {
-		if (yych <= 0x08) {
-			if (yych >= 0x01) goto yy166;
-		} else {
-			if (yych <= '\t') goto yy168;
-			if (yych <= '\n') goto yy169;
-			goto yy166;
-		}
-	} else {
-		if (yych <= ' ') {
-			if (yych <= '\r') goto yy171;
-			if (yych <= 0x1F) goto yy166;
-			goto yy168;
+	{
+		static const unsigned char yybm = {
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64, 192,   0,  64,  64,   0,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			192,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+		};
+		YYDEBUG(236, *YYCURSOR);
+		YYFILL(3);
+		yych = *YYCURSOR;
+		if (yych <= '\f') {
+			if (yych <= 0x08) {
+				if (yych >= 0x01) goto yy240;
+			} else {
+				if (yych <= '\t') goto yy242;
+				if (yych <= '\n') goto yy243;
+				goto yy240;
+			}
 		} else {
-			if (yych == ';') goto yy172;
-			goto yy166;
+			if (yych <= ' ') {
+				if (yych <= '\r') goto yy245;
+				if (yych <= 0x1F) goto yy240;
+				goto yy242;
+			} else {
+				if (yych == ';') goto yy246;
+				goto yy240;
+			}
 		}
-	}
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* End of option value (if EOF is reached before EOL */
+		YYDEBUG(238, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(239, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* End of option value (if EOF is reached before EOL */
 	BEGIN(INITIAL);
 	return END_OF_LINE;
 }
-yy166:
-	YYDEBUG(166, *YYCURSOR);
-	++YYCURSOR;
-yy167:
-	YYDEBUG(167, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
+yy240:
+		YYDEBUG(240, *YYCURSOR);
+		++YYCURSOR;
+yy241:
+		YYDEBUG(241, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
 	unsigned char *sc = NULL;
 	EAT_LEADING_WHITESPACE();
 	while (YYCURSOR < YYLIMIT) {
@@ -3593,89 +3676,91 @@
 
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-yy168:
-	YYDEBUG(168, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '\r') {
-		if (yych <= 0x08) goto yy167;
-		if (yych <= '\n') goto yy174;
-		if (yych <= '\f') goto yy167;
-		goto yy174;
-	} else {
-		if (yych <= ' ') {
-			if (yych <= 0x1F) goto yy167;
-			goto yy174;
+yy242:
+		YYDEBUG(242, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\r') {
+			if (yych <= 0x08) goto yy241;
+			if (yych <= '\n') goto yy249;
+			if (yych <= '\f') goto yy241;
+			goto yy249;
 		} else {
-			if (yych == ';') goto yy174;
-			goto yy167;
+			if (yych <= ' ') {
+				if (yych <= 0x1F) goto yy241;
+				goto yy249;
+			} else {
+				if (yych == ';') goto yy249;
+				goto yy241;
+			}
 		}
-	}
-yy169:
-	YYDEBUG(169, *YYCURSOR);
-	++YYCURSOR;
-yy170:
-	YYDEBUG(170, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* End of option value */
+yy243:
+		YYDEBUG(243, *YYCURSOR);
+		++YYCURSOR;
+yy244:
+		YYDEBUG(244, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* End of option value */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy171:
-	YYDEBUG(171, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy169;
-	goto yy170;
-yy172:
-	YYDEBUG(172, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_ST_RAW0+yych & 64) {
-		goto yy172;
-	}
-	if (yych <= '\n') goto yy176;
-	goto yy178;
-yy173:
-	YYDEBUG(173, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-yy174:
-	YYDEBUG(174, *YYCURSOR);
-	if (yybm_ST_RAW0+yych & 128) {
-		goto yy173;
-	}
-	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy175;
-		if (yych <= '\n') goto yy169;
-	} else {
-		if (yych <= '\r') goto yy171;
-		if (yych == ';') goto yy172;
-	}
-yy175:
-	YYDEBUG(175, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy245:
+		YYDEBUG(245, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy243;
+		goto yy244;
+yy246:
+		YYDEBUG(246, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(247, *YYCURSOR);
+		if (yybm0+yych & 64) {
+			goto yy246;
+		}
+		if (yych <= '\n') goto yy251;
+		goto yy253;
+yy248:
+		YYDEBUG(248, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+yy249:
+		YYDEBUG(249, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy248;
+		}
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy250;
+			if (yych <= '\n') goto yy243;
+		} else {
+			if (yych <= '\r') goto yy245;
+			if (yych == ';') goto yy246;
+		}
+yy250:
+		YYDEBUG(250, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* eat whitespace */
 	goto restart;
 }
-yy176:
-	YYDEBUG(176, *YYCURSOR);
-	++YYCURSOR;
-yy177:
-	YYDEBUG(177, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Comment */
+yy251:
+		YYDEBUG(251, *YYCURSOR);
+		++YYCURSOR;
+yy252:
+		YYDEBUG(252, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Comment */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy178:
-	YYDEBUG(178, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy176;
-	goto yy177;
+yy253:
+		YYDEBUG(253, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy251;
+		goto yy252;
+	}
 }
 
 }

php-8.2.23.tar.xz/Zend/zend_ini_scanner_defs.h -> php-8.2.28.tar.xz/Zend/zend_ini_scanner_defs.h Changed

php-8.2.23.tar.xz/Zend/zend_interfaces.c -> php-8.2.28.tar.xz/Zend/zend_interfaces.c Changed

php-8.2.23.tar.xz/Zend/zend_language_parser.c -> php-8.2.28.tar.xz/Zend/zend_language_parser.c Changed

@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.8.2.  */
+/* A Bison parser, made by GNU Bison 3.7.5.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -46,10 +46,10 @@
    USER NAME SPACE" below.  */
 
 /* Identify Bison output, and Bison version.  */
-#define YYBISON 30802
+#define YYBISON 30705
 
 /* Bison version string.  */
-#define YYBISON_VERSION "3.8.2"
+#define YYBISON_VERSION "3.7.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -629,18 +629,12 @@
 # define YY_USE(E) /* empty */
 #endif
 
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
-# if __GNUC__ * 100 + __GNUC_MINOR__ < 407
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
-    _Pragma ("GCC diagnostic push")                                     \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")
-# else
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                            \
     _Pragma ("GCC diagnostic push")                                     \
     _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# endif
 # define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
     _Pragma ("GCC diagnostic pop")
 #else
@@ -869,7 +863,7 @@
 };
 
 #if ZENDDEBUG
-/* YYRLINEYYN -- Source line where rule number YYN was defined.  */
+  /* YYRLINEYYN -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline =
 {
        0,   296,   296,   300,   300,   300,   300,   300,   300,   300,
@@ -1048,6 +1042,32 @@
 }
 #endif
 
+#ifdef YYPRINT
+/* YYTOKNUMNUM -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_int16 yytoknum =
+{
+       0,   256,   257,   258,    61,    63,    58,   124,    94,    60,
+      62,    46,    43,    45,    42,    47,    37,    33,   126,    64,
+     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
+     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
+     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
+     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
+     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
+     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
+     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
+     339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
+     349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
+     359,   360,   361,   362,   363,   364,   365,   366,   367,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
+     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
+     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,   405,   406,    44,    93,
+      40,    41,    59,   123,   125,    91,    96,    34,    36
+};
+#endif
+
 #define YYPACT_NINF (-900)
 
 #define yypact_value_is_default(Yyn) \
@@ -1058,8 +1078,8 @@
 #define yytable_value_is_error(Yyn) \
   ((Yyn) == YYTABLE_NINF)
 
-/* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
+  /* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
 static const yytype_int16 yypact =
 {
     -900,    96,  3527,  -900,  7034,  7034,  7034,  7034,  7034,  -900,
@@ -1176,9 +1196,9 @@
     -900,  -900,  -900,  5531,  -900,  -900
 };
 
-/* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE does not specify something else to do.  Zero
-   means the default is an error.  */
+  /* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_int16 yydefact =
 {
       86,     0,     2,     1,     0,     0,     0,     0,     0,   494,
@@ -1295,7 +1315,7 @@
      339,   144,   462,     0,   317,   340
 };
 
-/* YYPGOTONTERM-NUM.  */
+  /* YYPGOTONTERM-NUM.  */
 static const yytype_int16 yypgoto =
 {
     -900,  -900,   -20,  -900,  -101,    24,  -450,  -900,   -22,  -174,
@@ -1318,7 +1338,7 @@
      692,  -900,  -900,  -900,   452
 };
 
-/* YYDEFGOTONTERM-NUM.  */
+  /* YYDEFGOTONTERM-NUM.  */
 static const yytype_int16 yydefgoto =
 {
        0,     1,   288,   289,   325,   487,     2,   291,   734,   187,
@@ -1341,9 +1361,9 @@
      318,   679,   127,   495,   496
 };
 
-/* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule whose
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+  /* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable =
 {
       92,   112,   384,   300,   300,    93,    95,   150,   301,   301,
@@ -3214,8 +3234,8 @@
      102,   103,   104,   105,   106,   107,   108,   109,   110,   111
 };
 
-/* YYSTOSSTATE-NUM -- The symbol kind of the accessing symbol of
-   state STATE-NUM.  */
+  /* YYSTOSSTATE-NUM -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_int16 yystos =
 {
        0,   180,   185,     0,    12,    13,    17,    18,    19,    21,
@@ -3332,7 +3352,7 @@
      172,   173,   293,   209,   315,   174
 };
 
-/* YYR1RULE-NUM -- Symbol kind of the left-hand side of rule RULE-NUM.  */
+  /* YYR1YYN -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_int16 yyr1 =
 {
        0,   179,   180,   181,   181,   181,   181,   181,   181,   181,
@@ -3397,7 +3417,7 @@
      353
 };
 
-/* YYR2RULE-NUM -- Number of symbols on the right-hand side of rule RULE-NUM.  */
+  /* YYR2YYN -- Number of symbols on the right hand side of rule YYN.  */
 static const yytype_int8 yyr2 =
 {
        0,     2,     1,     1,     1,     1,     1,     1,     1,     1,
@@ -3471,7 +3491,6 @@
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
 #define YYERROR         goto yyerrorlab
-#define YYNOMEM         goto yyexhaustedlab
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
@@ -3512,7 +3531,10 @@
     YYFPRINTF Args;                             \
 } while (0)
 
-
+/* This macro is provided for backward compatibility. */
+# ifndef YY_LOCATION_PRINT
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 
 
 # define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
@@ -3539,6 +3561,10 @@
   YY_USE (yyoutput);
   if (!yyvaluep)
     return;
+# ifdef YYPRINT
+  if (yykind < YYNTOKENS)
+    YYPRINT (yyo, yytoknumyykind, *yyvaluep);
+# endif
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   YY_USE (yykind);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
@@ -4619,7 +4645,6 @@
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yychar = ZENDEMPTY; /* Cause a token to be read.  */
-
   goto yysetstate;
 
 
@@ -4645,7 +4670,7 @@
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
-    YYNOMEM;
+    goto yyexhaustedlab;
 #else
     {
       /* Get the current used size of the three stacks, in elements.  */
@@ -4673,7 +4698,7 @@
 # else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-        YYNOMEM;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
         yystacksize = YYMAXDEPTH;
@@ -4684,7 +4709,7 @@
           YY_CAST (union yyalloc *,
                    YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
         if (! yyptr)
-          YYNOMEM;
+          goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
@@ -4706,7 +4731,6 @@
     }
 #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
-
   if (yystate == YYFINAL)
     YYACCEPT;
 
@@ -6966,7 +6990,7 @@
           }
         yyerror (yymsgp);
         if (yysyntax_error_status == YYENOMEM)
-          YYNOMEM;
+          goto yyexhaustedlab;
       }
     }
 
@@ -7002,7 +7026,6 @@
      label yyerrorlab therefore never appears in user code.  */
   if (0)
     YYERROR;
-  ++yynerrs;
 
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
@@ -7063,7 +7086,7 @@
 `-------------------------------------*/
 yyacceptlab:
   yyresult = 0;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
 /*-----------------------------------.
@@ -7071,22 +7094,24 @@
 `-----------------------------------*/
 yyabortlab:
   yyresult = 1;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
-/*-----------------------------------------------------------.
-| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here.  |
-`-----------------------------------------------------------*/
+#if 1
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
 yyexhaustedlab:
   yyerror (YY_("memory exhausted"));
   yyresult = 2;
-  goto yyreturnlab;
+  goto yyreturn;
+#endif
 
 
-/*----------------------------------------------------------.
-| yyreturnlab -- parsing is finished, clean up and return.  |
-`----------------------------------------------------------*/
-yyreturnlab:
+/*-------------------------------------------------------.
+| yyreturn -- parsing is finished, clean up and return.  |
+`-------------------------------------------------------*/
+yyreturn:
   if (yychar != ZENDEMPTY)
     {
       /* Make sure we have latest lookahead translation.  See comments at

php-8.2.23.tar.xz/Zend/zend_language_parser.h -> php-8.2.28.tar.xz/Zend/zend_language_parser.h Changed

php-8.2.23.tar.xz/Zend/zend_language_parser.output -> php-8.2.28.tar.xz/Zend/zend_language_parser.output Changed

@@ -103,7 +103,7 @@
    83           | semi_reserved
 
    84 top_statement_list: top_statement_list top_statement
-   85                   | ε
+   85                   | %empty
 
    86 namespace_declaration_name: identifier
    87                           | "namespaced name"
@@ -142,11 +142,11 @@
   111              | "'__halt_compiler'" '(' ')' ';'
   112              | "'namespace'" namespace_declaration_name ';'
 
-  113 $@1: ε
+  113 $@1: %empty
 
   114 top_statement: "'namespace'" namespace_declaration_name $@1 '{' top_statement_list '}'
 
-  115 $@2: ε
+  115 $@2: %empty
 
   116 top_statement: "'namespace'" $@2 '{' top_statement_list '}'
   117              | "'use'" mixed_group_use_declaration ';'
@@ -162,7 +162,7 @@
 
   125 mixed_group_use_declaration: legacy_namespace_name "'\\'" '{' inline_use_declarations possible_comma '}'
 
-  126 possible_comma: ε
+  126 possible_comma: %empty
   127               | ','
 
   128 inline_use_declarations: inline_use_declarations ',' inline_use_declaration
@@ -187,7 +187,7 @@
   141           | const_decl
 
   142 inner_statement_list: inner_statement_list inner_statement
-  143                     | ε
+  143                     | %empty
 
   144 inner_statement: statement
   145                | attributed_statement
@@ -213,7 +213,7 @@
   164          | "'foreach'" '(' expr "'as'" foreach_variable ')' foreach_statement
   165          | "'foreach'" '(' expr "'as'" foreach_variable "'=>'" foreach_variable ')' foreach_statement
 
-  166 $@3: ε
+  166 $@3: %empty
 
   167 statement: "'declare'" '(' const_list ')' $@3 declare_statement
   168          | ';'
@@ -221,16 +221,16 @@
   170          | "'goto'" "identifier" ';'
   171          | "identifier" ':'
 
-  172 catch_list: ε
+  172 catch_list: %empty
   173           | catch_list "'catch'" '(' catch_name_list optional_variable ')' '{' inner_statement_list '}'
 
   174 catch_name_list: class_name
   175                | catch_name_list '|' class_name
 
-  176 optional_variable: ε
+  176 optional_variable: %empty
   177                  | "variable"
 
-  178 finally_statement: ε
+  178 finally_statement: %empty
   179                  | "'finally'" '{' inner_statement_list '}'
 
   180 unset_variables: unset_variable
@@ -243,17 +243,17 @@
 
   185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
-  186 is_reference: ε
+  186 is_reference: %empty
   187             | "'&'"
 
-  188 is_variadic: ε
+  188 is_variadic: %empty
   189            | "'...'"
 
-  190 @4: ε
+  190 @4: %empty
 
   191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
-  192 @5: ε
+  192 @5: %empty
 
   193 class_declaration_statement: "'class'" @5 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
@@ -264,33 +264,33 @@
   197               | "'final'"
   198               | "'readonly'"
 
-  199 @6: ε
+  199 @6: %empty
 
   200 trait_declaration_statement: "'trait'" @6 "identifier" backup_doc_comment '{' class_statement_list '}'
 
-  201 @7: ε
+  201 @7: %empty
 
   202 interface_declaration_statement: "'interface'" @7 "identifier" interface_extends_list backup_doc_comment '{' class_statement_list '}'
 
-  203 @8: ε
+  203 @8: %empty
 
   204 enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type implements_list backup_doc_comment '{' class_statement_list '}'
 
-  205 enum_backing_type: ε
+  205 enum_backing_type: %empty
   206                  | ':' type_expr
 
   207 enum_case: "'case'" backup_doc_comment identifier enum_case_expr ';'
 
-  208 enum_case_expr: ε
+  208 enum_case_expr: %empty
   209               | '=' expr
 
-  210 extends_from: ε
+  210 extends_from: %empty
   211             | "'extends'" class_name
 
-  212 interface_extends_list: ε
+  212 interface_extends_list: %empty
   213                       | "'extends'" class_name_list
 
-  214 implements_list: ε
+  214 implements_list: %empty
   215                | "'implements'" class_name_list
 
   216 foreach_variable: variable
@@ -312,7 +312,7 @@
   228                 | ':' case_list "'endswitch'" ';'
   229                 | ':' ';' case_list "'endswitch'" ';'
 
-  230 case_list: ε
+  230 case_list: %empty
   231          | case_list "'case'" expr case_separator inner_statement_list
   232          | case_list "'default'" case_separator inner_statement_list
 
@@ -321,7 +321,7 @@
 
   235 match: "'match'" '(' expr ')' '{' match_arm_list '}'
 
-  236 match_arm_list: ε
+  236 match_arm_list: %empty
   237               | non_empty_match_arm_list possible_comma
 
   238 non_empty_match_arm_list: match_arm
@@ -349,7 +349,7 @@
   253            | alt_if_stmt_without_else "'else'" ':' inner_statement_list "'endif'" ';'
 
   254 parameter_list: non_empty_parameter_list possible_comma
-  255               | ε
+  255               | %empty
 
   256 non_empty_parameter_list: attributed_parameter
   257                         | non_empty_parameter_list ',' attributed_parameter
@@ -357,7 +357,7 @@
   258 attributed_parameter: attributes parameter
   259                     | parameter
 
-  260 optional_property_modifiers: ε
+  260 optional_property_modifiers: %empty
   261                            | optional_property_modifiers property_modifier
 
   262 property_modifier: "'public'"
@@ -368,7 +368,7 @@
   266 parameter: optional_property_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment
   267          | optional_property_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment '=' expr
 
-  268 optional_type_without_static: ε
+  268 optional_type_without_static: %empty
   269                             | type_expr_without_static
 
   270 type_expr: type
@@ -406,7 +406,7 @@
   293 intersection_type_without_static: type_without_static "amp" type_without_static
   294                                 | intersection_type_without_static "amp" type_without_static
 
-  295 return_type: ε
+  295 return_type: %empty
   296            | ':' type_expr
 
   297 argument_list: '(' ')'
@@ -432,7 +432,7 @@
   311           | "variable" '=' expr
 
   312 class_statement_list: class_statement_list class_statement
-  313                     | ε
+  313                     | %empty
 
   314 attributed_class_statement: variable_modifiers optional_type_without_static property_list ';'
   315                           | method_modifiers "'const'" class_const_list ';'
@@ -474,7 +474,7 @@
   340 variable_modifiers: non_empty_member_modifiers
   341                   | "'var'"
 
-  342 method_modifiers: ε
+  342 method_modifiers: %empty
   343                 | non_empty_member_modifiers
 
   344 non_empty_member_modifiers: member_modifier
@@ -506,13 +506,13 @@
 
   363 echo_expr: expr
 
-  364 for_exprs: ε
+  364 for_exprs: %empty
   365          | non_empty_for_exprs
 
   366 non_empty_for_exprs: non_empty_for_exprs ',' expr
   367                    | expr
 
-  368 @9: ε
+  368 @9: %empty
 
   369 anonymous_class: "'class'" @9 ctor_arguments extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
@@ -611,16 +611,16 @@
 
   459 function: "'function'"
 
-  460 backup_doc_comment: ε
+  460 backup_doc_comment: %empty
 
-  461 backup_fn_flags: ε
+  461 backup_fn_flags: %empty
 
-  462 backup_lex_pos: ε
+  462 backup_lex_pos: %empty
 
-  463 returns_ref: ε
+  463 returns_ref: %empty
   464            | ampersand
 
-  465 lexical_vars: ε
+  465 lexical_vars: %empty
   466             | "'use'" '(' lexical_var_list possible_comma ')'
 
   467 lexical_var_list: lexical_var_list ',' lexical_var
@@ -634,7 +634,7 @@
   473              | class_name "'::'" member_name argument_list
   474              | variable_class_name "'::'" member_name argument_list
 
-  475 @10: ε
+  475 @10: %empty
 
   476 function_call: callable_expr @10 argument_list
 
@@ -645,14 +645,14 @@
   480                     | new_variable
   481                     | '(' expr ')'
 
-  482 exit_expr: ε
+  482 exit_expr: %empty
   483          | '(' optional_expr ')'
 
-  484 backticks_expr: ε
+  484 backticks_expr: %empty
   485               | "string content"
   486               | encaps_list
 
-  487 ctor_arguments: ε
+  487 ctor_arguments: %empty
   488               | argument_list
 
   489 dereferenceable_scalar: "'array'" '(' array_pair_list ')'
@@ -682,7 +682,7 @@
   510 class_constant: class_name "'::'" identifier
   511               | variable_class_name "'::'" identifier
 
-  512 optional_expr: ε
+  512 optional_expr: %empty
   513              | expr
 
   514 variable_class_name: fully_dereferenceable
@@ -736,7 +736,7 @@
 
   552 array_pair_list: non_empty_array_pair_list
 
-  553 possible_array_pair: ε
+  553 possible_array_pair: %empty
   554                    | array_pair
 
   555 non_empty_array_pair_list: non_empty_array_pair_list ',' possible_array_pair

php-8.2.23.tar.xz/Zend/zend_language_scanner.c -> php-8.2.28.tar.xz/Zend/zend_language_scanner.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 3.1 */
+/* Generated by re2c 2.0.3 */
 /*
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
@@ -277,7 +277,7 @@
 	CG(zend_lineno) = lex_state->lineno;
 	zend_restore_compiled_filename(lex_state->filename);
 
-	if (SCNG(script_filtered)) {
+	if (SCNG(script_filtered) && SCNG(script_filtered) != lex_state->script_filtered) {
 		efree(SCNG(script_filtered));
 		SCNG(script_filtered) = NULL;
 	}
@@ -1360,278 +1360,6 @@
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
-	static const unsigned char yybm_ST_IN_SCRIPTING = {
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,  18,   2,   0,   0,   2,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		 18,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		236, 236, 204, 204, 204, 204, 204, 204, 
-		140, 140,   0,   0,   0,   0,   0,   0, 
-		  0, 136, 136, 136, 136, 136, 136,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   0,   0,   0,   0,   8, 
-		  0, 136, 136, 136, 136, 136, 136,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   0,   0,   0,   0,   0, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-		  8,   8,   8,   8,   8,   8,   8,   8, 
-	};
-	static const unsigned char yybm_ST_LOOKING_FOR_PROPERTY = {
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,  64,  64,   0,   0,  64,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		 64,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128,   0,   0,   0,   0,   0,   0, 
-		  0, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128,   0,   0,   0,   0, 128, 
-		  0, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128,   0,   0,   0,   0,   0, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-	};
-	static const unsigned char yybm_ST_BACKQUOTE = {
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128,   0,   0,   0,   0,   0,   0, 
-		  0, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128,   0,   0,   0,   0, 128, 
-		  0, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128,   0,   0,   0,   0,   0, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-	};
-	static const unsigned char yybm_ST_DOUBLE_QUOTES = {
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128,   0,   0,   0,   0,   0,   0, 
-		  0, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128,   0,   0,   0,   0, 128, 
-		  0, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128,   0,   0,   0,   0,   0, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-	};
-	static const unsigned char yybm_ST_HEREDOC = {
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128,   0,   0,   0,   0,   0,   0, 
-		  0, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128,   0,   0,   0,   0, 128, 
-		  0, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128,   0,   0,   0,   0,   0, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-	};
-	static const unsigned char yybm_ST_LOOKING_FOR_VARNAME = {
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128,   0,   0,   0,   0,   0,   0, 
-		  0, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128,   0,   0,   0,   0, 128, 
-		  0, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128,   0,   0,   0,   0,   0, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-	};
-	static const unsigned char yybm_ST_VAR_OFFSET = {
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		248, 248, 216, 216, 216, 216, 216, 216, 
-		152, 152,   0,   0,   0,   0,   0,   0, 
-		  0, 144, 144, 144, 144, 144, 144,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,   0,   0,   0,   0,  16, 
-		  0, 144, 144, 144, 144, 144, 144,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,   0,   0,   0,   0,   0, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-		 16,  16,  16,  16,  16,  16,  16,  16, 
-	};
-	static const unsigned char yybm_SHEBANG = {
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128,   0, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-	};
 	if (YYGETCONDITION() < 5) {
 		if (YYGETCONDITION() < 2) {
 			if (YYGETCONDITION() < 1) {
@@ -1675,13 +1403,48 @@
 	}
 /* *********************************** */
 yyc_ST_IN_SCRIPTING:
-	YYDEBUG(0, *YYCURSOR);
-	YYFILL(16);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING0+yych & 2) {
-		goto yy2;
-	}
-	switch (yych) {
+	{
+		static const unsigned char yybm = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,  18,   2,   0,   0,   2,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			 18,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			236, 236, 204, 204, 204, 204, 204, 204, 
+			140, 140,   0,   0,   0,   0,   0,   0, 
+			  0, 136, 136, 136, 136, 136, 136,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   0,   0,   0,   0,   8, 
+			  0, 136, 136, 136, 136, 136, 136,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   0,   0,   0,   0,   0, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+		};
+		YYDEBUG(0, *YYCURSOR);
+		YYFILL(16);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 2) {
+			goto yy4;
+		}
+		switch (yych) {
 		case 0x00:
 		case 0x01:
 		case 0x02:
@@ -1714,28 +1477,28 @@
 		case 0x1D:
 		case 0x1E:
 		case 0x1F:
-		case 0x7F: goto yy1;
+		case 0x7F:	goto yy2;
 		case ' ':
-		case '!': goto yy3;
-		case '"': goto yy5;
-		case '#': goto yy6;
-		case '$': goto yy8;
-		case '%': goto yy9;
-		case '&': goto yy10;
-		case '\'': goto yy12;
-		case '(': goto yy13;
+		case '!':	goto yy7;
+		case '"':	goto yy9;
+		case '#':	goto yy11;
+		case '$':	goto yy13;
+		case '%':	goto yy14;
+		case '&':	goto yy15;
+		case '\'':	goto yy17;
+		case '(':	goto yy19;
 		case ')':
-		case '': goto yy15;
-		case '*': goto yy16;
-		case '+': goto yy17;
+		case '':	goto yy21;
+		case '*':	goto yy23;
+		case '+':	goto yy24;
 		case ',':
 		case ';':
 		case '@':
-		case '~': goto yy18;
-		case '-': goto yy19;
-		case '.': goto yy20;
-		case '/': goto yy21;
-		case '0': goto yy22;
+		case '~':	goto yy25;
+		case '-':	goto yy26;
+		case '.':	goto yy27;
+		case '/':	goto yy28;
+		case '0':	goto yy29;
 		case '1':
 		case '2':
 		case '3':
@@ -1744,102 +1507,106 @@
 		case '6':
 		case '7':
 		case '8':
-		case '9': goto yy24;
-		case ':': goto yy26;
-		case '<': goto yy27;
-		case '=': goto yy28;
-		case '>': goto yy29;
-		case '?': goto yy30;
+		case '9':	goto yy31;
+		case ':':	goto yy33;
+		case '<':	goto yy34;
+		case '=':	goto yy35;
+		case '>':	goto yy36;
+		case '?':	goto yy37;
 		case 'A':
-		case 'a': goto yy31;
+		case 'a':	goto yy38;
 		case 'B':
-		case 'b': goto yy33;
+		case 'b':	goto yy40;
 		case 'C':
-		case 'c': goto yy34;
+		case 'c':	goto yy41;
 		case 'D':
-		case 'd': goto yy35;
+		case 'd':	goto yy42;
 		case 'E':
-		case 'e': goto yy36;
+		case 'e':	goto yy43;
 		case 'F':
-		case 'f': goto yy37;
+		case 'f':	goto yy44;
 		case 'G':
-		case 'g': goto yy38;
+		case 'g':	goto yy45;
 		case 'I':
-		case 'i': goto yy41;
+		case 'i':	goto yy48;
 		case 'L':
-		case 'l': goto yy42;
+		case 'l':	goto yy49;
 		case 'M':
-		case 'm': goto yy43;
+		case 'm':	goto yy50;
 		case 'N':
-		case 'n': goto yy44;
+		case 'n':	goto yy51;
 		case 'O':
-		case 'o': goto yy45;
+		case 'o':	goto yy52;
 		case 'P':
-		case 'p': goto yy46;
+		case 'p':	goto yy53;
 		case 'R':
-		case 'r': goto yy47;
+		case 'r':	goto yy54;
 		case 'S':
-		case 's': goto yy48;
+		case 's':	goto yy55;
 		case 'T':
-		case 't': goto yy49;
+		case 't':	goto yy56;
 		case 'U':
-		case 'u': goto yy50;
+		case 'u':	goto yy57;
 		case 'V':
-		case 'v': goto yy51;
+		case 'v':	goto yy58;
 		case 'W':
-		case 'w': goto yy52;
+		case 'w':	goto yy59;
 		case 'X':
-		case 'x': goto yy53;
+		case 'x':	goto yy60;
 		case 'Y':
-		case 'y': goto yy54;
-		case '': goto yy55;
-		case '\\': goto yy56;
-		case '^': goto yy58;
-		case '_': goto yy59;
-		case '`': goto yy60;
-		case '{': goto yy61;
-		case '|': goto yy62;
-		case '}': goto yy63;
-		default: goto yy39;
-	}
-yy1:
-	YYDEBUG(1, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+		case 'y':	goto yy61;
+		case '':	goto yy62;
+		case '\\':	goto yy63;
+		case '^':	goto yy65;
+		case '_':	goto yy66;
+		case '`':	goto yy67;
+		case '{':	goto yy69;
+		case '|':	goto yy71;
+		case '}':	goto yy72;
+		default:	goto yy46;
+		}
+yy2:
+		YYDEBUG(2, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(3, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	if (YYCURSOR > YYLIMIT) {
 		RETURN_END_TOKEN;
 	}
 
 	RETURN_TOKEN(T_BAD_CHARACTER);
 }
-yy2:
-	YYDEBUG(2, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING0+yych & 2) {
-		goto yy2;
-	}
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy4:
+		YYDEBUG(4, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(5, *YYCURSOR);
+		if (yybm0+yych & 2) {
+			goto yy4;
+		}
+		YYDEBUG(6, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	goto return_whitespace;
 }
-yy3:
-	YYDEBUG(3, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy64;
-yy4:
-	YYDEBUG(4, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy7:
+		YYDEBUG(7, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy74;
+yy8:
+		YYDEBUG(8, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(yytext0);
 }
-yy5:
-	YYDEBUG(5, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy9:
+		YYDEBUG(9, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(10, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	int bprefix = (yytext0 != '"') ? 1 : 0;
 
 	while (YYCURSOR < YYLIMIT) {
@@ -1883,14 +1650,14 @@
 	BEGIN(ST_DOUBLE_QUOTES);
 	RETURN_TOKEN('"');
 }
-yy6:
-	YYDEBUG(6, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '') goto yy66;
-yy7:
-	YYDEBUG(7, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy11:
+		YYDEBUG(11, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '') goto yy76;
+yy12:
+		YYDEBUG(12, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	while (YYCURSOR < YYLIMIT) {
 		switch (*YYCURSOR++) {
 			case '\r':
@@ -1913,57 +1680,58 @@
 	yyleng = YYCURSOR - SCNG(yy_text);
 	RETURN_OR_SKIP_TOKEN(T_COMMENT);
 }
-yy8:
-	YYDEBUG(8, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy4;
-		if (yych <= 'Z') goto yy67;
-		if (yych <= '^') goto yy4;
-		goto yy67;
-	} else {
-		if (yych <= '`') goto yy4;
-		if (yych <= 'z') goto yy67;
-		if (yych <= 0x7F) goto yy4;
-		goto yy67;
-	}
-yy9:
-	YYDEBUG(9, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy69;
-	goto yy4;
-yy10:
-	YYDEBUG(10, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '#') {
-		if (yych <= '\f') {
-			if (yych <= 0x08) goto yy11;
-			if (yych <= '\n') goto yy70;
-		} else {
-			if (yych <= '\r') goto yy70;
-			if (yych == ' ') goto yy70;
+yy13:
+		YYDEBUG(13, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy8;
+			if (yych <= 'Z') goto yy78;
+			if (yych <= '^') goto yy8;
+			goto yy78;
+		} else {
+			if (yych <= '`') goto yy8;
+			if (yych <= 'z') goto yy78;
+			if (yych <= 0x7F) goto yy8;
+			goto yy78;
 		}
-	} else {
-		if (yych <= '-') {
-			if (yych <= '$') goto yy72;
-			if (yych == '&') goto yy73;
+yy14:
+		YYDEBUG(14, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy81;
+		goto yy8;
+yy15:
+		YYDEBUG(15, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '#') {
+			if (yych <= '\f') {
+				if (yych <= 0x08) goto yy16;
+				if (yych <= '\n') goto yy83;
+			} else {
+				if (yych <= '\r') goto yy83;
+				if (yych == ' ') goto yy83;
+			}
 		} else {
-			if (yych <= '.') goto yy74;
-			if (yych == '=') goto yy75;
+			if (yych <= '-') {
+				if (yych <= '$') goto yy86;
+				if (yych == '&') goto yy88;
+			} else {
+				if (yych <= '.') goto yy90;
+				if (yych == '=') goto yy91;
+			}
 		}
-	}
-yy11:
-	YYDEBUG(11, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy16:
+		YYDEBUG(16, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG);
 }
-yy12:
-	YYDEBUG(12, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy17:
+		YYDEBUG(17, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(18, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	char *s, *t;
 	char *end;
 	int bprefix = (yytext0 != '\'') ? 1 : 0;
@@ -2057,142 +1825,143 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_CONSTANT_ENCAPSED_STRING);
 }
-yy13:
-	YYDEBUG(13, *YYCURSOR);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'S') {
-		if (yych <= 'D') {
-			if (yych <= ' ') {
-				if (yych == '\t') goto yy77;
-				if (yych >= ' ') goto yy77;
-			} else {
-				if (yych <= '@') goto yy14;
-				if (yych != 'C') goto yy77;
-			}
-		} else {
-			if (yych <= 'I') {
-				if (yych == 'F') goto yy77;
-				if (yych >= 'I') goto yy77;
-			} else {
-				if (yych == 'O') goto yy77;
-				if (yych >= 'R') goto yy77;
-			}
-		}
-	} else {
-		if (yych <= 'f') {
-			if (yych <= 'b') {
-				if (yych == 'U') goto yy77;
-				if (yych >= 'a') goto yy77;
+yy19:
+		YYDEBUG(19, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'S') {
+			if (yych <= 'D') {
+				if (yych <= ' ') {
+					if (yych == '\t') goto yy94;
+					if (yych >= ' ') goto yy94;
+				} else {
+					if (yych <= '@') goto yy20;
+					if (yych != 'C') goto yy94;
+				}
 			} else {
-				if (yych == 'd') goto yy77;
-				if (yych >= 'f') goto yy77;
+				if (yych <= 'I') {
+					if (yych == 'F') goto yy94;
+					if (yych >= 'I') goto yy94;
+				} else {
+					if (yych == 'O') goto yy94;
+					if (yych >= 'R') goto yy94;
+				}
 			}
 		} else {
-			if (yych <= 'o') {
-				if (yych == 'i') goto yy77;
-				if (yych >= 'o') goto yy77;
+			if (yych <= 'f') {
+				if (yych <= 'b') {
+					if (yych == 'U') goto yy94;
+					if (yych >= 'a') goto yy94;
+				} else {
+					if (yych == 'd') goto yy94;
+					if (yych >= 'f') goto yy94;
+				}
 			} else {
-				if (yych <= 's') {
-					if (yych >= 'r') goto yy77;
+				if (yych <= 'o') {
+					if (yych == 'i') goto yy94;
+					if (yych >= 'o') goto yy94;
 				} else {
-					if (yych == 'u') goto yy77;
+					if (yych <= 's') {
+						if (yych >= 'r') goto yy94;
+					} else {
+						if (yych == 'u') goto yy94;
+					}
 				}
 			}
 		}
-	}
-yy14:
-	YYDEBUG(14, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy20:
+		YYDEBUG(20, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	enter_nesting(yytext0);
 	RETURN_TOKEN(yytext0);
 }
-yy15:
-	YYDEBUG(15, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy21:
+		YYDEBUG(21, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(22, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* Check that  and ) match up properly with a preceding  or ( */
 	RETURN_EXIT_NESTING_TOKEN(yytext0);
 }
-yy16:
-	YYDEBUG(16, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '*') goto yy87;
-	if (yych == '=') goto yy88;
-	goto yy4;
-yy17:
-	YYDEBUG(17, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '+') goto yy89;
-	if (yych == '=') goto yy90;
-	goto yy4;
-yy18:
-	YYDEBUG(18, *YYCURSOR);
-	++YYCURSOR;
-	goto yy4;
-yy19:
-	YYDEBUG(19, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '<') {
-		if (yych == '-') goto yy91;
-		goto yy4;
-	} else {
-		if (yych <= '=') goto yy92;
-		if (yych <= '>') goto yy93;
-		goto yy4;
-	}
-yy20:
-	YYDEBUG(20, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy94;
-		goto yy4;
-	} else {
-		if (yych <= '9') goto yy95;
-		if (yych == '=') goto yy98;
-		goto yy4;
-	}
-yy21:
-	YYDEBUG(21, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '.') {
-		if (yych == '*') goto yy99;
-		goto yy4;
-	} else {
-		if (yych <= '/') goto yy101;
-		if (yych == '=') goto yy102;
-		goto yy4;
-	}
-yy22:
-	YYDEBUG(22, *YYCURSOR);
-	yyaccept = 3;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'X') {
-		if (yych <= 'N') {
-			if (yych == 'B') goto yy104;
-			goto yy25;
-		} else {
-			if (yych <= 'O') goto yy106;
-			if (yych <= 'W') goto yy25;
-			goto yy107;
+yy23:
+		YYDEBUG(23, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '*') goto yy104;
+		if (yych == '=') goto yy106;
+		goto yy8;
+yy24:
+		YYDEBUG(24, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '+') goto yy108;
+		if (yych == '=') goto yy110;
+		goto yy8;
+yy25:
+		YYDEBUG(25, *YYCURSOR);
+		++YYCURSOR;
+		goto yy8;
+yy26:
+		YYDEBUG(26, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '<') {
+			if (yych == '-') goto yy112;
+			goto yy8;
+		} else {
+			if (yych <= '=') goto yy114;
+			if (yych <= '>') goto yy116;
+			goto yy8;
 		}
-	} else {
-		if (yych <= 'n') {
-			if (yych == 'b') goto yy104;
-			goto yy25;
-		} else {
-			if (yych <= 'o') goto yy106;
-			if (yych == 'x') goto yy107;
-			goto yy25;
+yy27:
+		YYDEBUG(27, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') {
+			if (yych == '.') goto yy118;
+			goto yy8;
+		} else {
+			if (yych <= '9') goto yy119;
+			if (yych == '=') goto yy122;
+			goto yy8;
 		}
-	}
-yy23:
-	YYDEBUG(23, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy28:
+		YYDEBUG(28, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '.') {
+			if (yych == '*') goto yy124;
+			goto yy8;
+		} else {
+			if (yych <= '/') goto yy126;
+			if (yych == '=') goto yy127;
+			goto yy8;
+		}
+yy29:
+		YYDEBUG(29, *YYCURSOR);
+		yyaccept = 3;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'X') {
+			if (yych <= 'N') {
+				if (yych == 'B') goto yy130;
+				goto yy32;
+			} else {
+				if (yych <= 'O') goto yy132;
+				if (yych <= 'W') goto yy32;
+				goto yy133;
+			}
+		} else {
+			if (yych <= 'n') {
+				if (yych == 'b') goto yy130;
+				goto yy32;
+			} else {
+				if (yych <= 'o') goto yy132;
+				if (yych == 'x') goto yy133;
+				goto yy32;
+			}
+		}
+yy30:
+		YYDEBUG(30, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	size_t len = yyleng;
 	char *end, *lnum = yytext;
 	bool is_octal = lnum0 == '0';
@@ -2254,1119 +2023,1136 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_LNUMBER);
 }
-yy24:
-	YYDEBUG(24, *YYCURSOR);
-	yyaccept = 3;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-yy25:
-	YYDEBUG(25, *YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 4) {
-		goto yy24;
-	}
-	if (yych <= 'E') {
-		if (yych == '.') goto yy103;
-		if (yych <= 'D') goto yy23;
-		goto yy105;
-	} else {
-		if (yych <= '_') {
-			if (yych <= '^') goto yy23;
-			goto yy108;
-		} else {
-			if (yych == 'e') goto yy105;
-			goto yy23;
-		}
-	}
-yy26:
-	YYDEBUG(26, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == ':') goto yy109;
-	goto yy4;
-yy27:
-	YYDEBUG(27, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= ';') goto yy4;
-	if (yych <= '<') goto yy110;
-	if (yych <= '=') goto yy112;
-	if (yych <= '>') goto yy113;
-	goto yy4;
-yy28:
-	YYDEBUG(28, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '<') goto yy4;
-	if (yych <= '=') goto yy114;
-	if (yych <= '>') goto yy115;
-	goto yy4;
-yy29:
-	YYDEBUG(29, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '<') goto yy4;
-	if (yych <= '=') goto yy116;
-	if (yych <= '>') goto yy117;
-	goto yy4;
-yy30:
-	YYDEBUG(30, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych == '-') goto yy118;
-		goto yy4;
-	} else {
-		if (yych <= '>') goto yy119;
-		if (yych <= '?') goto yy121;
-		goto yy4;
-	}
 yy31:
-	YYDEBUG(31, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'S') {
-		if (yych <= 'M') {
-			if (yych == 'B') goto yy122;
-			goto yy40;
-		} else {
-			if (yych <= 'N') goto yy123;
-			if (yych <= 'Q') goto yy40;
-			if (yych <= 'R') goto yy124;
-			goto yy125;
-		}
-	} else {
-		if (yych <= 'n') {
-			if (yych == 'b') goto yy122;
-			if (yych <= 'm') goto yy40;
-			goto yy123;
-		} else {
-			if (yych <= 'q') goto yy40;
-			if (yych <= 'r') goto yy124;
-			if (yych <= 's') goto yy125;
-			goto yy40;
-		}
-	}
+		YYDEBUG(31, *YYCURSOR);
+		yyaccept = 3;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
 yy32:
-	YYDEBUG(32, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_STR(T_STRING, 0);
-}
-yy33:
-	YYDEBUG(33, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ';') {
-		if (yych <= '"') {
-			if (yych <= '!') goto yy40;
-			goto yy5;
-		} else {
-			if (yych == '\'') goto yy12;
-			goto yy40;
-		}
-	} else {
-		if (yych <= 'R') {
-			if (yych <= '<') goto yy128;
-			if (yych <= 'Q') goto yy40;
-			goto yy129;
-		} else {
-			if (yych == 'r') goto yy129;
-			goto yy40;
+		YYDEBUG(32, *YYCURSOR);
+		if (yybm0+yych & 4) {
+			goto yy31;
+		}
+		if (yych <= 'E') {
+			if (yych == '.') goto yy129;
+			if (yych <= 'D') goto yy30;
+			goto yy131;
+		} else {
+			if (yych <= '_') {
+				if (yych <= '^') goto yy30;
+				goto yy134;
+			} else {
+				if (yych == 'e') goto yy131;
+				goto yy30;
+			}
 		}
-	}
+yy33:
+		YYDEBUG(33, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == ':') goto yy135;
+		goto yy8;
 yy34:
-	YYDEBUG(34, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'O') {
-		if (yych <= 'K') {
-			if (yych == 'A') goto yy130;
-			goto yy40;
-		} else {
-			if (yych <= 'L') goto yy131;
-			if (yych <= 'N') goto yy40;
-			goto yy132;
-		}
-	} else {
-		if (yych <= 'k') {
-			if (yych == 'a') goto yy130;
-			goto yy40;
-		} else {
-			if (yych <= 'l') goto yy131;
-			if (yych == 'o') goto yy132;
-			goto yy40;
-		}
-	}
+		YYDEBUG(34, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= ';') goto yy8;
+		if (yych <= '<') goto yy137;
+		if (yych <= '=') goto yy139;
+		if (yych <= '>') goto yy141;
+		goto yy8;
 yy35:
-	YYDEBUG(35, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'O') {
-		if (yych <= 'H') {
-			if (yych == 'E') goto yy133;
-			goto yy40;
-		} else {
-			if (yych <= 'I') goto yy134;
-			if (yych <= 'N') goto yy40;
-			goto yy135;
-		}
-	} else {
-		if (yych <= 'h') {
-			if (yych == 'e') goto yy133;
-			goto yy40;
-		} else {
-			if (yych <= 'i') goto yy134;
-			if (yych == 'o') goto yy135;
-			goto yy40;
-		}
-	}
+		YYDEBUG(35, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '<') goto yy8;
+		if (yych <= '=') goto yy142;
+		if (yych <= '>') goto yy144;
+		goto yy8;
 yy36:
-	YYDEBUG(36, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch (yych) {
-		case 'C':
-		case 'c': goto yy137;
-		case 'L':
-		case 'l': goto yy138;
-		case 'M':
-		case 'm': goto yy139;
-		case 'N':
-		case 'n': goto yy140;
-		case 'V':
-		case 'v': goto yy141;
-		case 'X':
-		case 'x': goto yy142;
-		default: goto yy40;
-	}
+		YYDEBUG(36, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '<') goto yy8;
+		if (yych <= '=') goto yy146;
+		if (yych <= '>') goto yy148;
+		goto yy8;
 yy37:
-	YYDEBUG(37, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'U') {
-		if (yych <= 'M') {
-			if (yych == 'I') goto yy143;
-			goto yy40;
-		} else {
-			if (yych <= 'N') goto yy144;
-			if (yych <= 'O') goto yy146;
-			if (yych <= 'T') goto yy40;
-			goto yy147;
+		YYDEBUG(37, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych == '-') goto yy150;
+			goto yy8;
+		} else {
+			if (yych <= '>') goto yy151;
+			if (yych <= '?') goto yy153;
+			goto yy8;
 		}
-	} else {
-		if (yych <= 'n') {
-			if (yych == 'i') goto yy143;
-			if (yych <= 'm') goto yy40;
-			goto yy144;
-		} else {
-			if (yych <= 'o') goto yy146;
-			if (yych == 'u') goto yy147;
-			goto yy40;
-		}
-	}
 yy38:
-	YYDEBUG(38, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'O') {
-		if (yych == 'L') goto yy148;
-		if (yych <= 'N') goto yy40;
-		goto yy149;
-	} else {
-		if (yych <= 'l') {
-			if (yych <= 'k') goto yy40;
-			goto yy148;
+		YYDEBUG(38, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'S') {
+			if (yych <= 'M') {
+				if (yych == 'B') goto yy155;
+				goto yy47;
+			} else {
+				if (yych <= 'N') goto yy156;
+				if (yych <= 'Q') goto yy47;
+				if (yych <= 'R') goto yy157;
+				goto yy158;
+			}
 		} else {
-			if (yych == 'o') goto yy149;
-			goto yy40;
+			if (yych <= 'n') {
+				if (yych == 'b') goto yy155;
+				if (yych <= 'm') goto yy47;
+				goto yy156;
+			} else {
+				if (yych <= 'q') goto yy47;
+				if (yych <= 'r') goto yy157;
+				if (yych <= 's') goto yy158;
+				goto yy47;
+			}
 		}
-	}
 yy39:
-	YYDEBUG(39, *YYCURSOR);
-	yyaccept = 4;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
+		YYDEBUG(39, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_STR(T_STRING, 0);
+}
 yy40:
-	YYDEBUG(40, *YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-	goto yy32;
-yy41:
-	YYDEBUG(41, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'S') {
-		if (yych <= 'L') {
-			if (yych == 'F') goto yy150;
-			goto yy40;
-		} else {
-			if (yych <= 'M') goto yy152;
-			if (yych <= 'N') goto yy153;
-			if (yych <= 'R') goto yy40;
-			goto yy154;
+		YYDEBUG(40, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= ';') {
+			if (yych <= '"') {
+				if (yych <= '!') goto yy47;
+				goto yy9;
+			} else {
+				if (yych == '\'') goto yy17;
+				goto yy47;
+			}
+		} else {
+			if (yych <= 'R') {
+				if (yych <= '<') goto yy161;
+				if (yych <= 'Q') goto yy47;
+				goto yy162;
+			} else {
+				if (yych == 'r') goto yy162;
+				goto yy47;
+			}
 		}
-	} else {
-		if (yych <= 'm') {
-			if (yych == 'f') goto yy150;
-			if (yych <= 'l') goto yy40;
-			goto yy152;
-		} else {
-			if (yych <= 'n') goto yy153;
-			if (yych == 's') goto yy154;
-			goto yy40;
+yy41:
+		YYDEBUG(41, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'O') {
+			if (yych <= 'K') {
+				if (yych == 'A') goto yy163;
+				goto yy47;
+			} else {
+				if (yych <= 'L') goto yy164;
+				if (yych <= 'N') goto yy47;
+				goto yy165;
+			}
+		} else {
+			if (yych <= 'k') {
+				if (yych == 'a') goto yy163;
+				goto yy47;
+			} else {
+				if (yych <= 'l') goto yy164;
+				if (yych == 'o') goto yy165;
+				goto yy47;
+			}
 		}
-	}
 yy42:
-	YYDEBUG(42, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy155;
-	if (yych == 'i') goto yy155;
-	goto yy40;
+		YYDEBUG(42, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'O') {
+			if (yych <= 'H') {
+				if (yych == 'E') goto yy166;
+				goto yy47;
+			} else {
+				if (yych <= 'I') goto yy167;
+				if (yych <= 'N') goto yy47;
+				goto yy168;
+			}
+		} else {
+			if (yych <= 'h') {
+				if (yych == 'e') goto yy166;
+				goto yy47;
+			} else {
+				if (yych <= 'i') goto yy167;
+				if (yych == 'o') goto yy168;
+				goto yy47;
+			}
+		}
 yy43:
-	YYDEBUG(43, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy156;
-	if (yych == 'a') goto yy156;
-	goto yy40;
+		YYDEBUG(43, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		switch (yych) {
+		case 'C':
+		case 'c':	goto yy170;
+		case 'L':
+		case 'l':	goto yy171;
+		case 'M':
+		case 'm':	goto yy172;
+		case 'N':
+		case 'n':	goto yy173;
+		case 'V':
+		case 'v':	goto yy174;
+		case 'X':
+		case 'x':	goto yy175;
+		default:	goto yy47;
+		}
 yy44:
-	YYDEBUG(44, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'E') {
-		if (yych == 'A') goto yy157;
-		if (yych <= 'D') goto yy40;
-		goto yy158;
-	} else {
-		if (yych <= 'a') {
-			if (yych <= '`') goto yy40;
-			goto yy157;
+		YYDEBUG(44, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'U') {
+			if (yych <= 'M') {
+				if (yych == 'I') goto yy176;
+				goto yy47;
+			} else {
+				if (yych <= 'N') goto yy177;
+				if (yych <= 'O') goto yy179;
+				if (yych <= 'T') goto yy47;
+				goto yy180;
+			}
 		} else {
-			if (yych == 'e') goto yy158;
-			goto yy40;
+			if (yych <= 'n') {
+				if (yych == 'i') goto yy176;
+				if (yych <= 'm') goto yy47;
+				goto yy177;
+			} else {
+				if (yych <= 'o') goto yy179;
+				if (yych == 'u') goto yy180;
+				goto yy47;
+			}
 		}
-	}
 yy45:
-	YYDEBUG(45, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy159;
-	if (yych == 'r') goto yy159;
-	goto yy40;
-yy46:
-	YYDEBUG(46, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'U') {
-		if (yych == 'R') goto yy161;
-		if (yych <= 'T') goto yy40;
-		goto yy162;
-	} else {
-		if (yych <= 'r') {
-			if (yych <= 'q') goto yy40;
-			goto yy161;
-		} else {
-			if (yych == 'u') goto yy162;
-			goto yy40;
+		YYDEBUG(45, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'O') {
+			if (yych == 'L') goto yy181;
+			if (yych <= 'N') goto yy47;
+			goto yy182;
+		} else {
+			if (yych <= 'l') {
+				if (yych <= 'k') goto yy47;
+				goto yy181;
+			} else {
+				if (yych == 'o') goto yy182;
+				goto yy47;
+			}
 		}
-	}
+yy46:
+		YYDEBUG(46, *YYCURSOR);
+		yyaccept = 4;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 yy47:
-	YYDEBUG(47, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy163;
-	if (yych == 'e') goto yy163;
-	goto yy40;
+		YYDEBUG(47, *YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+		goto yy39;
 yy48:
-	YYDEBUG(48, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'W') {
-		if (yych == 'T') goto yy164;
-		if (yych <= 'V') goto yy40;
-		goto yy165;
-	} else {
-		if (yych <= 't') {
-			if (yych <= 's') goto yy40;
-			goto yy164;
+		YYDEBUG(48, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'S') {
+			if (yych <= 'L') {
+				if (yych == 'F') goto yy183;
+				goto yy47;
+			} else {
+				if (yych <= 'M') goto yy185;
+				if (yych <= 'N') goto yy186;
+				if (yych <= 'R') goto yy47;
+				goto yy187;
+			}
 		} else {
-			if (yych == 'w') goto yy165;
-			goto yy40;
+			if (yych <= 'm') {
+				if (yych == 'f') goto yy183;
+				if (yych <= 'l') goto yy47;
+				goto yy185;
+			} else {
+				if (yych <= 'n') goto yy186;
+				if (yych == 's') goto yy187;
+				goto yy47;
+			}
 		}
-	}
 yy49:
-	YYDEBUG(49, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'R') {
-		if (yych == 'H') goto yy166;
-		if (yych <= 'Q') goto yy40;
-		goto yy167;
-	} else {
-		if (yych <= 'h') {
-			if (yych <= 'g') goto yy40;
-			goto yy166;
-		} else {
-			if (yych == 'r') goto yy167;
-			goto yy40;
-		}
-	}
+		YYDEBUG(49, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy188;
+		if (yych == 'i') goto yy188;
+		goto yy47;
 yy50:
-	YYDEBUG(50, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'S') {
-		if (yych == 'N') goto yy168;
-		if (yych <= 'R') goto yy40;
-		goto yy169;
-	} else {
-		if (yych <= 'n') {
-			if (yych <= 'm') goto yy40;
-			goto yy168;
-		} else {
-			if (yych == 's') goto yy169;
-			goto yy40;
-		}
-	}
+		YYDEBUG(50, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy189;
+		if (yych == 'a') goto yy189;
+		goto yy47;
 yy51:
-	YYDEBUG(51, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy170;
-	if (yych == 'a') goto yy170;
-	goto yy40;
+		YYDEBUG(51, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'E') {
+			if (yych == 'A') goto yy190;
+			if (yych <= 'D') goto yy47;
+			goto yy191;
+		} else {
+			if (yych <= 'a') {
+				if (yych <= '`') goto yy47;
+				goto yy190;
+			} else {
+				if (yych == 'e') goto yy191;
+				goto yy47;
+			}
+		}
 yy52:
-	YYDEBUG(52, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy171;
-	if (yych == 'h') goto yy171;
-	goto yy40;
+		YYDEBUG(52, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy192;
+		if (yych == 'r') goto yy192;
+		goto yy47;
 yy53:
-	YYDEBUG(53, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy172;
-	if (yych == 'o') goto yy172;
-	goto yy40;
+		YYDEBUG(53, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'U') {
+			if (yych == 'R') goto yy194;
+			if (yych <= 'T') goto yy47;
+			goto yy195;
+		} else {
+			if (yych <= 'r') {
+				if (yych <= 'q') goto yy47;
+				goto yy194;
+			} else {
+				if (yych == 'u') goto yy195;
+				goto yy47;
+			}
+		}
 yy54:
-	YYDEBUG(54, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy173;
-	if (yych == 'i') goto yy173;
-	goto yy40;
+		YYDEBUG(54, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy196;
+		if (yych == 'e') goto yy196;
+		goto yy47;
 yy55:
-	YYDEBUG(55, *YYCURSOR);
-	++YYCURSOR;
-	goto yy14;
+		YYDEBUG(55, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'W') {
+			if (yych == 'T') goto yy197;
+			if (yych <= 'V') goto yy47;
+			goto yy198;
+		} else {
+			if (yych <= 't') {
+				if (yych <= 's') goto yy47;
+				goto yy197;
+			} else {
+				if (yych == 'w') goto yy198;
+				goto yy47;
+			}
+		}
 yy56:
-	YYDEBUG(56, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy57;
-		if (yych <= 'Z') goto yy174;
-		if (yych >= '_') goto yy174;
-	} else {
-		if (yych <= '`') goto yy57;
-		if (yych <= 'z') goto yy174;
-		if (yych >= 0x80) goto yy174;
-	}
+		YYDEBUG(56, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'R') {
+			if (yych == 'H') goto yy199;
+			if (yych <= 'Q') goto yy47;
+			goto yy200;
+		} else {
+			if (yych <= 'h') {
+				if (yych <= 'g') goto yy47;
+				goto yy199;
+			} else {
+				if (yych == 'r') goto yy200;
+				goto yy47;
+			}
+		}
 yy57:
-	YYDEBUG(57, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_NS_SEPARATOR);
-}
+		YYDEBUG(57, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'S') {
+			if (yych == 'N') goto yy201;
+			if (yych <= 'R') goto yy47;
+			goto yy202;
+		} else {
+			if (yych <= 'n') {
+				if (yych <= 'm') goto yy47;
+				goto yy201;
+			} else {
+				if (yych == 's') goto yy202;
+				goto yy47;
+			}
+		}
 yy58:
-	YYDEBUG(58, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy176;
-	goto yy4;
+		YYDEBUG(58, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy203;
+		if (yych == 'a') goto yy203;
+		goto yy47;
 yy59:
-	YYDEBUG(59, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy177;
-	goto yy40;
+		YYDEBUG(59, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy204;
+		if (yych == 'h') goto yy204;
+		goto yy47;
 yy60:
-	YYDEBUG(60, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+		YYDEBUG(60, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy205;
+		if (yych == 'o') goto yy205;
+		goto yy47;
+yy61:
+		YYDEBUG(61, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy206;
+		if (yych == 'i') goto yy206;
+		goto yy47;
+yy62:
+		YYDEBUG(62, *YYCURSOR);
+		++YYCURSOR;
+		goto yy20;
+yy63:
+		YYDEBUG(63, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy64;
+			if (yych <= 'Z') goto yy207;
+			if (yych >= '_') goto yy207;
+		} else {
+			if (yych <= '`') goto yy64;
+			if (yych <= 'z') goto yy207;
+			if (yych >= 0x80) goto yy207;
+		}
+yy64:
+		YYDEBUG(64, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_NS_SEPARATOR);
+}
+yy65:
+		YYDEBUG(65, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy210;
+		goto yy8;
+yy66:
+		YYDEBUG(66, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy212;
+		goto yy47;
+yy67:
+		YYDEBUG(67, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(68, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	BEGIN(ST_BACKQUOTE);
 	RETURN_TOKEN('`');
 }
-yy61:
-	YYDEBUG(61, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy69:
+		YYDEBUG(69, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(70, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_IN_SCRIPTING);
 	enter_nesting('{');
 	RETURN_TOKEN('{');
 }
-yy62:
-	YYDEBUG(62, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy178;
-	if (yych == '|') goto yy179;
-	goto yy4;
-yy63:
-	YYDEBUG(63, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy71:
+		YYDEBUG(71, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy213;
+		if (yych == '|') goto yy215;
+		goto yy8;
+yy72:
+		YYDEBUG(72, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(73, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RESET_DOC_COMMENT();
 	if (!zend_stack_is_empty(&SCNG(state_stack))) {
 		yy_pop_state();
 	}
 	RETURN_EXIT_NESTING_TOKEN('}');
 }
-yy64:
-	YYDEBUG(64, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy180;
-yy65:
-	YYDEBUG(65, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy74:
+		YYDEBUG(74, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy217;
+yy75:
+		YYDEBUG(75, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_IS_NOT_EQUAL);
 }
-yy66:
-	YYDEBUG(66, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy76:
+		YYDEBUG(76, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(77, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	enter_nesting('');
 	RETURN_TOKEN(T_ATTRIBUTE);
 }
-yy67:
-	YYDEBUG(67, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '^') {
-		if (yych <= '9') {
-			if (yych >= '0') goto yy67;
-		} else {
-			if (yych <= '@') goto yy68;
-			if (yych <= 'Z') goto yy67;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= '_') goto yy67;
+yy78:
+		YYDEBUG(78, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(79, *YYCURSOR);
+		if (yych <= '^') {
+			if (yych <= '9') {
+				if (yych >= '0') goto yy78;
+			} else {
+				if (yych <= '@') goto yy80;
+				if (yych <= 'Z') goto yy78;
+			}
 		} else {
-			if (yych <= 'z') goto yy67;
-			if (yych >= 0x80) goto yy67;
+			if (yych <= '`') {
+				if (yych <= '_') goto yy78;
+			} else {
+				if (yych <= 'z') goto yy78;
+				if (yych >= 0x80) goto yy78;
+			}
 		}
-	}
-yy68:
-	YYDEBUG(68, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy80:
+		YYDEBUG(80, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy69:
-	YYDEBUG(69, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy81:
+		YYDEBUG(81, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(82, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_MOD_EQUAL);
 }
-yy70:
-	YYDEBUG(70, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych <= '\n') {
-			if (yych >= '\t') goto yy70;
-		} else {
-			if (yych == '\r') goto yy70;
-		}
-	} else {
-		if (yych <= '$') {
-			if (yych <= ' ') goto yy70;
-			if (yych >= '$') goto yy72;
+yy83:
+		YYDEBUG(83, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+		YYDEBUG(84, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych <= '\n') {
+				if (yych >= '\t') goto yy83;
+			} else {
+				if (yych == '\r') goto yy83;
+			}
 		} else {
-			if (yych == '.') goto yy74;
+			if (yych <= '$') {
+				if (yych <= ' ') goto yy83;
+				if (yych >= '$') goto yy86;
+			} else {
+				if (yych == '.') goto yy90;
+			}
 		}
-	}
-yy71:
-	YYDEBUG(71, *YYCURSOR);
-	YYCURSOR = YYMARKER;
-	if (yyaccept <= 46) {
-		if (yyaccept <= 23) {
-			if (yyaccept <= 11) {
-				if (yyaccept <= 5) {
-					if (yyaccept <= 2) {
-						if (yyaccept <= 1) {
-							if (yyaccept == 0) {
-								goto yy11;
+yy85:
+		YYDEBUG(85, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept <= 46) {
+			if (yyaccept <= 23) {
+				if (yyaccept <= 11) {
+					if (yyaccept <= 5) {
+						if (yyaccept <= 2) {
+							if (yyaccept <= 1) {
+								if (yyaccept == 0) {
+									goto yy16;
+								} else {
+									goto yy20;
+								}
 							} else {
-								goto yy14;
+								goto yy8;
 							}
 						} else {
-							goto yy4;
+							if (yyaccept <= 4) {
+								if (yyaccept == 3) {
+									goto yy30;
+								} else {
+									goto yy39;
+								}
+							} else {
+								goto yy121;
+							}
 						}
 					} else {
-						if (yyaccept <= 4) {
-							if (yyaccept == 3) {
-								goto yy23;
+						if (yyaccept <= 8) {
+							if (yyaccept <= 7) {
+								if (yyaccept == 6) {
+									goto yy125;
+								} else {
+									goto yy138;
+								}
 							} else {
-								goto yy32;
+								goto yy159;
 							}
 						} else {
-							goto yy97;
+							if (yyaccept <= 10) {
+								if (yyaccept == 9) {
+									goto yy169;
+								} else {
+									goto yy178;
+								}
+							} else {
+								goto yy184;
+							}
 						}
 					}
 				} else {
-					if (yyaccept <= 8) {
-						if (yyaccept <= 7) {
-							if (yyaccept == 6) {
-								goto yy100;
+					if (yyaccept <= 17) {
+						if (yyaccept <= 14) {
+							if (yyaccept <= 13) {
+								if (yyaccept == 12) {
+									goto yy193;
+								} else {
+									goto yy209;
+								}
 							} else {
-								goto yy111;
+								goto yy238;
 							}
 						} else {
-							goto yy126;
+							if (yyaccept <= 16) {
+								if (yyaccept == 15) {
+									goto yy244;
+								} else {
+									goto yy247;
+								}
+							} else {
+								goto yy266;
+							}
 						}
 					} else {
-						if (yyaccept <= 10) {
-							if (yyaccept == 9) {
-								goto yy136;
+						if (yyaccept <= 20) {
+							if (yyaccept <= 19) {
+								if (yyaccept == 18) {
+									goto yy270;
+								} else {
+									goto yy282;
+								}
 							} else {
-								goto yy145;
+								goto yy293;
 							}
 						} else {
-							goto yy151;
+							if (yyaccept <= 22) {
+								if (yyaccept == 21) {
+									goto yy306;
+								} else {
+									goto yy318;
+								}
+							} else {
+								goto yy321;
+							}
 						}
 					}
 				}
 			} else {
-				if (yyaccept <= 17) {
-					if (yyaccept <= 14) {
-						if (yyaccept <= 13) {
-							if (yyaccept == 12) {
-								goto yy160;
+				if (yyaccept <= 35) {
+					if (yyaccept <= 29) {
+						if (yyaccept <= 26) {
+							if (yyaccept <= 25) {
+								if (yyaccept == 24) {
+									goto yy323;
+								} else {
+									goto yy326;
+								}
 							} else {
-								goto yy175;
+								goto yy358;
 							}
 						} else {
-							goto yy197;
+							if (yyaccept <= 28) {
+								if (yyaccept == 27) {
+									goto yy367;
+								} else {
+									goto yy369;
+								}
+							} else {
+								goto yy378;
+							}
 						}
 					} else {
-						if (yyaccept <= 16) {
-							if (yyaccept == 15) {
-								goto yy201;
+						if (yyaccept <= 32) {
+							if (yyaccept <= 31) {
+								if (yyaccept == 30) {
+									goto yy380;
+								} else {
+									goto yy387;
+								}
 							} else {
-								goto yy203;
+								goto yy394;
 							}
 						} else {
-							goto yy215;
+							if (yyaccept <= 34) {
+								if (yyaccept == 33) {
+									goto yy444;
+								} else {
+									goto yy446;
+								}
+							} else {
+								goto yy449;
+							}
 						}
 					}
 				} else {
-					if (yyaccept <= 20) {
-						if (yyaccept <= 19) {
-							if (yyaccept == 18) {
-								goto yy218;
+					if (yyaccept <= 41) {
+						if (yyaccept <= 38) {
+							if (yyaccept <= 37) {
+								if (yyaccept == 36) {
+									goto yy451;
+								} else {
+									goto yy453;
+								}
 							} else {
-								goto yy230;
+								goto yy455;
 							}
 						} else {
-							goto yy241;
+							if (yyaccept <= 40) {
+								if (yyaccept == 39) {
+									goto yy461;
+								} else {
+									goto yy465;
+								}
+							} else {
+								goto yy472;
+							}
 						}
 					} else {
-						if (yyaccept <= 22) {
-							if (yyaccept == 21) {
-								goto yy254;
+						if (yyaccept <= 44) {
+							if (yyaccept <= 43) {
+								if (yyaccept == 42) {
+									goto yy482;
+								} else {
+									goto yy484;
+								}
 							} else {
-								goto yy266;
+								goto yy487;
 							}
 						} else {
-							goto yy269;
+							if (yyaccept == 45) {
+								goto yy497;
+							} else {
+								goto yy499;
+							}
 						}
 					}
 				}
 			}
 		} else {
-			if (yyaccept <= 35) {
-				if (yyaccept <= 29) {
-					if (yyaccept <= 26) {
-						if (yyaccept <= 25) {
-							if (yyaccept == 24) {
-								goto yy271;
-							} else {
-								goto yy274;
-							}
-						} else {
-							goto yy304;
-						}
-					} else {
-						if (yyaccept <= 28) {
-							if (yyaccept == 27) {
-								goto yy313;
+			if (yyaccept <= 69) {
+				if (yyaccept <= 58) {
+					if (yyaccept <= 52) {
+						if (yyaccept <= 49) {
+							if (yyaccept <= 48) {
+								if (yyaccept == 47) {
+									goto yy501;
+								} else {
+									goto yy503;
+								}
 							} else {
-								goto yy315;
+								goto yy505;
 							}
 						} else {
-							goto yy324;
-						}
-					}
-				} else {
-					if (yyaccept <= 32) {
-						if (yyaccept <= 31) {
-							if (yyaccept == 30) {
-								goto yy326;
+							if (yyaccept <= 51) {
+								if (yyaccept == 50) {
+									goto yy540;
+								} else {
+									goto yy543;
+								}
 							} else {
-								goto yy333;
+								goto yy547;
 							}
-						} else {
-							goto yy340;
 						}
 					} else {
-						if (yyaccept <= 34) {
-							if (yyaccept == 33) {
-								goto yy387;
-							} else {
-								goto yy389;
-							}
-						} else {
-							goto yy392;
-						}
-					}
-				}
-			} else {
-				if (yyaccept <= 41) {
-					if (yyaccept <= 38) {
-						if (yyaccept <= 37) {
-							if (yyaccept == 36) {
-								goto yy394;
+						if (yyaccept <= 55) {
+							if (yyaccept <= 54) {
+								if (yyaccept == 53) {
+									goto yy555;
+								} else {
+									goto yy565;
+								}
 							} else {
-								goto yy396;
+								goto yy569;
 							}
 						} else {
-							goto yy398;
-						}
-					} else {
-						if (yyaccept <= 40) {
-							if (yyaccept == 39) {
-								goto yy404;
+							if (yyaccept <= 57) {
+								if (yyaccept == 56) {
+									goto yy571;
+								} else {
+									goto yy573;
+								}
 							} else {
-								goto yy408;
+								goto yy601;
 							}
-						} else {
-							goto yy414;
 						}
 					}
 				} else {
-					if (yyaccept <= 44) {
-						if (yyaccept <= 43) {
-							if (yyaccept == 42) {
-								goto yy424;
+					if (yyaccept <= 64) {
+						if (yyaccept <= 61) {
+							if (yyaccept <= 60) {
+								if (yyaccept == 59) {
+									goto yy603;
+								} else {
+									goto yy611;
+								}
 							} else {
-								goto yy426;
+								goto yy613;
 							}
 						} else {
-							goto yy429;
-						}
-					} else {
-						if (yyaccept == 45) {
-							goto yy439;
-						} else {
-							goto yy441;
-						}
-					}
-				}
-			}
-		}
-	} else {
-		if (yyaccept <= 69) {
-			if (yyaccept <= 58) {
-				if (yyaccept <= 52) {
-					if (yyaccept <= 49) {
-						if (yyaccept <= 48) {
-							if (yyaccept == 47) {
-								goto yy443;
+							if (yyaccept <= 63) {
+								if (yyaccept == 62) {
+									goto yy615;
+								} else {
+									goto yy619;
+								}
 							} else {
-								goto yy445;
+								goto yy625;
 							}
-						} else {
-							goto yy447;
 						}
 					} else {
-						if (yyaccept <= 51) {
-							if (yyaccept == 50) {
-								goto yy476;
+						if (yyaccept <= 67) {
+							if (yyaccept <= 66) {
+								if (yyaccept == 65) {
+									goto yy629;
+								} else {
+									goto yy633;
+								}
 							} else {
-								goto yy479;
+								goto yy646;
 							}
 						} else {
-							goto yy483;
-						}
-					}
-				} else {
-					if (yyaccept <= 55) {
-						if (yyaccept <= 54) {
-							if (yyaccept == 53) {
-								goto yy491;
+							if (yyaccept == 68) {
+								goto yy648;
 							} else {
-								goto yy501;
+								goto yy650;
 							}
-						} else {
-							goto yy505;
-						}
-					} else {
-						if (yyaccept <= 57) {
-							if (yyaccept == 56) {
-								goto yy507;
-							} else {
-								goto yy509;
-							}
-						} else {
-							goto yy531;
 						}
 					}
 				}
 			} else {
-				if (yyaccept <= 64) {
-					if (yyaccept <= 61) {
-						if (yyaccept <= 60) {
-							if (yyaccept == 59) {
-								goto yy533;
-							} else {
-								goto yy541;
-							}
-						} else {
-							goto yy543;
-						}
-					} else {
-						if (yyaccept <= 63) {
-							if (yyaccept == 62) {
-								goto yy545;
+				if (yyaccept <= 81) {
+					if (yyaccept <= 75) {
+						if (yyaccept <= 72) {
+							if (yyaccept <= 71) {
+								if (yyaccept == 70) {
+									goto yy655;
+								} else {
+									goto yy659;
+								}
 							} else {
-								goto yy549;
+								goto yy668;
 							}
 						} else {
-							goto yy555;
-						}
-					}
-				} else {
-					if (yyaccept <= 67) {
-						if (yyaccept <= 66) {
-							if (yyaccept == 65) {
-								goto yy559;
+							if (yyaccept <= 74) {
+								if (yyaccept == 73) {
+									goto yy673;
+								} else {
+									goto yy677;
+								}
 							} else {
-								goto yy563;
+								goto yy684;
 							}
-						} else {
-							goto yy574;
 						}
 					} else {
-						if (yyaccept == 68) {
-							goto yy576;
-						} else {
-							goto yy578;
-						}
-					}
-				}
-			}
-		} else {
-			if (yyaccept <= 81) {
-				if (yyaccept <= 75) {
-					if (yyaccept <= 72) {
-						if (yyaccept <= 71) {
-							if (yyaccept == 70) {
-								goto yy583;
+						if (yyaccept <= 78) {
+							if (yyaccept <= 77) {
+								if (yyaccept == 76) {
+									goto yy691;
+								} else {
+									goto yy693;
+								}
 							} else {
-								goto yy587;
+								goto yy695;
 							}
 						} else {
-							goto yy596;
-						}
-					} else {
-						if (yyaccept <= 74) {
-							if (yyaccept == 73) {
-								goto yy601;
+							if (yyaccept <= 80) {
+								if (yyaccept == 79) {
+									goto yy697;
+								} else {
+									goto yy701;
+								}
 							} else {
-								goto yy605;
+								goto yy707;
 							}
-						} else {
-							goto yy612;
 						}
 					}
 				} else {
-					if (yyaccept <= 78) {
-						if (yyaccept <= 77) {
-							if (yyaccept == 76) {
-								goto yy619;
-							} else {
-								goto yy621;
-							}
-						} else {
-							goto yy623;
-						}
-					} else {
-						if (yyaccept <= 80) {
-							if (yyaccept == 79) {
-								goto yy625;
+					if (yyaccept <= 87) {
+						if (yyaccept <= 84) {
+							if (yyaccept <= 83) {
+								if (yyaccept == 82) {
+									goto yy709;
+								} else {
+									goto yy711;
+								}
 							} else {
-								goto yy629;
+								goto yy715;
 							}
 						} else {
-							goto yy635;
-						}
-					}
-				}
-			} else {
-				if (yyaccept <= 87) {
-					if (yyaccept <= 84) {
-						if (yyaccept <= 83) {
-							if (yyaccept == 82) {
-								goto yy637;
+							if (yyaccept <= 86) {
+								if (yyaccept == 85) {
+									goto yy718;
+								} else {
+									goto yy725;
+								}
 							} else {
-								goto yy639;
+								goto yy732;
 							}
-						} else {
-							goto yy643;
 						}
 					} else {
-						if (yyaccept <= 86) {
-							if (yyaccept == 85) {
-								goto yy646;
+						if (yyaccept <= 90) {
+							if (yyaccept <= 89) {
+								if (yyaccept == 88) {
+									goto yy743;
+								} else {
+									goto yy745;
+								}
 							} else {
-								goto yy653;
+								goto yy747;
 							}
 						} else {
-							goto yy659;
-						}
-					}
-				} else {
-					if (yyaccept <= 90) {
-						if (yyaccept <= 89) {
-							if (yyaccept == 88) {
-								goto yy668;
+							if (yyaccept == 91) {
+								goto yy753;
 							} else {
-								goto yy670;
+								goto yy756;
 							}
-						} else {
-							goto yy672;
-						}
-					} else {
-						if (yyaccept == 91) {
-							goto yy678;
-						} else {
-							goto yy681;
 						}
 					}
 				}
 			}
 		}
-	}
-yy72:
-	YYDEBUG(72, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy86:
+		YYDEBUG(86, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(87, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(1);
 	RETURN_TOKEN(T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG);
 }
-yy73:
-	YYDEBUG(73, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy88:
+		YYDEBUG(88, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(89, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_BOOLEAN_AND);
 }
-yy74:
-	YYDEBUG(74, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '.') goto yy181;
-	goto yy71;
-yy75:
-	YYDEBUG(75, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy90:
+		YYDEBUG(90, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '.') goto yy219;
+		goto yy85;
+yy91:
+		YYDEBUG(91, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(92, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_AND_EQUAL);
 }
-yy76:
-	YYDEBUG(76, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(7);
-	yych = *YYCURSOR;
-yy77:
-	YYDEBUG(77, *YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 16) {
-		goto yy76;
-	}
-	switch (yych) {
+yy93:
+		YYDEBUG(93, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(7);
+		yych = *YYCURSOR;
+yy94:
+		YYDEBUG(94, *YYCURSOR);
+		if (yybm0+yych & 16) {
+			goto yy93;
+		}
+		switch (yych) {
 		case 'A':
-		case 'a': goto yy78;
+		case 'a':	goto yy95;
 		case 'B':
-		case 'b': goto yy79;
+		case 'b':	goto yy96;
 		case 'D':
-		case 'd': goto yy80;
+		case 'd':	goto yy97;
 		case 'F':
-		case 'f': goto yy81;
+		case 'f':	goto yy98;
 		case 'I':
-		case 'i': goto yy82;
+		case 'i':	goto yy99;
 		case 'O':
-		case 'o': goto yy83;
+		case 'o':	goto yy100;
 		case 'R':
-		case 'r': goto yy84;
+		case 'r':	goto yy101;
 		case 'S':
-		case 's': goto yy85;
+		case 's':	goto yy102;
 		case 'U':
-		case 'u': goto yy86;
-		default: goto yy71;
-	}
-yy78:
-	YYDEBUG(78, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy182;
-	if (yych == 'r') goto yy182;
-	goto yy71;
-yy79:
-	YYDEBUG(79, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= 'O') {
-		if (yych == 'I') goto yy183;
-		if (yych <= 'N') goto yy71;
-		goto yy184;
-	} else {
-		if (yych <= 'i') {
-			if (yych <= 'h') goto yy71;
-			goto yy183;
+		case 'u':	goto yy103;
+		default:	goto yy85;
+		}
+yy95:
+		YYDEBUG(95, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'R') goto yy220;
+		if (yych == 'r') goto yy220;
+		goto yy85;
+yy96:
+		YYDEBUG(96, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= 'O') {
+			if (yych == 'I') goto yy221;
+			if (yych <= 'N') goto yy85;
+			goto yy222;
 		} else {
-			if (yych == 'o') goto yy184;
-			goto yy71;
+			if (yych <= 'i') {
+				if (yych <= 'h') goto yy85;
+				goto yy221;
+			} else {
+				if (yych == 'o') goto yy222;
+				goto yy85;
+			}
 		}
-	}
-yy80:
-	YYDEBUG(80, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy185;
-	if (yych == 'o') goto yy185;
-	goto yy71;
-yy81:
-	YYDEBUG(81, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy186;
-	if (yych == 'l') goto yy186;
-	goto yy71;
-yy82:
-	YYDEBUG(82, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy187;
-	if (yych == 'n') goto yy187;
-	goto yy71;
-yy83:
-	YYDEBUG(83, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy188;
-	if (yych == 'b') goto yy188;
-	goto yy71;
-yy84:
-	YYDEBUG(84, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy189;
-	if (yych == 'e') goto yy189;
-	goto yy71;
-yy85:
-	YYDEBUG(85, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy190;
-	if (yych == 't') goto yy190;
-	goto yy71;
-yy86:
-	YYDEBUG(86, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy191;
-	if (yych == 'n') goto yy191;
-	goto yy71;
-yy87:
-	YYDEBUG(87, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy192;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy97:
+		YYDEBUG(97, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'O') goto yy223;
+		if (yych == 'o') goto yy223;
+		goto yy85;
+yy98:
+		YYDEBUG(98, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy224;
+		if (yych == 'l') goto yy224;
+		goto yy85;
+yy99:
+		YYDEBUG(99, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy225;
+		if (yych == 'n') goto yy225;
+		goto yy85;
+yy100:
+		YYDEBUG(100, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'B') goto yy226;
+		if (yych == 'b') goto yy226;
+		goto yy85;
+yy101:
+		YYDEBUG(101, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy227;
+		if (yych == 'e') goto yy227;
+		goto yy85;
+yy102:
+		YYDEBUG(102, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'T') goto yy228;
+		if (yych == 't') goto yy228;
+		goto yy85;
+yy103:
+		YYDEBUG(103, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy229;
+		if (yych == 'n') goto yy229;
+		goto yy85;
+yy104:
+		YYDEBUG(104, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy230;
+		YYDEBUG(105, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_POW);
 }
-yy88:
-	YYDEBUG(88, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy106:
+		YYDEBUG(106, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(107, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_MUL_EQUAL);
 }
-yy89:
-	YYDEBUG(89, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy108:
+		YYDEBUG(108, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(109, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_INC);
 }
-yy90:
-	YYDEBUG(90, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy110:
+		YYDEBUG(110, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(111, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_PLUS_EQUAL);
 }
-yy91:
-	YYDEBUG(91, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy112:
+		YYDEBUG(112, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(113, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_DEC);
 }
-yy92:
-	YYDEBUG(92, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy114:
+		YYDEBUG(114, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(115, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_MINUS_EQUAL);
 }
-yy93:
-	YYDEBUG(93, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy116:
+		YYDEBUG(116, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(117, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN(T_OBJECT_OPERATOR);
 }
-yy94:
-	YYDEBUG(94, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '.') goto yy193;
-	goto yy71;
-yy95:
-	YYDEBUG(95, *YYCURSOR);
-	yyaccept = 5;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-yy96:
-	YYDEBUG(96, *YYCURSOR);
-	if (yych <= 'E') {
-		if (yych <= '/') goto yy97;
-		if (yych <= '9') goto yy95;
-		if (yych >= 'E') goto yy105;
-	} else {
-		if (yych <= '_') {
-			if (yych >= '_') goto yy194;
+yy118:
+		YYDEBUG(118, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '.') goto yy232;
+		goto yy85;
+yy119:
+		YYDEBUG(119, *YYCURSOR);
+		yyaccept = 5;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+yy120:
+		YYDEBUG(120, *YYCURSOR);
+		if (yych <= 'E') {
+			if (yych <= '/') goto yy121;
+			if (yych <= '9') goto yy119;
+			if (yych >= 'E') goto yy131;
 		} else {
-			if (yych == 'e') goto yy105;
+			if (yych <= '_') {
+				if (yych >= '_') goto yy234;
+			} else {
+				if (yych == 'e') goto yy131;
+			}
 		}
-	}
-yy97:
-	YYDEBUG(97, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy121:
+		YYDEBUG(121, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	const char *end;
 	size_t len = yyleng;
 	char *dnum = yytext;
@@ -3385,22 +3171,23 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_DNUMBER);
 }
-yy98:
-	YYDEBUG(98, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy122:
+		YYDEBUG(122, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(123, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_CONCAT_EQUAL);
 }
-yy99:
-	YYDEBUG(99, *YYCURSOR);
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '*') goto yy195;
-yy100:
-	YYDEBUG(100, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy124:
+		YYDEBUG(124, *YYCURSOR);
+		yyaccept = 6;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '*') goto yy235;
+yy125:
+		YYDEBUG(125, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	int doc_com;
 
 	if (yyleng > 2) {
@@ -3435,147 +3222,154 @@
 
 	RETURN_OR_SKIP_TOKEN(T_COMMENT);
 }
-yy101:
-	YYDEBUG(101, *YYCURSOR);
-	++YYCURSOR;
-	goto yy7;
-yy102:
-	YYDEBUG(102, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy126:
+		YYDEBUG(126, *YYCURSOR);
+		++YYCURSOR;
+		goto yy12;
+yy127:
+		YYDEBUG(127, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(128, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_DIV_EQUAL);
 }
-yy103:
-	YYDEBUG(103, *YYCURSOR);
-	yyaccept = 5;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy97;
-	goto yy96;
-yy104:
-	YYDEBUG(104, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING0+yych & 32) {
-		goto yy196;
-	}
-	goto yy71;
-yy105:
-	YYDEBUG(105, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= ',') {
-		if (yych == '+') goto yy198;
-		goto yy71;
-	} else {
-		if (yych <= '-') goto yy198;
-		if (yych <= '/') goto yy71;
-		if (yych <= '9') goto yy199;
-		goto yy71;
-	}
-yy106:
-	YYDEBUG(106, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING0+yych & 64) {
-		goto yy200;
-	}
-	goto yy71;
-yy107:
-	YYDEBUG(107, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING0+yych & 128) {
-		goto yy202;
-	}
-	goto yy71;
-yy108:
-	YYDEBUG(108, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING0+yych & 4) {
-		goto yy24;
-	}
-	goto yy71;
-yy109:
-	YYDEBUG(109, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy129:
+		YYDEBUG(129, *YYCURSOR);
+		yyaccept = 5;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy121;
+		goto yy120;
+yy130:
+		YYDEBUG(130, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 32) {
+			goto yy236;
+		}
+		goto yy85;
+yy131:
+		YYDEBUG(131, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= ',') {
+			if (yych == '+') goto yy239;
+			goto yy85;
+		} else {
+			if (yych <= '-') goto yy239;
+			if (yych <= '/') goto yy85;
+			if (yych <= '9') goto yy240;
+			goto yy85;
+		}
+yy132:
+		YYDEBUG(132, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 64) {
+			goto yy242;
+		}
+		goto yy85;
+yy133:
+		YYDEBUG(133, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 128) {
+			goto yy245;
+		}
+		goto yy85;
+yy134:
+		YYDEBUG(134, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 4) {
+			goto yy31;
+		}
+		goto yy85;
+yy135:
+		YYDEBUG(135, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(136, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_PAAMAYIM_NEKUDOTAYIM);
 }
-yy110:
-	YYDEBUG(110, *YYCURSOR);
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ';') goto yy111;
-	if (yych <= '<') goto yy204;
-	if (yych <= '=') goto yy205;
-yy111:
-	YYDEBUG(111, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy137:
+		YYDEBUG(137, *YYCURSOR);
+		yyaccept = 7;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= ';') goto yy138;
+		if (yych <= '<') goto yy248;
+		if (yych <= '=') goto yy250;
+yy138:
+		YYDEBUG(138, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_SL);
 }
-yy112:
-	YYDEBUG(112, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy206;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy139:
+		YYDEBUG(139, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy252;
+		YYDEBUG(140, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_IS_SMALLER_OR_EQUAL);
 }
-yy113:
-	YYDEBUG(113, *YYCURSOR);
-	++YYCURSOR;
-	goto yy65;
-yy114:
-	YYDEBUG(114, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy207;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy141:
+		YYDEBUG(141, *YYCURSOR);
+		++YYCURSOR;
+		goto yy75;
+yy142:
+		YYDEBUG(142, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy254;
+		YYDEBUG(143, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_IS_EQUAL);
 }
-yy115:
-	YYDEBUG(115, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy144:
+		YYDEBUG(144, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(145, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_DOUBLE_ARROW);
 }
-yy116:
-	YYDEBUG(116, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy146:
+		YYDEBUG(146, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(147, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_IS_GREATER_OR_EQUAL);
 }
-yy117:
-	YYDEBUG(117, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy208;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy148:
+		YYDEBUG(148, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy256;
+		YYDEBUG(149, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_SR);
 }
-yy118:
-	YYDEBUG(118, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy209;
-	goto yy71;
-yy119:
-	YYDEBUG(119, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy210;
-	if (yych == '\r') goto yy211;
-yy120:
-	YYDEBUG(120, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy150:
+		YYDEBUG(150, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy258;
+		goto yy85;
+yy151:
+		YYDEBUG(151, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy260;
+		if (yych == '\r') goto yy261;
+yy152:
+		YYDEBUG(152, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	BEGIN(INITIAL);
 	if (yytextyyleng-1 != '>') {
 		CG(increment_lineno) = 1;
@@ -3585,685 +3379,694 @@
 	}
 	RETURN_TOKEN(T_CLOSE_TAG);
 }
-yy121:
-	YYDEBUG(121, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy212;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy153:
+		YYDEBUG(153, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy262;
+		YYDEBUG(154, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_COALESCE);
 }
-yy122:
-	YYDEBUG(122, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy213;
-	if (yych == 's') goto yy213;
-	goto yy40;
-yy123:
-	YYDEBUG(123, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy214;
-	if (yych == 'd') goto yy214;
-	goto yy40;
-yy124:
-	YYDEBUG(124, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy216;
-	if (yych == 'r') goto yy216;
-	goto yy40;
-yy125:
-	YYDEBUG(125, *YYCURSOR);
-	yyaccept = 8;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy126:
-	YYDEBUG(126, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy155:
+		YYDEBUG(155, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy264;
+		if (yych == 's') goto yy264;
+		goto yy47;
+yy156:
+		YYDEBUG(156, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy265;
+		if (yych == 'd') goto yy265;
+		goto yy47;
+yy157:
+		YYDEBUG(157, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy267;
+		if (yych == 'r') goto yy267;
+		goto yy47;
+yy158:
+		YYDEBUG(158, *YYCURSOR);
+		yyaccept = 8;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy159:
+		YYDEBUG(159, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_IDENT(T_AS);
 }
-yy127:
-	YYDEBUG(127, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy71;
-		if (yych <= 'Z') goto yy217;
-		if (yych <= '^') goto yy71;
-		goto yy217;
-	} else {
-		if (yych <= '`') goto yy71;
-		if (yych <= 'z') goto yy217;
-		if (yych <= 0x7F) goto yy71;
-		goto yy217;
-	}
-yy128:
-	YYDEBUG(128, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '<') goto yy219;
-	goto yy71;
-yy129:
-	YYDEBUG(129, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy220;
-	if (yych == 'e') goto yy220;
-	goto yy40;
-yy130:
-	YYDEBUG(130, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'T') {
-		if (yych <= 'L') {
-			if (yych <= 'K') goto yy40;
-			goto yy221;
-		} else {
-			if (yych <= 'R') goto yy40;
-			if (yych <= 'S') goto yy222;
-			goto yy223;
-		}
-	} else {
-		if (yych <= 'r') {
-			if (yych == 'l') goto yy221;
-			goto yy40;
-		} else {
-			if (yych <= 's') goto yy222;
-			if (yych <= 't') goto yy223;
-			goto yy40;
+yy160:
+		YYDEBUG(160, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy85;
+			if (yych <= 'Z') goto yy268;
+			if (yych <= '^') goto yy85;
+			goto yy268;
+		} else {
+			if (yych <= '`') goto yy85;
+			if (yych <= 'z') goto yy268;
+			if (yych <= 0x7F) goto yy85;
+			goto yy268;
 		}
-	}
-yy131:
-	YYDEBUG(131, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'O') {
-		if (yych == 'A') goto yy224;
-		if (yych <= 'N') goto yy40;
-		goto yy225;
-	} else {
-		if (yych <= 'a') {
-			if (yych <= '`') goto yy40;
-			goto yy224;
+yy161:
+		YYDEBUG(161, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '<') goto yy271;
+		goto yy85;
+yy162:
+		YYDEBUG(162, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy272;
+		if (yych == 'e') goto yy272;
+		goto yy47;
+yy163:
+		YYDEBUG(163, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'T') {
+			if (yych <= 'L') {
+				if (yych <= 'K') goto yy47;
+				goto yy273;
+			} else {
+				if (yych <= 'R') goto yy47;
+				if (yych <= 'S') goto yy274;
+				goto yy275;
+			}
 		} else {
-			if (yych == 'o') goto yy225;
-			goto yy40;
+			if (yych <= 'r') {
+				if (yych == 'l') goto yy273;
+				goto yy47;
+			} else {
+				if (yych <= 's') goto yy274;
+				if (yych <= 't') goto yy275;
+				goto yy47;
+			}
 		}
-	}
-yy132:
-	YYDEBUG(132, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy226;
-	if (yych == 'n') goto yy226;
-	goto yy40;
-yy133:
-	YYDEBUG(133, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'F') {
-		if (yych == 'C') goto yy227;
-		if (yych <= 'E') goto yy40;
-		goto yy228;
-	} else {
-		if (yych <= 'c') {
-			if (yych <= 'b') goto yy40;
-			goto yy227;
-		} else {
-			if (yych == 'f') goto yy228;
-			goto yy40;
+yy164:
+		YYDEBUG(164, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'O') {
+			if (yych == 'A') goto yy276;
+			if (yych <= 'N') goto yy47;
+			goto yy277;
+		} else {
+			if (yych <= 'a') {
+				if (yych <= '`') goto yy47;
+				goto yy276;
+			} else {
+				if (yych == 'o') goto yy277;
+				goto yy47;
+			}
 		}
-	}
-yy134:
-	YYDEBUG(134, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy229;
-	if (yych == 'e') goto yy229;
-	goto yy40;
-yy135:
-	YYDEBUG(135, *YYCURSOR);
-	yyaccept = 9;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy136:
-	YYDEBUG(136, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy165:
+		YYDEBUG(165, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy278;
+		if (yych == 'n') goto yy278;
+		goto yy47;
+yy166:
+		YYDEBUG(166, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'F') {
+			if (yych == 'C') goto yy279;
+			if (yych <= 'E') goto yy47;
+			goto yy280;
+		} else {
+			if (yych <= 'c') {
+				if (yych <= 'b') goto yy47;
+				goto yy279;
+			} else {
+				if (yych == 'f') goto yy280;
+				goto yy47;
+			}
+		}
+yy167:
+		YYDEBUG(167, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy281;
+		if (yych == 'e') goto yy281;
+		goto yy47;
+yy168:
+		YYDEBUG(168, *YYCURSOR);
+		yyaccept = 9;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy169:
+		YYDEBUG(169, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_IDENT(T_DO);
 }
-yy137:
-	YYDEBUG(137, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy231;
-	if (yych == 'h') goto yy231;
-	goto yy40;
-yy138:
-	YYDEBUG(138, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy232;
-	if (yych == 's') goto yy232;
-	goto yy40;
-yy139:
-	YYDEBUG(139, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'P') goto yy233;
-	if (yych == 'p') goto yy233;
-	goto yy40;
-yy140:
-	YYDEBUG(140, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'U') {
-		if (yych == 'D') goto yy234;
-		if (yych <= 'T') goto yy40;
-		goto yy235;
-	} else {
-		if (yych <= 'd') {
-			if (yych <= 'c') goto yy40;
-			goto yy234;
-		} else {
-			if (yych == 'u') goto yy235;
-			goto yy40;
+yy170:
+		YYDEBUG(170, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy283;
+		if (yych == 'h') goto yy283;
+		goto yy47;
+yy171:
+		YYDEBUG(171, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy284;
+		if (yych == 's') goto yy284;
+		goto yy47;
+yy172:
+		YYDEBUG(172, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'P') goto yy285;
+		if (yych == 'p') goto yy285;
+		goto yy47;
+yy173:
+		YYDEBUG(173, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'U') {
+			if (yych == 'D') goto yy286;
+			if (yych <= 'T') goto yy47;
+			goto yy287;
+		} else {
+			if (yych <= 'd') {
+				if (yych <= 'c') goto yy47;
+				goto yy286;
+			} else {
+				if (yych == 'u') goto yy287;
+				goto yy47;
+			}
 		}
-	}
-yy141:
-	YYDEBUG(141, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy236;
-	if (yych == 'a') goto yy236;
-	goto yy40;
-yy142:
-	YYDEBUG(142, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'T') {
-		if (yych == 'I') goto yy237;
-		if (yych <= 'S') goto yy40;
-		goto yy238;
-	} else {
-		if (yych <= 'i') {
-			if (yych <= 'h') goto yy40;
-			goto yy237;
+yy174:
+		YYDEBUG(174, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy288;
+		if (yych == 'a') goto yy288;
+		goto yy47;
+yy175:
+		YYDEBUG(175, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'T') {
+			if (yych == 'I') goto yy289;
+			if (yych <= 'S') goto yy47;
+			goto yy290;
 		} else {
-			if (yych == 't') goto yy238;
-			goto yy40;
+			if (yych <= 'i') {
+				if (yych <= 'h') goto yy47;
+				goto yy289;
+			} else {
+				if (yych == 't') goto yy290;
+				goto yy47;
+			}
 		}
-	}
-yy143:
-	YYDEBUG(143, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy239;
-	if (yych == 'n') goto yy239;
-	goto yy40;
-yy144:
-	YYDEBUG(144, *YYCURSOR);
-	yyaccept = 10;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy145:
-	YYDEBUG(145, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy176:
+		YYDEBUG(176, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy291;
+		if (yych == 'n') goto yy291;
+		goto yy47;
+yy177:
+		YYDEBUG(177, *YYCURSOR);
+		yyaccept = 10;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy178:
+		YYDEBUG(178, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_IDENT(T_FN);
 }
-yy146:
-	YYDEBUG(146, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy240;
-	if (yych == 'r') goto yy240;
-	goto yy40;
-yy147:
-	YYDEBUG(147, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy242;
-	if (yych == 'n') goto yy242;
-	goto yy40;
-yy148:
-	YYDEBUG(148, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy243;
-	if (yych == 'o') goto yy243;
-	goto yy40;
-yy149:
-	YYDEBUG(149, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy244;
-	if (yych == 't') goto yy244;
-	goto yy40;
-yy150:
-	YYDEBUG(150, *YYCURSOR);
-	yyaccept = 11;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy151:
-	YYDEBUG(151, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy179:
+		YYDEBUG(179, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy292;
+		if (yych == 'r') goto yy292;
+		goto yy47;
+yy180:
+		YYDEBUG(180, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy294;
+		if (yych == 'n') goto yy294;
+		goto yy47;
+yy181:
+		YYDEBUG(181, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy295;
+		if (yych == 'o') goto yy295;
+		goto yy47;
+yy182:
+		YYDEBUG(182, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy296;
+		if (yych == 't') goto yy296;
+		goto yy47;
+yy183:
+		YYDEBUG(183, *YYCURSOR);
+		yyaccept = 11;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy184:
+		YYDEBUG(184, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_IDENT(T_IF);
 }
-yy152:
-	YYDEBUG(152, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'P') goto yy245;
-	if (yych == 'p') goto yy245;
-	goto yy40;
-yy153:
-	YYDEBUG(153, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'T') {
-		if (yych <= 'C') {
-			if (yych <= 'B') goto yy40;
-			goto yy246;
-		} else {
-			if (yych <= 'R') goto yy40;
-			if (yych <= 'S') goto yy247;
-			goto yy248;
+yy185:
+		YYDEBUG(185, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'P') goto yy297;
+		if (yych == 'p') goto yy297;
+		goto yy47;
+yy186:
+		YYDEBUG(186, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'T') {
+			if (yych <= 'C') {
+				if (yych <= 'B') goto yy47;
+				goto yy298;
+			} else {
+				if (yych <= 'R') goto yy47;
+				if (yych <= 'S') goto yy299;
+				goto yy300;
+			}
+		} else {
+			if (yych <= 'r') {
+				if (yych == 'c') goto yy298;
+				goto yy47;
+			} else {
+				if (yych <= 's') goto yy299;
+				if (yych <= 't') goto yy300;
+				goto yy47;
+			}
 		}
-	} else {
-		if (yych <= 'r') {
-			if (yych == 'c') goto yy246;
-			goto yy40;
-		} else {
-			if (yych <= 's') goto yy247;
-			if (yych <= 't') goto yy248;
-			goto yy40;
+yy187:
+		YYDEBUG(187, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy301;
+		if (yych == 's') goto yy301;
+		goto yy47;
+yy188:
+		YYDEBUG(188, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy302;
+		if (yych == 's') goto yy302;
+		goto yy47;
+yy189:
+		YYDEBUG(189, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy303;
+		if (yych == 't') goto yy303;
+		goto yy47;
+yy190:
+		YYDEBUG(190, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'M') goto yy304;
+		if (yych == 'm') goto yy304;
+		goto yy47;
+yy191:
+		YYDEBUG(191, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'W') goto yy305;
+		if (yych == 'w') goto yy305;
+		goto yy47;
+yy192:
+		YYDEBUG(192, *YYCURSOR);
+		yyaccept = 12;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
 		}
-	}
-yy154:
-	YYDEBUG(154, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy249;
-	if (yych == 's') goto yy249;
-	goto yy40;
-yy155:
-	YYDEBUG(155, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy250;
-	if (yych == 's') goto yy250;
-	goto yy40;
-yy156:
-	YYDEBUG(156, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy251;
-	if (yych == 't') goto yy251;
-	goto yy40;
-yy157:
-	YYDEBUG(157, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'M') goto yy252;
-	if (yych == 'm') goto yy252;
-	goto yy40;
-yy158:
-	YYDEBUG(158, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'W') goto yy253;
-	if (yych == 'w') goto yy253;
-	goto yy40;
-yy159:
-	YYDEBUG(159, *YYCURSOR);
-	yyaccept = 12;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy160:
-	YYDEBUG(160, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+		if (yych == '\\') goto yy160;
+yy193:
+		YYDEBUG(193, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_IDENT(T_LOGICAL_OR);
 }
-yy161:
-	YYDEBUG(161, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'O') {
-		if (yych == 'I') goto yy255;
-		if (yych <= 'N') goto yy40;
-		goto yy256;
-	} else {
-		if (yych <= 'i') {
-			if (yych <= 'h') goto yy40;
-			goto yy255;
+yy194:
+		YYDEBUG(194, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'O') {
+			if (yych == 'I') goto yy307;
+			if (yych <= 'N') goto yy47;
+			goto yy308;
 		} else {
-			if (yych == 'o') goto yy256;
-			goto yy40;
-		}
-	}
-yy162:
-	YYDEBUG(162, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'B') goto yy257;
-	if (yych == 'b') goto yy257;
-	goto yy40;
-yy163:
-	YYDEBUG(163, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'T') {
-		if (yych <= 'P') {
-			if (yych == 'A') goto yy258;
-			goto yy40;
-		} else {
-			if (yych <= 'Q') goto yy259;
-			if (yych <= 'S') goto yy40;
-			goto yy260;
-		}
-	} else {
-		if (yych <= 'p') {
-			if (yych == 'a') goto yy258;
-			goto yy40;
-		} else {
-			if (yych <= 'q') goto yy259;
-			if (yych == 't') goto yy260;
-			goto yy40;
+			if (yych <= 'i') {
+				if (yych <= 'h') goto yy47;
+				goto yy307;
+			} else {
+				if (yych == 'o') goto yy308;
+				goto yy47;
+			}
 		}
-	}
-yy164:
-	YYDEBUG(164, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy261;
-	if (yych == 'a') goto yy261;
-	goto yy40;
-yy165:
-	YYDEBUG(165, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy262;
-	if (yych == 'i') goto yy262;
-	goto yy40;
-yy166:
-	YYDEBUG(166, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy263;
-	if (yych == 'r') goto yy263;
-	goto yy40;
-yy167:
-	YYDEBUG(167, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'Y') {
-		if (yych == 'A') goto yy264;
-		if (yych <= 'X') goto yy40;
-		goto yy265;
-	} else {
-		if (yych <= 'a') {
-			if (yych <= '`') goto yy40;
-			goto yy264;
+yy195:
+		YYDEBUG(195, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'B') goto yy309;
+		if (yych == 'b') goto yy309;
+		goto yy47;
+yy196:
+		YYDEBUG(196, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'T') {
+			if (yych <= 'P') {
+				if (yych == 'A') goto yy310;
+				goto yy47;
+			} else {
+				if (yych <= 'Q') goto yy311;
+				if (yych <= 'S') goto yy47;
+				goto yy312;
+			}
 		} else {
-			if (yych == 'y') goto yy265;
-			goto yy40;
+			if (yych <= 'p') {
+				if (yych == 'a') goto yy310;
+				goto yy47;
+			} else {
+				if (yych <= 'q') goto yy311;
+				if (yych == 't') goto yy312;
+				goto yy47;
+			}
 		}
-	}
-yy168:
-	YYDEBUG(168, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy267;
-	if (yych == 's') goto yy267;
-	goto yy40;
-yy169:
-	YYDEBUG(169, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy268;
-	if (yych == 'e') goto yy268;
-	goto yy40;
-yy170:
-	YYDEBUG(170, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy270;
-	if (yych == 'r') goto yy270;
-	goto yy40;
-yy171:
-	YYDEBUG(171, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy272;
-	if (yych == 'i') goto yy272;
-	goto yy40;
-yy172:
-	YYDEBUG(172, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy273;
-	if (yych == 'r') goto yy273;
-	goto yy40;
-yy173:
-	YYDEBUG(173, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy275;
-	if (yych == 'e') goto yy275;
-	goto yy40;
-yy174:
-	YYDEBUG(174, *YYCURSOR);
-	yyaccept = 13;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= '@') {
-			if (yych <= '/') goto yy175;
-			if (yych <= '9') goto yy174;
-		} else {
-			if (yych <= 'Z') goto yy174;
-			if (yych >= '\\') goto yy276;
+yy197:
+		YYDEBUG(197, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy313;
+		if (yych == 'a') goto yy313;
+		goto yy47;
+yy198:
+		YYDEBUG(198, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy314;
+		if (yych == 'i') goto yy314;
+		goto yy47;
+yy199:
+		YYDEBUG(199, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy315;
+		if (yych == 'r') goto yy315;
+		goto yy47;
+yy200:
+		YYDEBUG(200, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'Y') {
+			if (yych == 'A') goto yy316;
+			if (yych <= 'X') goto yy47;
+			goto yy317;
+		} else {
+			if (yych <= 'a') {
+				if (yych <= '`') goto yy47;
+				goto yy316;
+			} else {
+				if (yych == 'y') goto yy317;
+				goto yy47;
+			}
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych == '_') goto yy174;
+yy201:
+		YYDEBUG(201, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy319;
+		if (yych == 's') goto yy319;
+		goto yy47;
+yy202:
+		YYDEBUG(202, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy320;
+		if (yych == 'e') goto yy320;
+		goto yy47;
+yy203:
+		YYDEBUG(203, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy322;
+		if (yych == 'r') goto yy322;
+		goto yy47;
+yy204:
+		YYDEBUG(204, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy324;
+		if (yych == 'i') goto yy324;
+		goto yy47;
+yy205:
+		YYDEBUG(205, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy325;
+		if (yych == 'r') goto yy325;
+		goto yy47;
+yy206:
+		YYDEBUG(206, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy327;
+		if (yych == 'e') goto yy327;
+		goto yy47;
+yy207:
+		YYDEBUG(207, *YYCURSOR);
+		yyaccept = 13;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(208, *YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= '@') {
+				if (yych <= '/') goto yy209;
+				if (yych <= '9') goto yy207;
+			} else {
+				if (yych <= 'Z') goto yy207;
+				if (yych >= '\\') goto yy328;
+			}
 		} else {
-			if (yych <= 'z') goto yy174;
-			if (yych >= 0x80) goto yy174;
+			if (yych <= '`') {
+				if (yych == '_') goto yy207;
+			} else {
+				if (yych <= 'z') goto yy207;
+				if (yych >= 0x80) goto yy207;
+			}
 		}
-	}
-yy175:
-	YYDEBUG(175, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy209:
+		YYDEBUG(209, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_STR(T_NAME_FULLY_QUALIFIED, 1);
 }
-yy176:
-	YYDEBUG(176, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy210:
+		YYDEBUG(210, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(211, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_XOR_EQUAL);
 }
-yy177:
-	YYDEBUG(177, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch (yych) {
+yy212:
+		YYDEBUG(212, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		switch (yych) {
 		case 'C':
-		case 'c': goto yy277;
+		case 'c':	goto yy329;
 		case 'D':
-		case 'd': goto yy278;
+		case 'd':	goto yy330;
 		case 'F':
-		case 'f': goto yy279;
+		case 'f':	goto yy331;
 		case 'H':
-		case 'h': goto yy280;
+		case 'h':	goto yy332;
 		case 'L':
-		case 'l': goto yy281;
+		case 'l':	goto yy333;
 		case 'M':
-		case 'm': goto yy282;
+		case 'm':	goto yy334;
 		case 'N':
-		case 'n': goto yy283;
+		case 'n':	goto yy335;
 		case 'T':
-		case 't': goto yy284;
-		default: goto yy40;
-	}
-yy178:
-	YYDEBUG(178, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+		case 't':	goto yy336;
+		default:	goto yy47;
+		}
+yy213:
+		YYDEBUG(213, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(214, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_OR_EQUAL);
 }
-yy179:
-	YYDEBUG(179, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy215:
+		YYDEBUG(215, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(216, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_BOOLEAN_OR);
 }
-yy180:
-	YYDEBUG(180, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy217:
+		YYDEBUG(217, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(218, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_IS_NOT_IDENTICAL);
 }
-yy181:
-	YYDEBUG(181, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '.') goto yy72;
-	goto yy71;
-yy182:
-	YYDEBUG(182, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy285;
-	if (yych == 'r') goto yy285;
-	goto yy71;
-yy183:
-	YYDEBUG(183, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy286;
-	if (yych == 'n') goto yy286;
-	goto yy71;
-yy184:
-	YYDEBUG(184, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy287;
-	if (yych == 'o') goto yy287;
-	goto yy71;
-yy185:
-	YYDEBUG(185, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'U') goto yy288;
-	if (yych == 'u') goto yy288;
-	goto yy71;
-yy186:
-	YYDEBUG(186, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy289;
-	if (yych == 'o') goto yy289;
-	goto yy71;
-yy187:
-	YYDEBUG(187, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy290;
-	if (yych == 't') goto yy290;
-	goto yy71;
-yy188:
-	YYDEBUG(188, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'J') goto yy291;
-	if (yych == 'j') goto yy291;
-	goto yy71;
-yy189:
-	YYDEBUG(189, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy292;
-	if (yych == 'a') goto yy292;
-	goto yy71;
-yy190:
-	YYDEBUG(190, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy293;
-	if (yych == 'r') goto yy293;
-	goto yy71;
-yy191:
-	YYDEBUG(191, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy294;
-	if (yych == 's') goto yy294;
-	goto yy71;
-yy192:
-	YYDEBUG(192, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy219:
+		YYDEBUG(219, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '.') goto yy86;
+		goto yy85;
+yy220:
+		YYDEBUG(220, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'R') goto yy337;
+		if (yych == 'r') goto yy337;
+		goto yy85;
+yy221:
+		YYDEBUG(221, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy338;
+		if (yych == 'n') goto yy338;
+		goto yy85;
+yy222:
+		YYDEBUG(222, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'O') goto yy339;
+		if (yych == 'o') goto yy339;
+		goto yy85;
+yy223:
+		YYDEBUG(223, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'U') goto yy340;
+		if (yych == 'u') goto yy340;
+		goto yy85;
+yy224:
+		YYDEBUG(224, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'O') goto yy341;
+		if (yych == 'o') goto yy341;
+		goto yy85;
+yy225:
+		YYDEBUG(225, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'T') goto yy342;
+		if (yych == 't') goto yy342;
+		goto yy85;
+yy226:
+		YYDEBUG(226, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'J') goto yy343;
+		if (yych == 'j') goto yy343;
+		goto yy85;
+yy227:
+		YYDEBUG(227, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'A') goto yy344;
+		if (yych == 'a') goto yy344;
+		goto yy85;
+yy228:
+		YYDEBUG(228, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'R') goto yy345;
+		if (yych == 'r') goto yy345;
+		goto yy85;
+yy229:
+		YYDEBUG(229, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'S') goto yy346;
+		if (yych == 's') goto yy346;
+		goto yy85;
+yy230:
+		YYDEBUG(230, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(231, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_POW_EQUAL);
 }
-yy193:
-	YYDEBUG(193, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy232:
+		YYDEBUG(232, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(233, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_ELLIPSIS);
 }
-yy194:
-	YYDEBUG(194, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy71;
-	if (yych <= '9') goto yy95;
-	goto yy71;
-yy195:
-	YYDEBUG(195, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy71;
-		if (yych <= '\n') goto yy295;
-		goto yy71;
-	} else {
-		if (yych <= '\r') goto yy295;
-		if (yych == ' ') goto yy295;
-		goto yy71;
-	}
-yy196:
-	YYDEBUG(196, *YYCURSOR);
-	yyaccept = 14;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING0+yych & 32) {
-		goto yy196;
-	}
-	if (yych == '_') goto yy104;
-yy197:
-	YYDEBUG(197, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy234:
+		YYDEBUG(234, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '/') goto yy85;
+		if (yych <= '9') goto yy119;
+		goto yy85;
+yy235:
+		YYDEBUG(235, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy85;
+			if (yych <= '\n') goto yy347;
+			goto yy85;
+		} else {
+			if (yych <= '\r') goto yy347;
+			if (yych == ' ') goto yy347;
+			goto yy85;
+		}
+yy236:
+		YYDEBUG(236, *YYCURSOR);
+		yyaccept = 14;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(237, *YYCURSOR);
+		if (yybm0+yych & 32) {
+			goto yy236;
+		}
+		if (yych == '_') goto yy130;
+yy238:
+		YYDEBUG(238, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* The +/- 2 skips "0b" */
 	size_t len = yyleng - 2;
 	char *end, *bin = yytext + 2;
@@ -4304,37 +4107,39 @@
 		RETURN_TOKEN_WITH_VAL(T_DNUMBER);
 	}
 }
-yy198:
-	YYDEBUG(198, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy71;
-	if (yych >= ':') goto yy71;
-yy199:
-	YYDEBUG(199, *YYCURSOR);
-	yyaccept = 5;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy97;
-	if (yych <= '9') goto yy199;
-	if (yych == '_') goto yy198;
-	goto yy97;
-yy200:
-	YYDEBUG(200, *YYCURSOR);
-	yyaccept = 15;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING0+yych & 64) {
-		goto yy200;
-	}
-	if (yych == '_') goto yy106;
-yy201:
-	YYDEBUG(201, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy239:
+		YYDEBUG(239, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '/') goto yy85;
+		if (yych >= ':') goto yy85;
+yy240:
+		YYDEBUG(240, *YYCURSOR);
+		yyaccept = 5;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(241, *YYCURSOR);
+		if (yych <= '/') goto yy121;
+		if (yych <= '9') goto yy240;
+		if (yych == '_') goto yy239;
+		goto yy121;
+yy242:
+		YYDEBUG(242, *YYCURSOR);
+		yyaccept = 15;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(243, *YYCURSOR);
+		if (yybm0+yych & 64) {
+			goto yy242;
+		}
+		if (yych == '_') goto yy132;
+yy244:
+		YYDEBUG(244, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* The +/- 2 skips "0o" */
 	size_t len = yyleng - 2;
 	char *end, *octal = yytext + 2;
@@ -4383,20 +4188,21 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_DNUMBER);
 }
-yy202:
-	YYDEBUG(202, *YYCURSOR);
-	yyaccept = 16;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING0+yych & 128) {
-		goto yy202;
-	}
-	if (yych == '_') goto yy107;
-yy203:
-	YYDEBUG(203, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy245:
+		YYDEBUG(245, *YYCURSOR);
+		yyaccept = 16;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(246, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy245;
+		}
+		if (yych == '_') goto yy133;
+yy247:
+		YYDEBUG(247, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* The +/- 2 skips "0x" */
 	size_t len = yyleng - 2;
 	char *end, *hex = yytext + 2;
@@ -4437,1425 +4243,1438 @@
 		RETURN_TOKEN_WITH_VAL(T_DNUMBER);
 	}
 }
-yy204:
-	YYDEBUG(204, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= '\'') {
-		if (yych <= ' ') {
-			if (yych == '\t') goto yy204;
-			if (yych <= 0x1F) goto yy71;
-			goto yy204;
-		} else {
-			if (yych == '"') goto yy296;
-			if (yych <= '&') goto yy71;
-			goto yy297;
-		}
-	} else {
-		if (yych <= '_') {
-			if (yych <= '@') goto yy71;
-			if (yych <= 'Z') goto yy298;
-			if (yych <= '^') goto yy71;
-			goto yy298;
-		} else {
-			if (yych <= '`') goto yy71;
-			if (yych <= 'z') goto yy298;
-			if (yych <= 0x7F) goto yy71;
-			goto yy298;
+yy248:
+		YYDEBUG(248, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(249, *YYCURSOR);
+		if (yych <= '\'') {
+			if (yych <= ' ') {
+				if (yych == '\t') goto yy248;
+				if (yych <= 0x1F) goto yy85;
+				goto yy248;
+			} else {
+				if (yych == '"') goto yy349;
+				if (yych <= '&') goto yy85;
+				goto yy350;
+			}
+		} else {
+			if (yych <= '_') {
+				if (yych <= '@') goto yy85;
+				if (yych <= 'Z') goto yy351;
+				if (yych <= '^') goto yy85;
+				goto yy351;
+			} else {
+				if (yych <= '`') goto yy85;
+				if (yych <= 'z') goto yy351;
+				if (yych <= 0x7F) goto yy85;
+				goto yy351;
+			}
 		}
-	}
-yy205:
-	YYDEBUG(205, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy250:
+		YYDEBUG(250, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(251, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_SL_EQUAL);
 }
-yy206:
-	YYDEBUG(206, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy252:
+		YYDEBUG(252, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(253, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_SPACESHIP);
 }
-yy207:
-	YYDEBUG(207, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy254:
+		YYDEBUG(254, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(255, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_IS_IDENTICAL);
 }
-yy208:
-	YYDEBUG(208, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy256:
+		YYDEBUG(256, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(257, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_SR_EQUAL);
 }
-yy209:
-	YYDEBUG(209, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy258:
+		YYDEBUG(258, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(259, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN(T_NULLSAFE_OBJECT_OPERATOR);
 }
-yy210:
-	YYDEBUG(210, *YYCURSOR);
-	++YYCURSOR;
-	goto yy120;
-yy211:
-	YYDEBUG(211, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy210;
-	goto yy120;
-yy212:
-	YYDEBUG(212, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_COALESCE_EQUAL);
-}
-yy213:
-	YYDEBUG(213, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy299;
-	if (yych == 't') goto yy299;
-	goto yy40;
-yy214:
-	YYDEBUG(214, *YYCURSOR);
-	yyaccept = 17;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy215:
-	YYDEBUG(215, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_LOGICAL_AND);
-}
-yy216:
-	YYDEBUG(216, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy300;
-	if (yych == 'a') goto yy300;
-	goto yy40;
-yy217:
-	YYDEBUG(217, *YYCURSOR);
-	yyaccept = 18;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= '@') {
-			if (yych <= '/') goto yy218;
-			if (yych <= '9') goto yy217;
-		} else {
-			if (yych <= 'Z') goto yy217;
-			if (yych >= '\\') goto yy127;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych == '_') goto yy217;
-		} else {
-			if (yych <= 'z') goto yy217;
-			if (yych >= 0x80) goto yy217;
-		}
-	}
-yy218:
-	YYDEBUG(218, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_STR(T_NAME_QUALIFIED, 0);
-}
-yy219:
-	YYDEBUG(219, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '<') goto yy204;
-	goto yy71;
-yy220:
-	YYDEBUG(220, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy301;
-	if (yych == 'a') goto yy301;
-	goto yy40;
-yy221:
-	YYDEBUG(221, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy302;
-	if (yych == 'l') goto yy302;
-	goto yy40;
-yy222:
-	YYDEBUG(222, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy303;
-	if (yych == 'e') goto yy303;
-	goto yy40;
-yy223:
-	YYDEBUG(223, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy305;
-	if (yych == 'c') goto yy305;
-	goto yy40;
-yy224:
-	YYDEBUG(224, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy306;
-	if (yych == 's') goto yy306;
-	goto yy40;
-yy225:
-	YYDEBUG(225, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy307;
-	if (yych == 'n') goto yy307;
-	goto yy40;
-yy226:
-	YYDEBUG(226, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'T') {
-		if (yych <= 'R') goto yy40;
-		if (yych <= 'S') goto yy308;
-		goto yy309;
-	} else {
-		if (yych <= 'r') goto yy40;
-		if (yych <= 's') goto yy308;
-		if (yych <= 't') goto yy309;
-		goto yy40;
-	}
-yy227:
-	YYDEBUG(227, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy310;
-	if (yych == 'l') goto yy310;
-	goto yy40;
-yy228:
-	YYDEBUG(228, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy311;
-	if (yych == 'a') goto yy311;
-	goto yy40;
-yy229:
-	YYDEBUG(229, *YYCURSOR);
-	yyaccept = 19;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy230:
-	YYDEBUG(230, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_EXIT);
-}
-yy231:
-	YYDEBUG(231, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy312;
-	if (yych == 'o') goto yy312;
-	goto yy40;
-yy232:
-	YYDEBUG(232, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy314;
-	if (yych == 'e') goto yy314;
-	goto yy40;
-yy233:
-	YYDEBUG(233, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy316;
-	if (yych == 't') goto yy316;
-	goto yy40;
-yy234:
-	YYDEBUG(234, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch (yych) {
-		case 'D':
-		case 'd': goto yy317;
-		case 'F':
-		case 'f': goto yy318;
-		case 'I':
-		case 'i': goto yy319;
-		case 'S':
-		case 's': goto yy320;
-		case 'W':
-		case 'w': goto yy321;
-		default: goto yy40;
-	}
-yy235:
-	YYDEBUG(235, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'M') goto yy322;
-	if (yych == 'm') goto yy322;
-	goto yy40;
-yy236:
-	YYDEBUG(236, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy323;
-	if (yych == 'l') goto yy323;
-	goto yy40;
-yy237:
-	YYDEBUG(237, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy325;
-	if (yych == 't') goto yy325;
-	goto yy40;
-yy238:
-	YYDEBUG(238, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy327;
-	if (yych == 'e') goto yy327;
-	goto yy40;
-yy239:
-	YYDEBUG(239, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy328;
-	if (yych == 'a') goto yy328;
-	goto yy40;
-yy240:
-	YYDEBUG(240, *YYCURSOR);
-	yyaccept = 20;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\\') {
-		if (yych <= 'D') {
-			if (yych <= '/') goto yy241;
-			if (yych <= '9') goto yy39;
-			if (yych >= 'A') goto yy39;
-		} else {
-			if (yych <= 'E') goto yy329;
-			if (yych <= 'Z') goto yy39;
-			if (yych >= '\\') goto yy127;
-		}
-	} else {
-		if (yych <= 'd') {
-			if (yych == '_') goto yy39;
-			if (yych >= 'a') goto yy39;
-		} else {
-			if (yych <= 'e') goto yy329;
-			if (yych <= 'z') goto yy39;
-			if (yych >= 0x80) goto yy39;
-		}
-	}
-yy241:
-	YYDEBUG(241, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_FOR);
-}
-yy242:
-	YYDEBUG(242, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy330;
-	if (yych == 'c') goto yy330;
-	goto yy40;
-yy243:
-	YYDEBUG(243, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'B') goto yy331;
-	if (yych == 'b') goto yy331;
-	goto yy40;
-yy244:
-	YYDEBUG(244, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy332;
-	if (yych == 'o') goto yy332;
-	goto yy40;
-yy245:
-	YYDEBUG(245, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy334;
-	if (yych == 'l') goto yy334;
-	goto yy40;
-yy246:
-	YYDEBUG(246, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy335;
-	if (yych == 'l') goto yy335;
-	goto yy40;
-yy247:
-	YYDEBUG(247, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy336;
-	if (yych == 't') goto yy336;
-	goto yy40;
-yy248:
-	YYDEBUG(248, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy337;
-	if (yych == 'e') goto yy337;
-	goto yy40;
-yy249:
-	YYDEBUG(249, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy338;
-	if (yych == 'e') goto yy338;
-	goto yy40;
-yy250:
-	YYDEBUG(250, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy339;
-	if (yych == 't') goto yy339;
-	goto yy40;
-yy251:
-	YYDEBUG(251, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy341;
-	if (yych == 'c') goto yy341;
-	goto yy40;
-yy252:
-	YYDEBUG(252, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy342;
-	if (yych == 'e') goto yy342;
-	goto yy40;
-yy253:
-	YYDEBUG(253, *YYCURSOR);
-	yyaccept = 21;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy254:
-	YYDEBUG(254, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_NEW);
-}
-yy255:
-	YYDEBUG(255, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'V') {
-		if (yych == 'N') goto yy343;
-		if (yych <= 'U') goto yy40;
-		goto yy344;
-	} else {
-		if (yych <= 'n') {
-			if (yych <= 'm') goto yy40;
-			goto yy343;
-		} else {
-			if (yych == 'v') goto yy344;
-			goto yy40;
-		}
-	}
-yy256:
-	YYDEBUG(256, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy345;
-	if (yych == 't') goto yy345;
-	goto yy40;
-yy257:
-	YYDEBUG(257, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy346;
-	if (yych == 'l') goto yy346;
-	goto yy40;
-yy258:
-	YYDEBUG(258, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy347;
-	if (yych == 'd') goto yy347;
-	goto yy40;
-yy259:
-	YYDEBUG(259, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy348;
-	if (yych == 'u') goto yy348;
-	goto yy40;
 yy260:
-	YYDEBUG(260, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy349;
-	if (yych == 'u') goto yy349;
-	goto yy40;
+		YYDEBUG(260, *YYCURSOR);
+		++YYCURSOR;
+		goto yy152;
 yy261:
-	YYDEBUG(261, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy350;
-	if (yych == 't') goto yy350;
-	goto yy40;
+		YYDEBUG(261, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy260;
+		goto yy152;
 yy262:
-	YYDEBUG(262, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy351;
-	if (yych == 't') goto yy351;
-	goto yy40;
-yy263:
-	YYDEBUG(263, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy352;
-	if (yych == 'o') goto yy352;
-	goto yy40;
+		YYDEBUG(262, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(263, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_COALESCE_EQUAL);
+}
 yy264:
-	YYDEBUG(264, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy353;
-	if (yych == 'i') goto yy353;
-	goto yy40;
+		YYDEBUG(264, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy353;
+		if (yych == 't') goto yy353;
+		goto yy47;
 yy265:
-	YYDEBUG(265, *YYCURSOR);
-	yyaccept = 22;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(265, *YYCURSOR);
+		yyaccept = 17;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy266:
-	YYDEBUG(266, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_TRY);
+		YYDEBUG(266, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_LOGICAL_AND);
 }
 yy267:
-	YYDEBUG(267, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy354;
-	if (yych == 'e') goto yy354;
-	goto yy40;
+		YYDEBUG(267, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy354;
+		if (yych == 'a') goto yy354;
+		goto yy47;
 yy268:
-	YYDEBUG(268, *YYCURSOR);
-	yyaccept = 23;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy269:
-	YYDEBUG(269, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_USE);
-}
+		YYDEBUG(268, *YYCURSOR);
+		yyaccept = 18;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(269, *YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= '@') {
+				if (yych <= '/') goto yy270;
+				if (yych <= '9') goto yy268;
+			} else {
+				if (yych <= 'Z') goto yy268;
+				if (yych >= '\\') goto yy160;
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych == '_') goto yy268;
+			} else {
+				if (yych <= 'z') goto yy268;
+				if (yych >= 0x80) goto yy268;
+			}
+		}
 yy270:
-	YYDEBUG(270, *YYCURSOR);
-	yyaccept = 24;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy271:
-	YYDEBUG(271, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_VAR);
+		YYDEBUG(270, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_STR(T_NAME_QUALIFIED, 0);
 }
+yy271:
+		YYDEBUG(271, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '<') goto yy248;
+		goto yy85;
 yy272:
-	YYDEBUG(272, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy355;
-	if (yych == 'l') goto yy355;
-	goto yy40;
+		YYDEBUG(272, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy355;
+		if (yych == 'a') goto yy355;
+		goto yy47;
 yy273:
-	YYDEBUG(273, *YYCURSOR);
-	yyaccept = 25;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(273, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy356;
+		if (yych == 'l') goto yy356;
+		goto yy47;
 yy274:
-	YYDEBUG(274, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_LOGICAL_XOR);
-}
+		YYDEBUG(274, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy357;
+		if (yych == 'e') goto yy357;
+		goto yy47;
 yy275:
-	YYDEBUG(275, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy356;
-	if (yych == 'l') goto yy356;
-	goto yy40;
+		YYDEBUG(275, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy359;
+		if (yych == 'c') goto yy359;
+		goto yy47;
 yy276:
-	YYDEBUG(276, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy71;
-		if (yych <= 'Z') goto yy174;
-		if (yych <= '^') goto yy71;
-		goto yy174;
-	} else {
-		if (yych <= '`') goto yy71;
-		if (yych <= 'z') goto yy174;
-		if (yych <= 0x7F) goto yy71;
-		goto yy174;
-	}
+		YYDEBUG(276, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy360;
+		if (yych == 's') goto yy360;
+		goto yy47;
 yy277:
-	YYDEBUG(277, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy357;
-	if (yych == 'l') goto yy357;
-	goto yy40;
+		YYDEBUG(277, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy361;
+		if (yych == 'n') goto yy361;
+		goto yy47;
 yy278:
-	YYDEBUG(278, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy358;
-	if (yych == 'i') goto yy358;
-	goto yy40;
-yy279:
-	YYDEBUG(279, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'U') {
-		if (yych == 'I') goto yy359;
-		if (yych <= 'T') goto yy40;
-		goto yy360;
-	} else {
-		if (yych <= 'i') {
-			if (yych <= 'h') goto yy40;
-			goto yy359;
-		} else {
-			if (yych == 'u') goto yy360;
-			goto yy40;
+		YYDEBUG(278, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'T') {
+			if (yych <= 'R') goto yy47;
+			if (yych <= 'S') goto yy362;
+			goto yy363;
+		} else {
+			if (yych <= 'r') goto yy47;
+			if (yych <= 's') goto yy362;
+			if (yych <= 't') goto yy363;
+			goto yy47;
 		}
-	}
+yy279:
+		YYDEBUG(279, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy364;
+		if (yych == 'l') goto yy364;
+		goto yy47;
 yy280:
-	YYDEBUG(280, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy361;
-	if (yych == 'a') goto yy361;
-	goto yy40;
+		YYDEBUG(280, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy365;
+		if (yych == 'a') goto yy365;
+		goto yy47;
 yy281:
-	YYDEBUG(281, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy362;
-	if (yych == 'i') goto yy362;
-	goto yy40;
+		YYDEBUG(281, *YYCURSOR);
+		yyaccept = 19;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy282:
-	YYDEBUG(282, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy363;
-	if (yych == 'e') goto yy363;
-	goto yy40;
+		YYDEBUG(282, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_EXIT);
+}
 yy283:
-	YYDEBUG(283, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy364;
-	if (yych == 'a') goto yy364;
-	goto yy40;
+		YYDEBUG(283, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy366;
+		if (yych == 'o') goto yy366;
+		goto yy47;
 yy284:
-	YYDEBUG(284, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy365;
-	if (yych == 'r') goto yy365;
-	goto yy40;
+		YYDEBUG(284, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy368;
+		if (yych == 'e') goto yy368;
+		goto yy47;
 yy285:
-	YYDEBUG(285, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy366;
-	if (yych == 'a') goto yy366;
-	goto yy71;
+		YYDEBUG(285, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy370;
+		if (yych == 't') goto yy370;
+		goto yy47;
 yy286:
-	YYDEBUG(286, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy367;
-	if (yych == 'a') goto yy367;
-	goto yy71;
+		YYDEBUG(286, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		switch (yych) {
+		case 'D':
+		case 'd':	goto yy371;
+		case 'F':
+		case 'f':	goto yy372;
+		case 'I':
+		case 'i':	goto yy373;
+		case 'S':
+		case 's':	goto yy374;
+		case 'W':
+		case 'w':	goto yy375;
+		default:	goto yy47;
+		}
 yy287:
-	YYDEBUG(287, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy368;
-	if (yych == 'l') goto yy368;
-	goto yy71;
+		YYDEBUG(287, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'M') goto yy376;
+		if (yych == 'm') goto yy376;
+		goto yy47;
 yy288:
-	YYDEBUG(288, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy369;
-	if (yych == 'b') goto yy369;
-	goto yy71;
+		YYDEBUG(288, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy377;
+		if (yych == 'l') goto yy377;
+		goto yy47;
 yy289:
-	YYDEBUG(289, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy370;
-	if (yych == 'a') goto yy370;
-	goto yy71;
+		YYDEBUG(289, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy379;
+		if (yych == 't') goto yy379;
+		goto yy47;
 yy290:
-	YYDEBUG(290, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy373;
-	if (yych == 'e') goto yy373;
-	goto yy372;
+		YYDEBUG(290, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy381;
+		if (yych == 'e') goto yy381;
+		goto yy47;
 yy291:
-	YYDEBUG(291, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy374;
-	if (yych == 'e') goto yy374;
-	goto yy71;
+		YYDEBUG(291, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy382;
+		if (yych == 'a') goto yy382;
+		goto yy47;
 yy292:
-	YYDEBUG(292, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy375;
-	if (yych == 'l') goto yy375;
-	goto yy71;
+		YYDEBUG(292, *YYCURSOR);
+		yyaccept = 20;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= 'D') {
+				if (yych <= '/') goto yy293;
+				if (yych <= '9') goto yy46;
+				if (yych >= 'A') goto yy46;
+			} else {
+				if (yych <= 'E') goto yy383;
+				if (yych <= 'Z') goto yy46;
+				if (yych >= '\\') goto yy160;
+			}
+		} else {
+			if (yych <= 'd') {
+				if (yych == '_') goto yy46;
+				if (yych >= 'a') goto yy46;
+			} else {
+				if (yych <= 'e') goto yy383;
+				if (yych <= 'z') goto yy46;
+				if (yych >= 0x80) goto yy46;
+			}
+		}
 yy293:
-	YYDEBUG(293, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy376;
-	if (yych == 'i') goto yy376;
-	goto yy71;
+		YYDEBUG(293, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_FOR);
+}
 yy294:
-	YYDEBUG(294, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy377;
-	if (yych == 'e') goto yy377;
-	goto yy71;
+		YYDEBUG(294, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy384;
+		if (yych == 'c') goto yy384;
+		goto yy47;
 yy295:
-	YYDEBUG(295, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy100;
-		if (yych <= '\n') goto yy295;
-		goto yy100;
-	} else {
-		if (yych <= '\r') goto yy295;
-		if (yych == ' ') goto yy295;
-		goto yy100;
-	}
+		YYDEBUG(295, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'B') goto yy385;
+		if (yych == 'b') goto yy385;
+		goto yy47;
 yy296:
-	YYDEBUG(296, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '"') goto yy71;
-	if (yych <= '/') goto yy379;
-	if (yych <= '9') goto yy71;
-	goto yy379;
+		YYDEBUG(296, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy386;
+		if (yych == 'o') goto yy386;
+		goto yy47;
 yy297:
-	YYDEBUG(297, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '\'') goto yy71;
-	if (yych <= '/') goto yy381;
-	if (yych <= '9') goto yy71;
-	goto yy381;
+		YYDEBUG(297, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy388;
+		if (yych == 'l') goto yy388;
+		goto yy47;
 yy298:
-	YYDEBUG(298, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= '@') {
-		if (yych <= '\f') {
-			if (yych == '\n') goto yy382;
-			goto yy71;
-		} else {
-			if (yych <= '\r') goto yy384;
-			if (yych <= '/') goto yy71;
-			if (yych <= '9') goto yy298;
-			goto yy71;
-		}
-	} else {
-		if (yych <= '_') {
-			if (yych <= 'Z') goto yy298;
-			if (yych <= '^') goto yy71;
-			goto yy298;
-		} else {
-			if (yych <= '`') goto yy71;
-			if (yych <= 'z') goto yy298;
-			if (yych <= 0x7F) goto yy71;
-			goto yy298;
-		}
-	}
+		YYDEBUG(298, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy389;
+		if (yych == 'l') goto yy389;
+		goto yy47;
 yy299:
-	YYDEBUG(299, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy385;
-	if (yych == 'r') goto yy385;
-	goto yy40;
+		YYDEBUG(299, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy390;
+		if (yych == 't') goto yy390;
+		goto yy47;
 yy300:
-	YYDEBUG(300, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'Y') goto yy386;
-	if (yych == 'y') goto yy386;
-	goto yy40;
+		YYDEBUG(300, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy391;
+		if (yych == 'e') goto yy391;
+		goto yy47;
 yy301:
-	YYDEBUG(301, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'K') goto yy388;
-	if (yych == 'k') goto yy388;
-	goto yy40;
+		YYDEBUG(301, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy392;
+		if (yych == 'e') goto yy392;
+		goto yy47;
 yy302:
-	YYDEBUG(302, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy390;
-	if (yych == 'a') goto yy390;
-	goto yy40;
+		YYDEBUG(302, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy393;
+		if (yych == 't') goto yy393;
+		goto yy47;
 yy303:
-	YYDEBUG(303, *YYCURSOR);
-	yyaccept = 26;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(303, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy395;
+		if (yych == 'c') goto yy395;
+		goto yy47;
 yy304:
-	YYDEBUG(304, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CASE);
-}
+		YYDEBUG(304, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy396;
+		if (yych == 'e') goto yy396;
+		goto yy47;
 yy305:
-	YYDEBUG(305, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy391;
-	if (yych == 'h') goto yy391;
-	goto yy40;
+		YYDEBUG(305, *YYCURSOR);
+		yyaccept = 21;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy306:
-	YYDEBUG(306, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy393;
-	if (yych == 's') goto yy393;
-	goto yy40;
+		YYDEBUG(306, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_NEW);
+}
 yy307:
-	YYDEBUG(307, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy395;
-	if (yych == 'e') goto yy395;
-	goto yy40;
+		YYDEBUG(307, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'V') {
+			if (yych == 'N') goto yy397;
+			if (yych <= 'U') goto yy47;
+			goto yy398;
+		} else {
+			if (yych <= 'n') {
+				if (yych <= 'm') goto yy47;
+				goto yy397;
+			} else {
+				if (yych == 'v') goto yy398;
+				goto yy47;
+			}
+		}
 yy308:
-	YYDEBUG(308, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy397;
-	if (yych == 't') goto yy397;
-	goto yy40;
+		YYDEBUG(308, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy399;
+		if (yych == 't') goto yy399;
+		goto yy47;
 yy309:
-	YYDEBUG(309, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy399;
-	if (yych == 'i') goto yy399;
-	goto yy40;
+		YYDEBUG(309, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy400;
+		if (yych == 'l') goto yy400;
+		goto yy47;
 yy310:
-	YYDEBUG(310, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy400;
-	if (yych == 'a') goto yy400;
-	goto yy40;
+		YYDEBUG(310, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy401;
+		if (yych == 'd') goto yy401;
+		goto yy47;
 yy311:
-	YYDEBUG(311, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy401;
-	if (yych == 'u') goto yy401;
-	goto yy40;
+		YYDEBUG(311, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy402;
+		if (yych == 'u') goto yy402;
+		goto yy47;
 yy312:
-	YYDEBUG(312, *YYCURSOR);
-	yyaccept = 27;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(312, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy403;
+		if (yych == 'u') goto yy403;
+		goto yy47;
 yy313:
-	YYDEBUG(313, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ECHO);
-}
+		YYDEBUG(313, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy404;
+		if (yych == 't') goto yy404;
+		goto yy47;
 yy314:
-	YYDEBUG(314, *YYCURSOR);
-	yyaccept = 28;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\\') {
-		if (yych <= 'H') {
-			if (yych <= '/') goto yy315;
-			if (yych <= '9') goto yy39;
-			if (yych >= 'A') goto yy39;
-		} else {
-			if (yych <= 'I') goto yy402;
-			if (yych <= 'Z') goto yy39;
-			if (yych >= '\\') goto yy127;
-		}
-	} else {
-		if (yych <= 'h') {
-			if (yych == '_') goto yy39;
-			if (yych >= 'a') goto yy39;
-		} else {
-			if (yych <= 'i') goto yy402;
-			if (yych <= 'z') goto yy39;
-			if (yych >= 0x80) goto yy39;
-		}
-	}
+		YYDEBUG(314, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy405;
+		if (yych == 't') goto yy405;
+		goto yy47;
 yy315:
-	YYDEBUG(315, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ELSE);
-}
+		YYDEBUG(315, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy406;
+		if (yych == 'o') goto yy406;
+		goto yy47;
 yy316:
-	YYDEBUG(316, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'Y') goto yy403;
-	if (yych == 'y') goto yy403;
-	goto yy40;
+		YYDEBUG(316, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy407;
+		if (yych == 'i') goto yy407;
+		goto yy47;
 yy317:
-	YYDEBUG(317, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy405;
-	if (yych == 'e') goto yy405;
-	goto yy40;
+		YYDEBUG(317, *YYCURSOR);
+		yyaccept = 22;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy318:
-	YYDEBUG(318, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy406;
-	if (yych == 'o') goto yy406;
-	goto yy40;
+		YYDEBUG(318, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_TRY);
+}
 yy319:
-	YYDEBUG(319, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'F') goto yy407;
-	if (yych == 'f') goto yy407;
-	goto yy40;
+		YYDEBUG(319, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy408;
+		if (yych == 'e') goto yy408;
+		goto yy47;
 yy320:
-	YYDEBUG(320, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'W') goto yy409;
-	if (yych == 'w') goto yy409;
-	goto yy40;
+		YYDEBUG(320, *YYCURSOR);
+		yyaccept = 23;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy321:
-	YYDEBUG(321, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy410;
-	if (yych == 'h') goto yy410;
-	goto yy40;
+		YYDEBUG(321, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_USE);
+}
 yy322:
-	YYDEBUG(322, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy40;
-		if (yych <= '\n') goto yy411;
-		goto yy40;
-	} else {
-		if (yych <= '\r') goto yy411;
-		if (yych == ' ') goto yy411;
-		goto yy40;
-	}
+		YYDEBUG(322, *YYCURSOR);
+		yyaccept = 24;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy323:
-	YYDEBUG(323, *YYCURSOR);
-	yyaccept = 29;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy324:
-	YYDEBUG(324, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_EVAL);
+		YYDEBUG(323, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_VAR);
 }
+yy324:
+		YYDEBUG(324, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy409;
+		if (yych == 'l') goto yy409;
+		goto yy47;
 yy325:
-	YYDEBUG(325, *YYCURSOR);
-	yyaccept = 30;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(325, *YYCURSOR);
+		yyaccept = 25;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy326:
-	YYDEBUG(326, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_EXIT);
+		YYDEBUG(326, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_LOGICAL_XOR);
 }
 yy327:
-	YYDEBUG(327, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy412;
-	if (yych == 'n') goto yy412;
-	goto yy40;
+		YYDEBUG(327, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy410;
+		if (yych == 'l') goto yy410;
+		goto yy47;
 yy328:
-	YYDEBUG(328, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy413;
-	if (yych == 'l') goto yy413;
-	goto yy40;
+		YYDEBUG(328, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy85;
+			if (yych <= 'Z') goto yy207;
+			if (yych <= '^') goto yy85;
+			goto yy207;
+		} else {
+			if (yych <= '`') goto yy85;
+			if (yych <= 'z') goto yy207;
+			if (yych <= 0x7F) goto yy85;
+			goto yy207;
+		}
 yy329:
-	YYDEBUG(329, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy415;
-	if (yych == 'a') goto yy415;
-	goto yy40;
+		YYDEBUG(329, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy411;
+		if (yych == 'l') goto yy411;
+		goto yy47;
 yy330:
-	YYDEBUG(330, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy416;
-	if (yych == 't') goto yy416;
-	goto yy40;
+		YYDEBUG(330, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy412;
+		if (yych == 'i') goto yy412;
+		goto yy47;
 yy331:
-	YYDEBUG(331, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy417;
-	if (yych == 'a') goto yy417;
-	goto yy40;
+		YYDEBUG(331, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'U') {
+			if (yych == 'I') goto yy413;
+			if (yych <= 'T') goto yy47;
+			goto yy414;
+		} else {
+			if (yych <= 'i') {
+				if (yych <= 'h') goto yy47;
+				goto yy413;
+			} else {
+				if (yych == 'u') goto yy414;
+				goto yy47;
+			}
+		}
 yy332:
-	YYDEBUG(332, *YYCURSOR);
-	yyaccept = 31;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(332, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy415;
+		if (yych == 'a') goto yy415;
+		goto yy47;
 yy333:
-	YYDEBUG(333, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_GOTO);
-}
+		YYDEBUG(333, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy416;
+		if (yych == 'i') goto yy416;
+		goto yy47;
 yy334:
-	YYDEBUG(334, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy418;
-	if (yych == 'e') goto yy418;
-	goto yy40;
+		YYDEBUG(334, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy417;
+		if (yych == 'e') goto yy417;
+		goto yy47;
 yy335:
-	YYDEBUG(335, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy419;
-	if (yych == 'u') goto yy419;
-	goto yy40;
+		YYDEBUG(335, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy418;
+		if (yych == 'a') goto yy418;
+		goto yy47;
 yy336:
-	YYDEBUG(336, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'E') {
-		if (yych == 'A') goto yy420;
-		if (yych <= 'D') goto yy40;
-		goto yy421;
-	} else {
-		if (yych <= 'a') {
-			if (yych <= '`') goto yy40;
-			goto yy420;
-		} else {
-			if (yych == 'e') goto yy421;
-			goto yy40;
-		}
-	}
+		YYDEBUG(336, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy419;
+		if (yych == 'r') goto yy419;
+		goto yy47;
 yy337:
-	YYDEBUG(337, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy422;
-	if (yych == 'r') goto yy422;
-	goto yy40;
+		YYDEBUG(337, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'A') goto yy420;
+		if (yych == 'a') goto yy420;
+		goto yy85;
 yy338:
-	YYDEBUG(338, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy423;
-	if (yych == 't') goto yy423;
-	goto yy40;
+		YYDEBUG(338, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'A') goto yy421;
+		if (yych == 'a') goto yy421;
+		goto yy85;
 yy339:
-	YYDEBUG(339, *YYCURSOR);
-	yyaccept = 32;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(339, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy422;
+		if (yych == 'l') goto yy422;
+		goto yy85;
 yy340:
-	YYDEBUG(340, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_LIST);
-}
+		YYDEBUG(340, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'B') goto yy423;
+		if (yych == 'b') goto yy423;
+		goto yy85;
 yy341:
-	YYDEBUG(341, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy425;
-	if (yych == 'h') goto yy425;
-	goto yy40;
+		YYDEBUG(341, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'A') goto yy424;
+		if (yych == 'a') goto yy424;
+		goto yy85;
 yy342:
-	YYDEBUG(342, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy427;
-	if (yych == 's') goto yy427;
-	goto yy40;
+		YYDEBUG(342, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy429;
+		if (yych == 'e') goto yy429;
+		goto yy426;
 yy343:
-	YYDEBUG(343, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy428;
-	if (yych == 't') goto yy428;
-	goto yy40;
+		YYDEBUG(343, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy430;
+		if (yych == 'e') goto yy430;
+		goto yy85;
 yy344:
-	YYDEBUG(344, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy430;
-	if (yych == 'a') goto yy430;
-	goto yy40;
+		YYDEBUG(344, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy431;
+		if (yych == 'l') goto yy431;
+		goto yy85;
 yy345:
-	YYDEBUG(345, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy431;
-	if (yych == 'e') goto yy431;
-	goto yy40;
+		YYDEBUG(345, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'I') goto yy433;
+		if (yych == 'i') goto yy433;
+		goto yy85;
 yy346:
-	YYDEBUG(346, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy432;
-	if (yych == 'i') goto yy432;
-	goto yy40;
+		YYDEBUG(346, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy434;
+		if (yych == 'e') goto yy434;
+		goto yy85;
 yy347:
-	YYDEBUG(347, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy433;
-	if (yych == 'o') goto yy433;
-	goto yy40;
-yy348:
-	YYDEBUG(348, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy434;
-	if (yych == 'i') goto yy434;
-	goto yy40;
+		YYDEBUG(347, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(348, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy125;
+			if (yych <= '\n') goto yy347;
+			goto yy125;
+		} else {
+			if (yych <= '\r') goto yy347;
+			if (yych == ' ') goto yy347;
+			goto yy125;
+		}
 yy349:
-	YYDEBUG(349, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy435;
-	if (yych == 'r') goto yy435;
-	goto yy40;
+		YYDEBUG(349, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '"') goto yy85;
+		if (yych <= '/') goto yy436;
+		if (yych <= '9') goto yy85;
+		goto yy436;
 yy350:
-	YYDEBUG(350, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy436;
-	if (yych == 'i') goto yy436;
-	goto yy40;
+		YYDEBUG(350, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\'') goto yy85;
+		if (yych <= '/') goto yy438;
+		if (yych <= '9') goto yy85;
+		goto yy438;
 yy351:
-	YYDEBUG(351, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy437;
-	if (yych == 'c') goto yy437;
-	goto yy40;
-yy352:
-	YYDEBUG(352, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'W') goto yy438;
-	if (yych == 'w') goto yy438;
-	goto yy40;
+		YYDEBUG(351, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(352, *YYCURSOR);
+		if (yych <= '@') {
+			if (yych <= '\f') {
+				if (yych == '\n') goto yy439;
+				goto yy85;
+			} else {
+				if (yych <= '\r') goto yy441;
+				if (yych <= '/') goto yy85;
+				if (yych <= '9') goto yy351;
+				goto yy85;
+			}
+		} else {
+			if (yych <= '_') {
+				if (yych <= 'Z') goto yy351;
+				if (yych <= '^') goto yy85;
+				goto yy351;
+			} else {
+				if (yych <= '`') goto yy85;
+				if (yych <= 'z') goto yy351;
+				if (yych <= 0x7F) goto yy85;
+				goto yy351;
+			}
+		}
 yy353:
-	YYDEBUG(353, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy440;
-	if (yych == 't') goto yy440;
-	goto yy40;
+		YYDEBUG(353, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy442;
+		if (yych == 'r') goto yy442;
+		goto yy47;
 yy354:
-	YYDEBUG(354, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy442;
-	if (yych == 't') goto yy442;
-	goto yy40;
+		YYDEBUG(354, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'Y') goto yy443;
+		if (yych == 'y') goto yy443;
+		goto yy47;
 yy355:
-	YYDEBUG(355, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy444;
-	if (yych == 'e') goto yy444;
-	goto yy40;
+		YYDEBUG(355, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'K') goto yy445;
+		if (yych == 'k') goto yy445;
+		goto yy47;
 yy356:
-	YYDEBUG(356, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy446;
-	if (yych == 'd') goto yy446;
-	goto yy40;
+		YYDEBUG(356, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy447;
+		if (yych == 'a') goto yy447;
+		goto yy47;
 yy357:
-	YYDEBUG(357, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy448;
-	if (yych == 'a') goto yy448;
-	goto yy40;
+		YYDEBUG(357, *YYCURSOR);
+		yyaccept = 26;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy358:
-	YYDEBUG(358, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy449;
-	if (yych == 'r') goto yy449;
-	goto yy40;
+		YYDEBUG(358, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CASE);
+}
 yy359:
-	YYDEBUG(359, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy450;
-	if (yych == 'l') goto yy450;
-	goto yy40;
+		YYDEBUG(359, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy448;
+		if (yych == 'h') goto yy448;
+		goto yy47;
 yy360:
-	YYDEBUG(360, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy451;
-	if (yych == 'n') goto yy451;
-	goto yy40;
+		YYDEBUG(360, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy450;
+		if (yych == 's') goto yy450;
+		goto yy47;
 yy361:
-	YYDEBUG(361, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy452;
-	if (yych == 'l') goto yy452;
-	goto yy40;
+		YYDEBUG(361, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy452;
+		if (yych == 'e') goto yy452;
+		goto yy47;
 yy362:
-	YYDEBUG(362, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy453;
-	if (yych == 'n') goto yy453;
-	goto yy40;
+		YYDEBUG(362, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy454;
+		if (yych == 't') goto yy454;
+		goto yy47;
 yy363:
-	YYDEBUG(363, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy454;
-	if (yych == 't') goto yy454;
-	goto yy40;
+		YYDEBUG(363, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy456;
+		if (yych == 'i') goto yy456;
+		goto yy47;
 yy364:
-	YYDEBUG(364, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'M') goto yy455;
-	if (yych == 'm') goto yy455;
-	goto yy40;
+		YYDEBUG(364, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy457;
+		if (yych == 'a') goto yy457;
+		goto yy47;
 yy365:
-	YYDEBUG(365, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy456;
-	if (yych == 'a') goto yy456;
-	goto yy40;
+		YYDEBUG(365, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy458;
+		if (yych == 'u') goto yy458;
+		goto yy47;
 yy366:
-	YYDEBUG(366, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy457;
-	if (yych == 'y') goto yy457;
-	goto yy71;
+		YYDEBUG(366, *YYCURSOR);
+		yyaccept = 27;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy367:
-	YYDEBUG(367, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy458;
-	if (yych == 'r') goto yy458;
-	goto yy71;
+		YYDEBUG(367, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ECHO);
+}
 yy368:
-	YYDEBUG(368, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy461;
-	if (yych == 'e') goto yy461;
-	goto yy460;
+		YYDEBUG(368, *YYCURSOR);
+		yyaccept = 28;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= 'H') {
+				if (yych <= '/') goto yy369;
+				if (yych <= '9') goto yy46;
+				if (yych >= 'A') goto yy46;
+			} else {
+				if (yych <= 'I') goto yy459;
+				if (yych <= 'Z') goto yy46;
+				if (yych >= '\\') goto yy160;
+			}
+		} else {
+			if (yych <= 'h') {
+				if (yych == '_') goto yy46;
+				if (yych >= 'a') goto yy46;
+			} else {
+				if (yych <= 'i') goto yy459;
+				if (yych <= 'z') goto yy46;
+				if (yych >= 0x80) goto yy46;
+			}
+		}
 yy369:
-	YYDEBUG(369, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy462;
-	if (yych == 'l') goto yy462;
-	goto yy71;
+		YYDEBUG(369, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ELSE);
+}
 yy370:
-	YYDEBUG(370, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy463;
-	if (yych == 't') goto yy463;
-	goto yy71;
+		YYDEBUG(370, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'Y') goto yy460;
+		if (yych == 'y') goto yy460;
+		goto yy47;
 yy371:
-	YYDEBUG(371, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
+		YYDEBUG(371, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy462;
+		if (yych == 'e') goto yy462;
+		goto yy47;
 yy372:
-	YYDEBUG(372, *YYCURSOR);
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy371;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy371;
-		if (yych != ')') goto yy71;
-	}
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_INT_CAST);
-}
+		YYDEBUG(372, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy463;
+		if (yych == 'o') goto yy463;
+		goto yy47;
 yy373:
-	YYDEBUG(373, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy464;
-	if (yych == 'g') goto yy464;
-	goto yy71;
+		YYDEBUG(373, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'F') goto yy464;
+		if (yych == 'f') goto yy464;
+		goto yy47;
 yy374:
-	YYDEBUG(374, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy465;
-	if (yych == 'c') goto yy465;
-	goto yy71;
+		YYDEBUG(374, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'W') goto yy466;
+		if (yych == 'w') goto yy466;
+		goto yy47;
 yy375:
-	YYDEBUG(375, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy375;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy375;
-		if (yych == ')') goto yy466;
-		goto yy71;
-	}
+		YYDEBUG(375, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy467;
+		if (yych == 'h') goto yy467;
+		goto yy47;
 yy376:
-	YYDEBUG(376, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy467;
-	if (yych == 'n') goto yy467;
-	goto yy71;
+		YYDEBUG(376, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy47;
+			if (yych <= '\n') goto yy468;
+			goto yy47;
+		} else {
+			if (yych <= '\r') goto yy468;
+			if (yych == ' ') goto yy468;
+			goto yy47;
+		}
 yy377:
-	YYDEBUG(377, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy468;
-	if (yych == 't') goto yy468;
-	goto yy71;
+		YYDEBUG(377, *YYCURSOR);
+		yyaccept = 29;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy378:
-	YYDEBUG(378, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
+		YYDEBUG(378, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_EVAL);
+}
 yy379:
-	YYDEBUG(379, *YYCURSOR);
-	if (yych <= 'Z') {
-		if (yych <= '/') {
-			if (yych == '"') goto yy469;
-			goto yy71;
-		} else {
-			if (yych <= '9') goto yy378;
-			if (yych <= '@') goto yy71;
-			goto yy378;
+		YYDEBUG(379, *YYCURSOR);
+		yyaccept = 30;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych == '_') goto yy378;
-			goto yy71;
-		} else {
-			if (yych <= 'z') goto yy378;
-			if (yych <= 0x7F) goto yy71;
-			goto yy378;
-		}
-	}
+		if (yych == '\\') goto yy160;
 yy380:
-	YYDEBUG(380, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
+		YYDEBUG(380, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_EXIT);
+}
 yy381:
-	YYDEBUG(381, *YYCURSOR);
-	if (yych <= 'Z') {
-		if (yych <= '/') {
-			if (yych == '\'') goto yy469;
-			goto yy71;
+		YYDEBUG(381, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy470;
+		if (yych == 'n') goto yy470;
+		goto yy47;
+yy382:
+		YYDEBUG(382, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy471;
+		if (yych == 'l') goto yy471;
+		goto yy47;
+yy383:
+		YYDEBUG(383, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy473;
+		if (yych == 'a') goto yy473;
+		goto yy47;
+yy384:
+		YYDEBUG(384, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy474;
+		if (yych == 't') goto yy474;
+		goto yy47;
+yy385:
+		YYDEBUG(385, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy475;
+		if (yych == 'a') goto yy475;
+		goto yy47;
+yy386:
+		YYDEBUG(386, *YYCURSOR);
+		yyaccept = 31;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy387:
+		YYDEBUG(387, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_GOTO);
+}
+yy388:
+		YYDEBUG(388, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy476;
+		if (yych == 'e') goto yy476;
+		goto yy47;
+yy389:
+		YYDEBUG(389, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy477;
+		if (yych == 'u') goto yy477;
+		goto yy47;
+yy390:
+		YYDEBUG(390, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'E') {
+			if (yych == 'A') goto yy478;
+			if (yych <= 'D') goto yy47;
+			goto yy479;
+		} else {
+			if (yych <= 'a') {
+				if (yych <= '`') goto yy47;
+				goto yy478;
+			} else {
+				if (yych == 'e') goto yy479;
+				goto yy47;
+			}
+		}
+yy391:
+		YYDEBUG(391, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy480;
+		if (yych == 'r') goto yy480;
+		goto yy47;
+yy392:
+		YYDEBUG(392, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy481;
+		if (yych == 't') goto yy481;
+		goto yy47;
+yy393:
+		YYDEBUG(393, *YYCURSOR);
+		yyaccept = 32;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy394:
+		YYDEBUG(394, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_LIST);
+}
+yy395:
+		YYDEBUG(395, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy483;
+		if (yych == 'h') goto yy483;
+		goto yy47;
+yy396:
+		YYDEBUG(396, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy485;
+		if (yych == 's') goto yy485;
+		goto yy47;
+yy397:
+		YYDEBUG(397, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy486;
+		if (yych == 't') goto yy486;
+		goto yy47;
+yy398:
+		YYDEBUG(398, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy488;
+		if (yych == 'a') goto yy488;
+		goto yy47;
+yy399:
+		YYDEBUG(399, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy489;
+		if (yych == 'e') goto yy489;
+		goto yy47;
+yy400:
+		YYDEBUG(400, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy490;
+		if (yych == 'i') goto yy490;
+		goto yy47;
+yy401:
+		YYDEBUG(401, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy491;
+		if (yych == 'o') goto yy491;
+		goto yy47;
+yy402:
+		YYDEBUG(402, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy492;
+		if (yych == 'i') goto yy492;
+		goto yy47;
+yy403:
+		YYDEBUG(403, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy493;
+		if (yych == 'r') goto yy493;
+		goto yy47;
+yy404:
+		YYDEBUG(404, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy494;
+		if (yych == 'i') goto yy494;
+		goto yy47;
+yy405:
+		YYDEBUG(405, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy495;
+		if (yych == 'c') goto yy495;
+		goto yy47;
+yy406:
+		YYDEBUG(406, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'W') goto yy496;
+		if (yych == 'w') goto yy496;
+		goto yy47;
+yy407:
+		YYDEBUG(407, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy498;
+		if (yych == 't') goto yy498;
+		goto yy47;
+yy408:
+		YYDEBUG(408, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy500;
+		if (yych == 't') goto yy500;
+		goto yy47;
+yy409:
+		YYDEBUG(409, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy502;
+		if (yych == 'e') goto yy502;
+		goto yy47;
+yy410:
+		YYDEBUG(410, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy504;
+		if (yych == 'd') goto yy504;
+		goto yy47;
+yy411:
+		YYDEBUG(411, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy506;
+		if (yych == 'a') goto yy506;
+		goto yy47;
+yy412:
+		YYDEBUG(412, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy507;
+		if (yych == 'r') goto yy507;
+		goto yy47;
+yy413:
+		YYDEBUG(413, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy508;
+		if (yych == 'l') goto yy508;
+		goto yy47;
+yy414:
+		YYDEBUG(414, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy509;
+		if (yych == 'n') goto yy509;
+		goto yy47;
+yy415:
+		YYDEBUG(415, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy510;
+		if (yych == 'l') goto yy510;
+		goto yy47;
+yy416:
+		YYDEBUG(416, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy511;
+		if (yych == 'n') goto yy511;
+		goto yy47;
+yy417:
+		YYDEBUG(417, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy512;
+		if (yych == 't') goto yy512;
+		goto yy47;
+yy418:
+		YYDEBUG(418, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'M') goto yy513;
+		if (yych == 'm') goto yy513;
+		goto yy47;
+yy419:
+		YYDEBUG(419, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy514;
+		if (yych == 'a') goto yy514;
+		goto yy47;
+yy420:
+		YYDEBUG(420, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'Y') goto yy515;
+		if (yych == 'y') goto yy515;
+		goto yy85;
+yy421:
+		YYDEBUG(421, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'R') goto yy517;
+		if (yych == 'r') goto yy517;
+		goto yy85;
+yy422:
+		YYDEBUG(422, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy522;
+		if (yych == 'e') goto yy522;
+		goto yy519;
+yy423:
+		YYDEBUG(423, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy523;
+		if (yych == 'l') goto yy523;
+		goto yy85;
+yy424:
+		YYDEBUG(424, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'T') goto yy524;
+		if (yych == 't') goto yy524;
+		goto yy85;
+yy425:
+		YYDEBUG(425, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy426:
+		YYDEBUG(426, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy425;
+			goto yy85;
 		} else {
-			if (yych <= '9') goto yy380;
-			if (yych <= '@') goto yy71;
-			goto yy380;
+			if (yych <= ' ') goto yy425;
+			if (yych != ')') goto yy85;
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych == '_') goto yy380;
-			goto yy71;
-		} else {
-			if (yych <= 'z') goto yy380;
-			if (yych <= 0x7F) goto yy71;
-			goto yy380;
+		YYDEBUG(427, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(428, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_INT_CAST);
+}
+yy429:
+		YYDEBUG(429, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'G') goto yy526;
+		if (yych == 'g') goto yy526;
+		goto yy85;
+yy430:
+		YYDEBUG(430, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'C') goto yy527;
+		if (yych == 'c') goto yy527;
+		goto yy85;
+yy431:
+		YYDEBUG(431, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(432, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy431;
+			goto yy85;
+		} else {
+			if (yych <= ' ') goto yy431;
+			if (yych == ')') goto yy528;
+			goto yy85;
 		}
-	}
-yy382:
-	YYDEBUG(382, *YYCURSOR);
-	++YYCURSOR;
-yy383:
-	YYDEBUG(383, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy433:
+		YYDEBUG(433, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy530;
+		if (yych == 'n') goto yy530;
+		goto yy85;
+yy434:
+		YYDEBUG(434, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'T') goto yy531;
+		if (yych == 't') goto yy531;
+		goto yy85;
+yy435:
+		YYDEBUG(435, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+yy436:
+		YYDEBUG(436, *YYCURSOR);
+		if (yych <= 'Z') {
+			if (yych <= '/') {
+				if (yych == '"') goto yy533;
+				goto yy85;
+			} else {
+				if (yych <= '9') goto yy435;
+				if (yych <= '@') goto yy85;
+				goto yy435;
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych == '_') goto yy435;
+				goto yy85;
+			} else {
+				if (yych <= 'z') goto yy435;
+				if (yych <= 0x7F) goto yy85;
+				goto yy435;
+			}
+		}
+yy437:
+		YYDEBUG(437, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+yy438:
+		YYDEBUG(438, *YYCURSOR);
+		if (yych <= 'Z') {
+			if (yych <= '/') {
+				if (yych == '\'') goto yy533;
+				goto yy85;
+			} else {
+				if (yych <= '9') goto yy437;
+				if (yych <= '@') goto yy85;
+				goto yy437;
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych == '_') goto yy437;
+				goto yy85;
+			} else {
+				if (yych <= 'z') goto yy437;
+				if (yych <= 0x7F) goto yy85;
+				goto yy437;
+			}
+		}
+yy439:
+		YYDEBUG(439, *YYCURSOR);
+		++YYCURSOR;
+yy440:
+		YYDEBUG(440, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	char *s;
 	unsigned char *saved_cursor;
 	int bprefix = (yytext0 != '<') ? 1 : 0, spacing = 0, indentation = 0;
@@ -5999,2299 +5818,2356 @@
 
 	RETURN_TOKEN(T_START_HEREDOC);
 }
-yy384:
-	YYDEBUG(384, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy382;
-	goto yy383;
-yy385:
-	YYDEBUG(385, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy470;
-	if (yych == 'a') goto yy470;
-	goto yy40;
-yy386:
-	YYDEBUG(386, *YYCURSOR);
-	yyaccept = 33;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy387:
-	YYDEBUG(387, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ARRAY);
-}
-yy388:
-	YYDEBUG(388, *YYCURSOR);
-	yyaccept = 34;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy389:
-	YYDEBUG(389, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_BREAK);
-}
-yy390:
-	YYDEBUG(390, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'B') goto yy471;
-	if (yych == 'b') goto yy471;
-	goto yy40;
-yy391:
-	YYDEBUG(391, *YYCURSOR);
-	yyaccept = 35;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy392:
-	YYDEBUG(392, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CATCH);
-}
-yy393:
-	YYDEBUG(393, *YYCURSOR);
-	yyaccept = 36;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy394:
-	YYDEBUG(394, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CLASS);
-}
-yy395:
-	YYDEBUG(395, *YYCURSOR);
-	yyaccept = 37;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy396:
-	YYDEBUG(396, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CLONE);
-}
-yy397:
-	YYDEBUG(397, *YYCURSOR);
-	yyaccept = 38;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy398:
-	YYDEBUG(398, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CONST);
-}
-yy399:
-	YYDEBUG(399, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy472;
-	if (yych == 'n') goto yy472;
-	goto yy40;
-yy400:
-	YYDEBUG(400, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy473;
-	if (yych == 'r') goto yy473;
-	goto yy40;
-yy401:
-	YYDEBUG(401, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy474;
-	if (yych == 'l') goto yy474;
-	goto yy40;
-yy402:
-	YYDEBUG(402, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'F') goto yy475;
-	if (yych == 'f') goto yy475;
-	goto yy40;
-yy403:
-	YYDEBUG(403, *YYCURSOR);
-	yyaccept = 39;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy404:
-	YYDEBUG(404, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_EMPTY);
-}
-yy405:
-	YYDEBUG(405, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy477;
-	if (yych == 'c') goto yy477;
-	goto yy40;
-yy406:
-	YYDEBUG(406, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy478;
-	if (yych == 'r') goto yy478;
-	goto yy40;
-yy407:
-	YYDEBUG(407, *YYCURSOR);
-	yyaccept = 40;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy408:
-	YYDEBUG(408, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ENDIF);
-}
-yy409:
-	YYDEBUG(409, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy480;
-	if (yych == 'i') goto yy480;
-	goto yy40;
-yy410:
-	YYDEBUG(410, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy481;
-	if (yych == 'i') goto yy481;
-	goto yy40;
-yy411:
-	YYDEBUG(411, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(10);
-	yych = *YYCURSOR;
-	if (yych <= 'I') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x08) goto yy71;
-				goto yy411;
-			} else {
-				if (yych == '\r') goto yy411;
-				goto yy71;
-			}
-		} else {
-			if (yych <= 'D') {
-				if (yych <= ' ') goto yy411;
-				if (yych <= '@') goto yy71;
-				goto yy482;
-			} else {
-				if (yych <= 'E') goto yy484;
-				if (yych <= 'H') goto yy482;
-				goto yy485;
-			}
-		}
-	} else {
-		if (yych <= 'd') {
-			if (yych <= '^') {
-				if (yych <= 'Z') goto yy482;
-				goto yy71;
-			} else {
-				if (yych == '`') goto yy71;
-				goto yy482;
-			}
-		} else {
-			if (yych <= 'i') {
-				if (yych <= 'e') goto yy484;
-				if (yych <= 'h') goto yy482;
-				goto yy485;
-			} else {
-				if (yych <= 'z') goto yy482;
-				if (yych <= 0x7F) goto yy71;
-				goto yy482;
-			}
-		}
-	}
-yy412:
-	YYDEBUG(412, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy486;
-	if (yych == 'd') goto yy486;
-	goto yy40;
-yy413:
-	YYDEBUG(413, *YYCURSOR);
-	yyaccept = 41;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\\') {
-		if (yych <= 'K') {
-			if (yych <= '/') goto yy414;
-			if (yych <= '9') goto yy39;
-			if (yych >= 'A') goto yy39;
-		} else {
-			if (yych <= 'L') goto yy487;
-			if (yych <= 'Z') goto yy39;
-			if (yych >= '\\') goto yy127;
-		}
-	} else {
-		if (yych <= 'k') {
-			if (yych == '_') goto yy39;
-			if (yych >= 'a') goto yy39;
-		} else {
-			if (yych <= 'l') goto yy487;
-			if (yych <= 'z') goto yy39;
-			if (yych >= 0x80) goto yy39;
-		}
-	}
-yy414:
-	YYDEBUG(414, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_FINAL);
-}
-yy415:
-	YYDEBUG(415, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy488;
-	if (yych == 'c') goto yy488;
-	goto yy40;
-yy416:
-	YYDEBUG(416, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy489;
-	if (yych == 'i') goto yy489;
-	goto yy40;
-yy417:
-	YYDEBUG(417, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy490;
-	if (yych == 'l') goto yy490;
-	goto yy40;
-yy418:
-	YYDEBUG(418, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'M') goto yy492;
-	if (yych == 'm') goto yy492;
-	goto yy40;
-yy419:
-	YYDEBUG(419, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy493;
-	if (yych == 'd') goto yy493;
-	goto yy40;
-yy420:
-	YYDEBUG(420, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy494;
-	if (yych == 'n') goto yy494;
-	goto yy40;
-yy421:
-	YYDEBUG(421, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy495;
-	if (yych == 'a') goto yy495;
-	goto yy40;
-yy422:
-	YYDEBUG(422, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'F') goto yy496;
-	if (yych == 'f') goto yy496;
-	goto yy40;
-yy423:
-	YYDEBUG(423, *YYCURSOR);
-	yyaccept = 42;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy424:
-	YYDEBUG(424, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ISSET);
-}
-yy425:
-	YYDEBUG(425, *YYCURSOR);
-	yyaccept = 43;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy426:
-	YYDEBUG(426, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_MATCH);
-}
-yy427:
-	YYDEBUG(427, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'P') goto yy497;
-	if (yych == 'p') goto yy497;
-	goto yy40;
-yy428:
-	YYDEBUG(428, *YYCURSOR);
-	yyaccept = 44;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy429:
-	YYDEBUG(429, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_PRINT);
-}
-yy430:
-	YYDEBUG(430, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy498;
-	if (yych == 't') goto yy498;
-	goto yy40;
-yy431:
-	YYDEBUG(431, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy499;
-	if (yych == 'c') goto yy499;
-	goto yy40;
-yy432:
-	YYDEBUG(432, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy500;
-	if (yych == 'c') goto yy500;
-	goto yy40;
-yy433:
-	YYDEBUG(433, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy502;
-	if (yych == 'n') goto yy502;
-	goto yy40;
-yy434:
-	YYDEBUG(434, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy503;
-	if (yych == 'r') goto yy503;
-	goto yy40;
-yy435:
-	YYDEBUG(435, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy504;
-	if (yych == 'n') goto yy504;
-	goto yy40;
-yy436:
-	YYDEBUG(436, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy506;
-	if (yych == 'c') goto yy506;
-	goto yy40;
-yy437:
-	YYDEBUG(437, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy508;
-	if (yych == 'h') goto yy508;
-	goto yy40;
-yy438:
-	YYDEBUG(438, *YYCURSOR);
-	yyaccept = 45;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy439:
-	YYDEBUG(439, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_THROW);
-}
-yy440:
-	YYDEBUG(440, *YYCURSOR);
-	yyaccept = 46;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
 yy441:
-	YYDEBUG(441, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_TRAIT);
-}
+		YYDEBUG(441, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy439;
+		goto yy440;
 yy442:
-	YYDEBUG(442, *YYCURSOR);
-	yyaccept = 47;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(442, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy534;
+		if (yych == 'a') goto yy534;
+		goto yy47;
 yy443:
-	YYDEBUG(443, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_UNSET);
-}
+		YYDEBUG(443, *YYCURSOR);
+		yyaccept = 33;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy444:
-	YYDEBUG(444, *YYCURSOR);
-	yyaccept = 48;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy445:
-	YYDEBUG(445, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_WHILE);
+		YYDEBUG(444, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ARRAY);
 }
-yy446:
-	YYDEBUG(446, *YYCURSOR);
-	yyaccept = 49;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych <= '\r') {
-		if (yych <= 0x08) goto yy447;
-		if (yych <= '\n') goto yy510;
-		if (yych >= '\r') goto yy510;
-	} else {
-		if (yych <= ' ') {
-			if (yych >= ' ') goto yy510;
-		} else {
-			if (yych == '\\') goto yy127;
+yy445:
+		YYDEBUG(445, *YYCURSOR);
+		yyaccept = 34;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
 		}
-	}
-yy447:
-	YYDEBUG(447, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_YIELD);
+		if (yych == '\\') goto yy160;
+yy446:
+		YYDEBUG(446, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_BREAK);
 }
+yy447:
+		YYDEBUG(447, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'B') goto yy535;
+		if (yych == 'b') goto yy535;
+		goto yy47;
 yy448:
-	YYDEBUG(448, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy511;
-	if (yych == 's') goto yy511;
-	goto yy40;
+		YYDEBUG(448, *YYCURSOR);
+		yyaccept = 35;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy449:
-	YYDEBUG(449, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy512;
-	goto yy40;
+		YYDEBUG(449, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CATCH);
+}
 yy450:
-	YYDEBUG(450, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy513;
-	if (yych == 'e') goto yy513;
-	goto yy40;
+		YYDEBUG(450, *YYCURSOR);
+		yyaccept = 36;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy451:
-	YYDEBUG(451, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy514;
-	if (yych == 'c') goto yy514;
-	goto yy40;
+		YYDEBUG(451, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CLASS);
+}
 yy452:
-	YYDEBUG(452, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy515;
-	if (yych == 't') goto yy515;
-	goto yy40;
+		YYDEBUG(452, *YYCURSOR);
+		yyaccept = 37;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy453:
-	YYDEBUG(453, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy516;
-	if (yych == 'e') goto yy516;
-	goto yy40;
+		YYDEBUG(453, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CLONE);
+}
 yy454:
-	YYDEBUG(454, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy517;
-	if (yych == 'h') goto yy517;
-	goto yy40;
+		YYDEBUG(454, *YYCURSOR);
+		yyaccept = 38;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy455:
-	YYDEBUG(455, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy518;
-	if (yych == 'e') goto yy518;
-	goto yy40;
+		YYDEBUG(455, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CONST);
+}
 yy456:
-	YYDEBUG(456, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy519;
-	if (yych == 'i') goto yy519;
-	goto yy40;
+		YYDEBUG(456, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy536;
+		if (yych == 'n') goto yy536;
+		goto yy47;
 yy457:
-	YYDEBUG(457, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy457;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy457;
-		if (yych == ')') goto yy520;
-		goto yy71;
-	}
+		YYDEBUG(457, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy537;
+		if (yych == 'r') goto yy537;
+		goto yy47;
 yy458:
-	YYDEBUG(458, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy521;
-	if (yych == 'y') goto yy521;
-	goto yy71;
+		YYDEBUG(458, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy538;
+		if (yych == 'l') goto yy538;
+		goto yy47;
 yy459:
-	YYDEBUG(459, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
+		YYDEBUG(459, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'F') goto yy539;
+		if (yych == 'f') goto yy539;
+		goto yy47;
 yy460:
-	YYDEBUG(460, *YYCURSOR);
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy459;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy459;
-		if (yych != ')') goto yy71;
-	}
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_BOOL_CAST);
-}
+		YYDEBUG(460, *YYCURSOR);
+		yyaccept = 39;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy461:
-	YYDEBUG(461, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy522;
-	if (yych == 'a') goto yy522;
-	goto yy71;
+		YYDEBUG(461, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_EMPTY);
+}
 yy462:
-	YYDEBUG(462, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy463;
-	if (yych != 'e') goto yy71;
+		YYDEBUG(462, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy541;
+		if (yych == 'c') goto yy541;
+		goto yy47;
 yy463:
-	YYDEBUG(463, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy463;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy463;
-		if (yych == ')') goto yy523;
-		goto yy71;
-	}
+		YYDEBUG(463, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy542;
+		if (yych == 'r') goto yy542;
+		goto yy47;
 yy464:
-	YYDEBUG(464, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy524;
-	if (yych == 'e') goto yy524;
-	goto yy71;
+		YYDEBUG(464, *YYCURSOR);
+		yyaccept = 40;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy465:
-	YYDEBUG(465, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy525;
-	if (yych == 't') goto yy525;
-	goto yy71;
-yy466:
-	YYDEBUG(466, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	if (PARSER_MODE()) {
-		zend_throw_exception(zend_ce_parse_error, "The (real) cast has been removed, use (float) instead", 0);
-		RETURN_TOKEN(T_ERROR);
-	}
-	RETURN_TOKEN(T_DOUBLE_CAST);
+		YYDEBUG(465, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ENDIF);
 }
+yy466:
+		YYDEBUG(466, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy544;
+		if (yych == 'i') goto yy544;
+		goto yy47;
 yy467:
-	YYDEBUG(467, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy521;
-	if (yych == 'g') goto yy521;
-	goto yy71;
+		YYDEBUG(467, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy545;
+		if (yych == 'i') goto yy545;
+		goto yy47;
 yy468:
-	YYDEBUG(468, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy468;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy468;
-		if (yych == ')') goto yy526;
-		goto yy71;
-	}
-yy469:
-	YYDEBUG(469, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy382;
-	if (yych == '\r') goto yy384;
-	goto yy71;
+		YYDEBUG(468, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(10);
+		yych = *YYCURSOR;
+		YYDEBUG(469, *YYCURSOR);
+		if (yych <= 'I') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy85;
+					goto yy468;
+				} else {
+					if (yych == '\r') goto yy468;
+					goto yy85;
+				}
+			} else {
+				if (yych <= 'D') {
+					if (yych <= ' ') goto yy468;
+					if (yych <= '@') goto yy85;
+					goto yy546;
+				} else {
+					if (yych <= 'E') goto yy548;
+					if (yych <= 'H') goto yy546;
+					goto yy549;
+				}
+			}
+		} else {
+			if (yych <= 'd') {
+				if (yych <= '^') {
+					if (yych <= 'Z') goto yy546;
+					goto yy85;
+				} else {
+					if (yych == '`') goto yy85;
+					goto yy546;
+				}
+			} else {
+				if (yych <= 'i') {
+					if (yych <= 'e') goto yy548;
+					if (yych <= 'h') goto yy546;
+					goto yy549;
+				} else {
+					if (yych <= 'z') goto yy546;
+					if (yych <= 0x7F) goto yy85;
+					goto yy546;
+				}
+			}
+		}
 yy470:
-	YYDEBUG(470, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy527;
-	if (yych == 'c') goto yy527;
-	goto yy40;
+		YYDEBUG(470, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy550;
+		if (yych == 'd') goto yy550;
+		goto yy47;
 yy471:
-	YYDEBUG(471, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy528;
-	if (yych == 'l') goto yy528;
-	goto yy40;
+		YYDEBUG(471, *YYCURSOR);
+		yyaccept = 41;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= 'K') {
+				if (yych <= '/') goto yy472;
+				if (yych <= '9') goto yy46;
+				if (yych >= 'A') goto yy46;
+			} else {
+				if (yych <= 'L') goto yy551;
+				if (yych <= 'Z') goto yy46;
+				if (yych >= '\\') goto yy160;
+			}
+		} else {
+			if (yych <= 'k') {
+				if (yych == '_') goto yy46;
+				if (yych >= 'a') goto yy46;
+			} else {
+				if (yych <= 'l') goto yy551;
+				if (yych <= 'z') goto yy46;
+				if (yych >= 0x80) goto yy46;
+			}
+		}
 yy472:
-	YYDEBUG(472, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy529;
-	if (yych == 'u') goto yy529;
-	goto yy40;
+		YYDEBUG(472, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_FINAL);
+}
 yy473:
-	YYDEBUG(473, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy530;
-	if (yych == 'e') goto yy530;
-	goto yy40;
+		YYDEBUG(473, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy552;
+		if (yych == 'c') goto yy552;
+		goto yy47;
 yy474:
-	YYDEBUG(474, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy532;
-	if (yych == 't') goto yy532;
-	goto yy40;
+		YYDEBUG(474, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy553;
+		if (yych == 'i') goto yy553;
+		goto yy47;
 yy475:
-	YYDEBUG(475, *YYCURSOR);
-	yyaccept = 50;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(475, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy554;
+		if (yych == 'l') goto yy554;
+		goto yy47;
 yy476:
-	YYDEBUG(476, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ELSEIF);
-}
+		YYDEBUG(476, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'M') goto yy556;
+		if (yych == 'm') goto yy556;
+		goto yy47;
 yy477:
-	YYDEBUG(477, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy534;
-	if (yych == 'l') goto yy534;
-	goto yy40;
+		YYDEBUG(477, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy557;
+		if (yych == 'd') goto yy557;
+		goto yy47;
 yy478:
-	YYDEBUG(478, *YYCURSOR);
-	yyaccept = 51;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\\') {
-		if (yych <= 'D') {
-			if (yych <= '/') goto yy479;
-			if (yych <= '9') goto yy39;
-			if (yych >= 'A') goto yy39;
-		} else {
-			if (yych <= 'E') goto yy535;
-			if (yych <= 'Z') goto yy39;
-			if (yych >= '\\') goto yy127;
-		}
-	} else {
-		if (yych <= 'd') {
-			if (yych == '_') goto yy39;
-			if (yych >= 'a') goto yy39;
-		} else {
-			if (yych <= 'e') goto yy535;
-			if (yych <= 'z') goto yy39;
-			if (yych >= 0x80) goto yy39;
-		}
-	}
+		YYDEBUG(478, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy558;
+		if (yych == 'n') goto yy558;
+		goto yy47;
 yy479:
-	YYDEBUG(479, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ENDFOR);
-}
+		YYDEBUG(479, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy559;
+		if (yych == 'a') goto yy559;
+		goto yy47;
 yy480:
-	YYDEBUG(480, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy536;
-	if (yych == 't') goto yy536;
-	goto yy40;
+		YYDEBUG(480, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'F') goto yy560;
+		if (yych == 'f') goto yy560;
+		goto yy47;
 yy481:
-	YYDEBUG(481, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy537;
-	if (yych == 'l') goto yy537;
-	goto yy40;
+		YYDEBUG(481, *YYCURSOR);
+		yyaccept = 42;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy482:
-	YYDEBUG(482, *YYCURSOR);
-	++YYCURSOR;
-yy483:
-	YYDEBUG(483, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	yyless(4);
-	RETURN_TOKEN_WITH_IDENT(T_ENUM);
+		YYDEBUG(482, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ISSET);
 }
+yy483:
+		YYDEBUG(483, *YYCURSOR);
+		yyaccept = 43;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy484:
-	YYDEBUG(484, *YYCURSOR);
-	yyaccept = 52;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'X') goto yy538;
-	if (yych == 'x') goto yy538;
-	goto yy483;
+		YYDEBUG(484, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_MATCH);
+}
 yy485:
-	YYDEBUG(485, *YYCURSOR);
-	yyaccept = 52;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'M') goto yy539;
-	if (yych == 'm') goto yy539;
-	goto yy483;
+		YYDEBUG(485, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'P') goto yy561;
+		if (yych == 'p') goto yy561;
+		goto yy47;
 yy486:
-	YYDEBUG(486, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy540;
-	if (yych == 's') goto yy540;
-	goto yy40;
+		YYDEBUG(486, *YYCURSOR);
+		yyaccept = 44;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy487:
-	YYDEBUG(487, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'Y') goto yy542;
-	if (yych == 'y') goto yy542;
-	goto yy40;
+		YYDEBUG(487, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_PRINT);
+}
 yy488:
-	YYDEBUG(488, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy544;
-	if (yych == 'h') goto yy544;
-	goto yy40;
+		YYDEBUG(488, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy562;
+		if (yych == 't') goto yy562;
+		goto yy47;
 yy489:
-	YYDEBUG(489, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy546;
-	if (yych == 'o') goto yy546;
-	goto yy40;
+		YYDEBUG(489, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy563;
+		if (yych == 'c') goto yy563;
+		goto yy47;
 yy490:
-	YYDEBUG(490, *YYCURSOR);
-	yyaccept = 53;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(490, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy564;
+		if (yych == 'c') goto yy564;
+		goto yy47;
 yy491:
-	YYDEBUG(491, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_GLOBAL);
-}
+		YYDEBUG(491, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy566;
+		if (yych == 'n') goto yy566;
+		goto yy47;
 yy492:
-	YYDEBUG(492, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy547;
-	if (yych == 'e') goto yy547;
-	goto yy40;
+		YYDEBUG(492, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy567;
+		if (yych == 'r') goto yy567;
+		goto yy47;
 yy493:
-	YYDEBUG(493, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy548;
-	if (yych == 'e') goto yy548;
-	goto yy40;
+		YYDEBUG(493, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy568;
+		if (yych == 'n') goto yy568;
+		goto yy47;
 yy494:
-	YYDEBUG(494, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy550;
-	if (yych == 'c') goto yy550;
-	goto yy40;
+		YYDEBUG(494, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy570;
+		if (yych == 'c') goto yy570;
+		goto yy47;
 yy495:
-	YYDEBUG(495, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy551;
-	if (yych == 'd') goto yy551;
-	goto yy40;
+		YYDEBUG(495, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy572;
+		if (yych == 'h') goto yy572;
+		goto yy47;
 yy496:
-	YYDEBUG(496, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy552;
-	if (yych == 'a') goto yy552;
-	goto yy40;
+		YYDEBUG(496, *YYCURSOR);
+		yyaccept = 45;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy497:
-	YYDEBUG(497, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy553;
-	if (yych == 'a') goto yy553;
-	goto yy40;
+		YYDEBUG(497, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_THROW);
+}
 yy498:
-	YYDEBUG(498, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy554;
-	if (yych == 'e') goto yy554;
-	goto yy40;
+		YYDEBUG(498, *YYCURSOR);
+		yyaccept = 46;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy499:
-	YYDEBUG(499, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy556;
-	if (yych == 't') goto yy556;
-	goto yy40;
+		YYDEBUG(499, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_TRAIT);
+}
 yy500:
-	YYDEBUG(500, *YYCURSOR);
-	yyaccept = 54;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(500, *YYCURSOR);
+		yyaccept = 47;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy501:
-	YYDEBUG(501, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_PUBLIC);
+		YYDEBUG(501, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_UNSET);
 }
 yy502:
-	YYDEBUG(502, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy557;
-	if (yych == 'l') goto yy557;
-	goto yy40;
+		YYDEBUG(502, *YYCURSOR);
+		yyaccept = 48;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy503:
-	YYDEBUG(503, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy558;
-	if (yych == 'e') goto yy558;
-	goto yy40;
+		YYDEBUG(503, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_WHILE);
+}
 yy504:
-	YYDEBUG(504, *YYCURSOR);
-	yyaccept = 55;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(504, *YYCURSOR);
+		yyaccept = 49;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych <= '\r') {
+			if (yych <= 0x08) goto yy505;
+			if (yych <= '\n') goto yy574;
+			if (yych >= '\r') goto yy574;
+		} else {
+			if (yych <= ' ') {
+				if (yych >= ' ') goto yy574;
+			} else {
+				if (yych == '\\') goto yy160;
+			}
+		}
 yy505:
-	YYDEBUG(505, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_RETURN);
+		YYDEBUG(505, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_YIELD);
 }
 yy506:
-	YYDEBUG(506, *YYCURSOR);
-	yyaccept = 56;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(506, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy576;
+		if (yych == 's') goto yy576;
+		goto yy47;
 yy507:
-	YYDEBUG(507, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_STATIC);
-}
+		YYDEBUG(507, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy577;
+		goto yy47;
 yy508:
-	YYDEBUG(508, *YYCURSOR);
-	yyaccept = 57;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(508, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy578;
+		if (yych == 'e') goto yy578;
+		goto yy47;
 yy509:
-	YYDEBUG(509, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_SWITCH);
-}
+		YYDEBUG(509, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy579;
+		if (yych == 'c') goto yy579;
+		goto yy47;
 yy510:
-	YYDEBUG(510, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(5);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych <= '\n') {
-			if (yych <= 0x08) goto yy71;
-			goto yy510;
-		} else {
-			if (yych == '\r') goto yy510;
-			goto yy71;
-		}
-	} else {
-		if (yych <= 'F') {
-			if (yych <= ' ') goto yy510;
-			if (yych <= 'E') goto yy71;
-			goto yy560;
-		} else {
-			if (yych == 'f') goto yy560;
-			goto yy71;
-		}
-	}
+		YYDEBUG(510, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy580;
+		if (yych == 't') goto yy580;
+		goto yy47;
 yy511:
-	YYDEBUG(511, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy561;
-	if (yych == 's') goto yy561;
-	goto yy40;
+		YYDEBUG(511, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy581;
+		if (yych == 'e') goto yy581;
+		goto yy47;
 yy512:
-	YYDEBUG(512, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy562;
-	goto yy40;
+		YYDEBUG(512, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy582;
+		if (yych == 'h') goto yy582;
+		goto yy47;
 yy513:
-	YYDEBUG(513, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy564;
-	goto yy40;
+		YYDEBUG(513, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy583;
+		if (yych == 'e') goto yy583;
+		goto yy47;
 yy514:
-	YYDEBUG(514, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy565;
-	if (yych == 't') goto yy565;
-	goto yy40;
+		YYDEBUG(514, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy584;
+		if (yych == 'i') goto yy584;
+		goto yy47;
 yy515:
-	YYDEBUG(515, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy566;
-	goto yy40;
-yy516:
-	YYDEBUG(516, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy567;
-	goto yy40;
+		YYDEBUG(515, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(516, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy515;
+			goto yy85;
+		} else {
+			if (yych <= ' ') goto yy515;
+			if (yych == ')') goto yy585;
+			goto yy85;
+		}
 yy517:
-	YYDEBUG(517, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy568;
-	if (yych == 'o') goto yy568;
-	goto yy40;
+		YYDEBUG(517, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'Y') goto yy587;
+		if (yych == 'y') goto yy587;
+		goto yy85;
 yy518:
-	YYDEBUG(518, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy569;
-	if (yych == 's') goto yy569;
-	goto yy40;
+		YYDEBUG(518, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 yy519:
-	YYDEBUG(519, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy570;
-	if (yych == 't') goto yy570;
-	goto yy40;
-yy520:
-	YYDEBUG(520, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_ARRAY_CAST);
+		YYDEBUG(519, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy518;
+			goto yy85;
+		} else {
+			if (yych <= ' ') goto yy518;
+			if (yych != ')') goto yy85;
+		}
+		YYDEBUG(520, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(521, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_BOOL_CAST);
 }
-yy521:
-	YYDEBUG(521, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy521;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy521;
-		if (yych == ')') goto yy571;
-		goto yy71;
-	}
 yy522:
-	YYDEBUG(522, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy459;
-	if (yych == 'n') goto yy459;
-	goto yy71;
+		YYDEBUG(522, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'A') goto yy589;
+		if (yych == 'a') goto yy589;
+		goto yy85;
 yy523:
-	YYDEBUG(523, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_DOUBLE_CAST);
-}
+		YYDEBUG(523, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy524;
+		if (yych != 'e') goto yy85;
 yy524:
-	YYDEBUG(524, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy371;
-	if (yych == 'r') goto yy371;
-	goto yy71;
-yy525:
-	YYDEBUG(525, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy525;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy525;
-		if (yych == ')') goto yy572;
-		goto yy71;
-	}
+		YYDEBUG(524, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(525, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy524;
+			goto yy85;
+		} else {
+			if (yych <= ' ') goto yy524;
+			if (yych == ')') goto yy590;
+			goto yy85;
+		}
 yy526:
-	YYDEBUG(526, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_UNSET_CAST);
-}
+		YYDEBUG(526, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy592;
+		if (yych == 'e') goto yy592;
+		goto yy85;
 yy527:
-	YYDEBUG(527, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy573;
-	if (yych == 't') goto yy573;
-	goto yy40;
+		YYDEBUG(527, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'T') goto yy593;
+		if (yych == 't') goto yy593;
+		goto yy85;
 yy528:
-	YYDEBUG(528, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy575;
-	if (yych == 'e') goto yy575;
-	goto yy40;
-yy529:
-	YYDEBUG(529, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy577;
-	if (yych == 'e') goto yy577;
-	goto yy40;
-yy530:
-	YYDEBUG(530, *YYCURSOR);
-	yyaccept = 58;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
+		YYDEBUG(528, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(529, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	if (PARSER_MODE()) {
+		zend_throw_exception(zend_ce_parse_error, "The (real) cast has been removed, use (float) instead", 0);
+		RETURN_TOKEN(T_ERROR);
 	}
-	if (yych == '\\') goto yy127;
-yy531:
-	YYDEBUG(531, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_DECLARE);
+	RETURN_TOKEN(T_DOUBLE_CAST);
 }
-yy532:
-	YYDEBUG(532, *YYCURSOR);
-	yyaccept = 59;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+yy530:
+		YYDEBUG(530, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'G') goto yy587;
+		if (yych == 'g') goto yy587;
+		goto yy85;
+yy531:
+		YYDEBUG(531, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(532, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy531;
+			goto yy85;
+		} else {
+			if (yych <= ' ') goto yy531;
+			if (yych == ')') goto yy595;
+			goto yy85;
+		}
 yy533:
-	YYDEBUG(533, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_DEFAULT);
-}
+		YYDEBUG(533, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy439;
+		if (yych == '\r') goto yy441;
+		goto yy85;
 yy534:
-	YYDEBUG(534, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy579;
-	if (yych == 'a') goto yy579;
-	goto yy40;
+		YYDEBUG(534, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy597;
+		if (yych == 'c') goto yy597;
+		goto yy47;
 yy535:
-	YYDEBUG(535, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy580;
-	if (yych == 'a') goto yy580;
-	goto yy40;
+		YYDEBUG(535, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy598;
+		if (yych == 'l') goto yy598;
+		goto yy47;
 yy536:
-	YYDEBUG(536, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy581;
-	if (yych == 'c') goto yy581;
-	goto yy40;
+		YYDEBUG(536, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy599;
+		if (yych == 'u') goto yy599;
+		goto yy47;
 yy537:
-	YYDEBUG(537, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy582;
-	if (yych == 'e') goto yy582;
-	goto yy40;
+		YYDEBUG(537, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy600;
+		if (yych == 'e') goto yy600;
+		goto yy47;
 yy538:
-	YYDEBUG(538, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy584;
-	if (yych == 't') goto yy584;
-	goto yy71;
+		YYDEBUG(538, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy602;
+		if (yych == 't') goto yy602;
+		goto yy47;
 yy539:
-	YYDEBUG(539, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy585;
-	if (yych == 'p') goto yy585;
-	goto yy71;
+		YYDEBUG(539, *YYCURSOR);
+		yyaccept = 50;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy540:
-	YYDEBUG(540, *YYCURSOR);
-	yyaccept = 60;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy541:
-	YYDEBUG(541, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_EXTENDS);
+		YYDEBUG(540, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ELSEIF);
 }
+yy541:
+		YYDEBUG(541, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy604;
+		if (yych == 'l') goto yy604;
+		goto yy47;
 yy542:
-	YYDEBUG(542, *YYCURSOR);
-	yyaccept = 61;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(542, *YYCURSOR);
+		yyaccept = 51;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= 'D') {
+				if (yych <= '/') goto yy543;
+				if (yych <= '9') goto yy46;
+				if (yych >= 'A') goto yy46;
+			} else {
+				if (yych <= 'E') goto yy605;
+				if (yych <= 'Z') goto yy46;
+				if (yych >= '\\') goto yy160;
+			}
+		} else {
+			if (yych <= 'd') {
+				if (yych == '_') goto yy46;
+				if (yych >= 'a') goto yy46;
+			} else {
+				if (yych <= 'e') goto yy605;
+				if (yych <= 'z') goto yy46;
+				if (yych >= 0x80) goto yy46;
+			}
+		}
 yy543:
-	YYDEBUG(543, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_FINALLY);
+		YYDEBUG(543, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ENDFOR);
 }
 yy544:
-	YYDEBUG(544, *YYCURSOR);
-	yyaccept = 62;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(544, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy606;
+		if (yych == 't') goto yy606;
+		goto yy47;
 yy545:
-	YYDEBUG(545, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_FOREACH);
-}
+		YYDEBUG(545, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy607;
+		if (yych == 'l') goto yy607;
+		goto yy47;
 yy546:
-	YYDEBUG(546, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy586;
-	if (yych == 'n') goto yy586;
-	goto yy40;
+		YYDEBUG(546, *YYCURSOR);
+		++YYCURSOR;
 yy547:
-	YYDEBUG(547, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy588;
-	if (yych == 'n') goto yy588;
-	goto yy40;
+		YYDEBUG(547, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	yyless(4);
+	RETURN_TOKEN_WITH_IDENT(T_ENUM);
+}
 yy548:
-	YYDEBUG(548, *YYCURSOR);
-	yyaccept = 63;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\\') {
-		if (yych <= '@') {
-			if (yych <= '/') goto yy549;
-			if (yych <= '9') goto yy39;
-		} else {
-			if (yych <= 'Z') goto yy39;
-			if (yych >= '\\') goto yy127;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych == '_') goto yy589;
-		} else {
-			if (yych <= 'z') goto yy39;
-			if (yych >= 0x80) goto yy39;
-		}
-	}
+		YYDEBUG(548, *YYCURSOR);
+		yyaccept = 52;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'X') goto yy608;
+		if (yych == 'x') goto yy608;
+		goto yy547;
 yy549:
-	YYDEBUG(549, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_INCLUDE);
-}
+		YYDEBUG(549, *YYCURSOR);
+		yyaccept = 52;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'M') goto yy609;
+		if (yych == 'm') goto yy609;
+		goto yy547;
 yy550:
-	YYDEBUG(550, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy590;
-	if (yych == 'e') goto yy590;
-	goto yy40;
+		YYDEBUG(550, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy610;
+		if (yych == 's') goto yy610;
+		goto yy47;
 yy551:
-	YYDEBUG(551, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy591;
-	if (yych == 'o') goto yy591;
-	goto yy40;
+		YYDEBUG(551, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'Y') goto yy612;
+		if (yych == 'y') goto yy612;
+		goto yy47;
 yy552:
-	YYDEBUG(552, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy592;
-	if (yych == 'c') goto yy592;
-	goto yy40;
+		YYDEBUG(552, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy614;
+		if (yych == 'h') goto yy614;
+		goto yy47;
 yy553:
-	YYDEBUG(553, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy593;
-	if (yych == 'c') goto yy593;
-	goto yy40;
+		YYDEBUG(553, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy616;
+		if (yych == 'o') goto yy616;
+		goto yy47;
 yy554:
-	YYDEBUG(554, *YYCURSOR);
-	yyaccept = 64;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(554, *YYCURSOR);
+		yyaccept = 53;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy555:
-	YYDEBUG(555, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_PRIVATE);
+		YYDEBUG(555, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_GLOBAL);
 }
 yy556:
-	YYDEBUG(556, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy594;
-	if (yych == 'e') goto yy594;
-	goto yy40;
+		YYDEBUG(556, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy617;
+		if (yych == 'e') goto yy617;
+		goto yy47;
 yy557:
-	YYDEBUG(557, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'Y') goto yy595;
-	if (yych == 'y') goto yy595;
-	goto yy40;
+		YYDEBUG(557, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy618;
+		if (yych == 'e') goto yy618;
+		goto yy47;
 yy558:
-	YYDEBUG(558, *YYCURSOR);
-	yyaccept = 65;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\\') {
-		if (yych <= '@') {
-			if (yych <= '/') goto yy559;
-			if (yych <= '9') goto yy39;
-		} else {
-			if (yych <= 'Z') goto yy39;
-			if (yych >= '\\') goto yy127;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych == '_') goto yy597;
-		} else {
-			if (yych <= 'z') goto yy39;
-			if (yych >= 0x80) goto yy39;
-		}
-	}
+		YYDEBUG(558, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy620;
+		if (yych == 'c') goto yy620;
+		goto yy47;
 yy559:
-	YYDEBUG(559, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_REQUIRE);
-}
+		YYDEBUG(559, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy621;
+		if (yych == 'd') goto yy621;
+		goto yy47;
 yy560:
-	YYDEBUG(560, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy598;
-	if (yych == 'r') goto yy598;
-	goto yy71;
+		YYDEBUG(560, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy622;
+		if (yych == 'a') goto yy622;
+		goto yy47;
 yy561:
-	YYDEBUG(561, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy599;
-	goto yy40;
+		YYDEBUG(561, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy623;
+		if (yych == 'a') goto yy623;
+		goto yy47;
 yy562:
-	YYDEBUG(562, *YYCURSOR);
-	yyaccept = 66;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(562, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy624;
+		if (yych == 'e') goto yy624;
+		goto yy47;
 yy563:
-	YYDEBUG(563, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_DIR);
-}
+		YYDEBUG(563, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy626;
+		if (yych == 't') goto yy626;
+		goto yy47;
 yy564:
-	YYDEBUG(564, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy600;
-	goto yy40;
+		YYDEBUG(564, *YYCURSOR);
+		yyaccept = 54;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy565:
-	YYDEBUG(565, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy602;
-	if (yych == 'i') goto yy602;
-	goto yy40;
+		YYDEBUG(565, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_PUBLIC);
+}
 yy566:
-	YYDEBUG(566, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy603;
-	if (yych == 'c') goto yy603;
-	goto yy40;
+		YYDEBUG(566, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy627;
+		if (yych == 'l') goto yy627;
+		goto yy47;
 yy567:
-	YYDEBUG(567, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy604;
-	goto yy40;
+		YYDEBUG(567, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy628;
+		if (yych == 'e') goto yy628;
+		goto yy47;
 yy568:
-	YYDEBUG(568, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy606;
-	if (yych == 'd') goto yy606;
-	goto yy40;
+		YYDEBUG(568, *YYCURSOR);
+		yyaccept = 55;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy569:
-	YYDEBUG(569, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'P') goto yy607;
-	if (yych == 'p') goto yy607;
-	goto yy40;
+		YYDEBUG(569, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_RETURN);
+}
 yy570:
-	YYDEBUG(570, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy608;
-	goto yy40;
+		YYDEBUG(570, *YYCURSOR);
+		yyaccept = 56;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy571:
-	YYDEBUG(571, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_STRING_CAST);
+		YYDEBUG(571, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_STATIC);
 }
 yy572:
-	YYDEBUG(572, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_OBJECT_CAST);
-}
+		YYDEBUG(572, *YYCURSOR);
+		yyaccept = 57;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy573:
-	YYDEBUG(573, *YYCURSOR);
-	yyaccept = 67;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy574:
-	YYDEBUG(574, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ABSTRACT);
+		YYDEBUG(573, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_SWITCH);
 }
-yy575:
-	YYDEBUG(575, *YYCURSOR);
-	yyaccept = 68;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+yy574:
+		YYDEBUG(574, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(5);
+		yych = *YYCURSOR;
+		YYDEBUG(575, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych <= '\n') {
+				if (yych <= 0x08) goto yy85;
+				goto yy574;
+			} else {
+				if (yych == '\r') goto yy574;
+				goto yy85;
+			}
+		} else {
+			if (yych <= 'F') {
+				if (yych <= ' ') goto yy574;
+				if (yych <= 'E') goto yy85;
+				goto yy630;
+			} else {
+				if (yych == 'f') goto yy630;
+				goto yy85;
+			}
+		}
 yy576:
-	YYDEBUG(576, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CALLABLE);
-}
+		YYDEBUG(576, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy631;
+		if (yych == 's') goto yy631;
+		goto yy47;
 yy577:
-	YYDEBUG(577, *YYCURSOR);
-	yyaccept = 69;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(577, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy632;
+		goto yy47;
 yy578:
-	YYDEBUG(578, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CONTINUE);
-}
+		YYDEBUG(578, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy634;
+		goto yy47;
 yy579:
-	YYDEBUG(579, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy609;
-	if (yych == 'r') goto yy609;
-	goto yy40;
+		YYDEBUG(579, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy635;
+		if (yych == 't') goto yy635;
+		goto yy47;
 yy580:
-	YYDEBUG(580, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy610;
-	if (yych == 'c') goto yy610;
-	goto yy40;
+		YYDEBUG(580, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy636;
+		goto yy47;
 yy581:
-	YYDEBUG(581, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy611;
-	if (yych == 'h') goto yy611;
-	goto yy40;
+		YYDEBUG(581, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy637;
+		goto yy47;
 yy582:
-	YYDEBUG(582, *YYCURSOR);
-	yyaccept = 70;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(582, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy638;
+		if (yych == 'o') goto yy638;
+		goto yy47;
 yy583:
-	YYDEBUG(583, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ENDWHILE);
-}
+		YYDEBUG(583, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy639;
+		if (yych == 's') goto yy639;
+		goto yy47;
 yy584:
-	YYDEBUG(584, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy613;
-	if (yych == 'e') goto yy613;
-	goto yy71;
+		YYDEBUG(584, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy640;
+		if (yych == 't') goto yy640;
+		goto yy47;
 yy585:
-	YYDEBUG(585, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy614;
-	if (yych == 'l') goto yy614;
-	goto yy71;
-yy586:
-	YYDEBUG(586, *YYCURSOR);
-	yyaccept = 71;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy587:
-	YYDEBUG(587, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_FUNCTION);
+		YYDEBUG(585, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(586, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_ARRAY_CAST);
 }
-yy588:
-	YYDEBUG(588, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy615;
-	if (yych == 't') goto yy615;
-	goto yy40;
+yy587:
+		YYDEBUG(587, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(588, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy587;
+			goto yy85;
+		} else {
+			if (yych <= ' ') goto yy587;
+			if (yych == ')') goto yy641;
+			goto yy85;
+		}
 yy589:
-	YYDEBUG(589, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy616;
-	if (yych == 'o') goto yy616;
-	goto yy40;
+		YYDEBUG(589, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy518;
+		if (yych == 'n') goto yy518;
+		goto yy85;
 yy590:
-	YYDEBUG(590, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy617;
-	if (yych == 'o') goto yy617;
-	goto yy40;
-yy591:
-	YYDEBUG(591, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'F') goto yy618;
-	if (yych == 'f') goto yy618;
-	goto yy40;
+		YYDEBUG(590, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(591, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_DOUBLE_CAST);
+}
 yy592:
-	YYDEBUG(592, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy620;
-	if (yych == 'e') goto yy620;
-	goto yy40;
+		YYDEBUG(592, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'R') goto yy425;
+		if (yych == 'r') goto yy425;
+		goto yy85;
 yy593:
-	YYDEBUG(593, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy622;
-	if (yych == 'e') goto yy622;
-	goto yy40;
-yy594:
-	YYDEBUG(594, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy624;
-	if (yych == 'd') goto yy624;
-	goto yy40;
+		YYDEBUG(593, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(594, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy593;
+			goto yy85;
+		} else {
+			if (yych <= ' ') goto yy593;
+			if (yych == ')') goto yy643;
+			goto yy85;
+		}
 yy595:
-	YYDEBUG(595, *YYCURSOR);
-	yyaccept = 72;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy596:
-	YYDEBUG(596, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_READONLY);
+		YYDEBUG(595, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(596, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_UNSET_CAST);
 }
 yy597:
-	YYDEBUG(597, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy626;
-	if (yych == 'o') goto yy626;
-	goto yy40;
+		YYDEBUG(597, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy645;
+		if (yych == 't') goto yy645;
+		goto yy47;
 yy598:
-	YYDEBUG(598, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy627;
-	if (yych == 'o') goto yy627;
-	goto yy71;
+		YYDEBUG(598, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy647;
+		if (yych == 'e') goto yy647;
+		goto yy47;
 yy599:
-	YYDEBUG(599, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy628;
-	goto yy40;
+		YYDEBUG(599, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy649;
+		if (yych == 'e') goto yy649;
+		goto yy47;
 yy600:
-	YYDEBUG(600, *YYCURSOR);
-	yyaccept = 73;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(600, *YYCURSOR);
+		yyaccept = 58;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy601:
-	YYDEBUG(601, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_FILE);
+		YYDEBUG(601, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_DECLARE);
 }
 yy602:
-	YYDEBUG(602, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy630;
-	if (yych == 'o') goto yy630;
-	goto yy40;
+		YYDEBUG(602, *YYCURSOR);
+		yyaccept = 59;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy603:
-	YYDEBUG(603, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy631;
-	if (yych == 'o') goto yy631;
-	goto yy40;
+		YYDEBUG(603, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_DEFAULT);
+}
 yy604:
-	YYDEBUG(604, *YYCURSOR);
-	yyaccept = 74;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(604, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy651;
+		if (yych == 'a') goto yy651;
+		goto yy47;
 yy605:
-	YYDEBUG(605, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_LINE);
-}
+		YYDEBUG(605, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy652;
+		if (yych == 'a') goto yy652;
+		goto yy47;
 yy606:
-	YYDEBUG(606, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy632;
-	goto yy40;
+		YYDEBUG(606, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy653;
+		if (yych == 'c') goto yy653;
+		goto yy47;
 yy607:
-	YYDEBUG(607, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy633;
-	if (yych == 'a') goto yy633;
-	goto yy40;
+		YYDEBUG(607, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy654;
+		if (yych == 'e') goto yy654;
+		goto yy47;
 yy608:
-	YYDEBUG(608, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy634;
-	goto yy40;
+		YYDEBUG(608, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'T') goto yy656;
+		if (yych == 't') goto yy656;
+		goto yy85;
 yy609:
-	YYDEBUG(609, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy636;
-	if (yych == 'e') goto yy636;
-	goto yy40;
+		YYDEBUG(609, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'P') goto yy657;
+		if (yych == 'p') goto yy657;
+		goto yy85;
 yy610:
-	YYDEBUG(610, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy638;
-	if (yych == 'h') goto yy638;
-	goto yy40;
+		YYDEBUG(610, *YYCURSOR);
+		yyaccept = 60;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy611:
-	YYDEBUG(611, *YYCURSOR);
-	yyaccept = 75;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy612:
-	YYDEBUG(612, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ENDSWITCH);
+		YYDEBUG(611, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_EXTENDS);
 }
+yy612:
+		YYDEBUG(612, *YYCURSOR);
+		yyaccept = 61;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy613:
-	YYDEBUG(613, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy640;
-	if (yych == 'n') goto yy640;
-	goto yy71;
+		YYDEBUG(613, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_FINALLY);
+}
 yy614:
-	YYDEBUG(614, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy641;
-	if (yych == 'e') goto yy641;
-	goto yy71;
+		YYDEBUG(614, *YYCURSOR);
+		yyaccept = 62;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy615:
-	YYDEBUG(615, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy642;
-	if (yych == 's') goto yy642;
-	goto yy40;
+		YYDEBUG(615, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_FOREACH);
+}
 yy616:
-	YYDEBUG(616, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy644;
-	if (yych == 'n') goto yy644;
-	goto yy40;
+		YYDEBUG(616, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy658;
+		if (yych == 'n') goto yy658;
+		goto yy47;
 yy617:
-	YYDEBUG(617, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'F') goto yy645;
-	if (yych == 'f') goto yy645;
-	goto yy40;
+		YYDEBUG(617, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy660;
+		if (yych == 'n') goto yy660;
+		goto yy47;
 yy618:
-	YYDEBUG(618, *YYCURSOR);
-	yyaccept = 76;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(618, *YYCURSOR);
+		yyaccept = 63;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= '@') {
+				if (yych <= '/') goto yy619;
+				if (yych <= '9') goto yy46;
+			} else {
+				if (yych <= 'Z') goto yy46;
+				if (yych >= '\\') goto yy160;
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych == '_') goto yy661;
+			} else {
+				if (yych <= 'z') goto yy46;
+				if (yych >= 0x80) goto yy46;
+			}
+		}
 yy619:
-	YYDEBUG(619, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-    RETURN_TOKEN_WITH_IDENT(T_INSTEADOF);
+		YYDEBUG(619, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_INCLUDE);
 }
 yy620:
-	YYDEBUG(620, *YYCURSOR);
-	yyaccept = 77;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(620, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy662;
+		if (yych == 'e') goto yy662;
+		goto yy47;
 yy621:
-	YYDEBUG(621, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_INTERFACE);
-}
+		YYDEBUG(621, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy663;
+		if (yych == 'o') goto yy663;
+		goto yy47;
 yy622:
-	YYDEBUG(622, *YYCURSOR);
-	yyaccept = 78;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy647;
+		YYDEBUG(622, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy664;
+		if (yych == 'c') goto yy664;
+		goto yy47;
 yy623:
-	YYDEBUG(623, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_NAMESPACE);
-}
+		YYDEBUG(623, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy665;
+		if (yych == 'c') goto yy665;
+		goto yy47;
 yy624:
-	YYDEBUG(624, *YYCURSOR);
-	yyaccept = 79;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(624, *YYCURSOR);
+		yyaccept = 64;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy625:
-	YYDEBUG(625, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_PROTECTED);
+		YYDEBUG(625, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_PRIVATE);
 }
 yy626:
-	YYDEBUG(626, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy648;
-	if (yych == 'n') goto yy648;
-	goto yy40;
+		YYDEBUG(626, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy666;
+		if (yych == 'e') goto yy666;
+		goto yy47;
 yy627:
-	YYDEBUG(627, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy649;
-	if (yych == 'm') goto yy649;
-	goto yy71;
+		YYDEBUG(627, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'Y') goto yy667;
+		if (yych == 'y') goto yy667;
+		goto yy47;
 yy628:
-	YYDEBUG(628, *YYCURSOR);
-	yyaccept = 80;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(628, *YYCURSOR);
+		yyaccept = 65;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= '@') {
+				if (yych <= '/') goto yy629;
+				if (yych <= '9') goto yy46;
+			} else {
+				if (yych <= 'Z') goto yy46;
+				if (yych >= '\\') goto yy160;
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych == '_') goto yy669;
+			} else {
+				if (yych <= 'z') goto yy46;
+				if (yych >= 0x80) goto yy46;
+			}
+		}
 yy629:
-	YYDEBUG(629, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CLASS_C);
+		YYDEBUG(629, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_REQUIRE);
 }
 yy630:
-	YYDEBUG(630, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy650;
-	if (yych == 'n') goto yy650;
-	goto yy40;
+		YYDEBUG(630, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'R') goto yy670;
+		if (yych == 'r') goto yy670;
+		goto yy85;
 yy631:
-	YYDEBUG(631, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'M') goto yy651;
-	if (yych == 'm') goto yy651;
-	goto yy40;
+		YYDEBUG(631, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy671;
+		goto yy47;
 yy632:
-	YYDEBUG(632, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy652;
-	goto yy40;
+		YYDEBUG(632, *YYCURSOR);
+		yyaccept = 66;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy633:
-	YYDEBUG(633, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy654;
-	if (yych == 'c') goto yy654;
-	goto yy40;
+		YYDEBUG(633, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_DIR);
+}
 yy634:
-	YYDEBUG(634, *YYCURSOR);
-	yyaccept = 81;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(634, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy672;
+		goto yy47;
 yy635:
-	YYDEBUG(635, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_TRAIT_C);
-}
+		YYDEBUG(635, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy674;
+		if (yych == 'i') goto yy674;
+		goto yy47;
 yy636:
-	YYDEBUG(636, *YYCURSOR);
-	yyaccept = 82;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(636, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy675;
+		if (yych == 'c') goto yy675;
+		goto yy47;
 yy637:
-	YYDEBUG(637, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ENDDECLARE);
-}
+		YYDEBUG(637, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy676;
+		goto yy47;
 yy638:
-	YYDEBUG(638, *YYCURSOR);
-	yyaccept = 83;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(638, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy678;
+		if (yych == 'd') goto yy678;
+		goto yy47;
 yy639:
-	YYDEBUG(639, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ENDFOREACH);
-}
+		YYDEBUG(639, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'P') goto yy679;
+		if (yych == 'p') goto yy679;
+		goto yy47;
 yy640:
-	YYDEBUG(640, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy655;
-	if (yych == 'd') goto yy655;
-	goto yy71;
+		YYDEBUG(640, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy680;
+		goto yy47;
 yy641:
-	YYDEBUG(641, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy656;
-	if (yych == 'm') goto yy656;
-	goto yy71;
-yy642:
-	YYDEBUG(642, *YYCURSOR);
-	yyaccept = 84;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(641, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(642, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_STRING_CAST);
+}
 yy643:
-	YYDEBUG(643, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_IMPLEMENTS);
+		YYDEBUG(643, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(644, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_OBJECT_CAST);
 }
-yy644:
-	YYDEBUG(644, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy657;
-	if (yych == 'c') goto yy657;
-	goto yy40;
 yy645:
-	YYDEBUG(645, *YYCURSOR);
-	yyaccept = 85;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(645, *YYCURSOR);
+		yyaccept = 67;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy646:
-	YYDEBUG(646, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_INSTANCEOF);
+		YYDEBUG(646, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ABSTRACT);
 }
 yy647:
-	YYDEBUG(647, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy71;
-		if (yych <= 'Z') goto yy658;
-		if (yych <= '^') goto yy71;
-		goto yy658;
-	} else {
-		if (yych <= '`') goto yy71;
-		if (yych <= 'z') goto yy658;
-		if (yych <= 0x7F) goto yy71;
-		goto yy658;
-	}
+		YYDEBUG(647, *YYCURSOR);
+		yyaccept = 68;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy648:
-	YYDEBUG(648, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy660;
-	if (yych == 'c') goto yy660;
-	goto yy40;
+		YYDEBUG(648, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CALLABLE);
+}
 yy649:
-	YYDEBUG(649, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '^') {
-		if (yych <= '9') {
-			if (yych <= '/') goto yy661;
-			goto yy71;
-		} else {
-			if (yych <= '@') goto yy661;
-			if (yych <= 'Z') goto yy71;
-			goto yy661;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= '_') goto yy71;
-			goto yy661;
-		} else {
-			if (yych <= 'z') goto yy71;
-			if (yych <= 0x7F) goto yy661;
-			goto yy71;
+		YYDEBUG(649, *YYCURSOR);
+		yyaccept = 69;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
 		}
-	}
+		if (yych == '\\') goto yy160;
 yy650:
-	YYDEBUG(650, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy662;
-	goto yy40;
+		YYDEBUG(650, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CONTINUE);
+}
 yy651:
-	YYDEBUG(651, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'P') goto yy663;
-	if (yych == 'p') goto yy663;
-	goto yy40;
+		YYDEBUG(651, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy681;
+		if (yych == 'r') goto yy681;
+		goto yy47;
 yy652:
-	YYDEBUG(652, *YYCURSOR);
-	yyaccept = 86;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(652, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy682;
+		if (yych == 'c') goto yy682;
+		goto yy47;
 yy653:
-	YYDEBUG(653, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_METHOD_C);
-}
+		YYDEBUG(653, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy683;
+		if (yych == 'h') goto yy683;
+		goto yy47;
 yy654:
-	YYDEBUG(654, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy664;
-	if (yych == 'e') goto yy664;
-	goto yy40;
+		YYDEBUG(654, *YYCURSOR);
+		yyaccept = 70;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy655:
-	YYDEBUG(655, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy665;
-	if (yych == 's') goto yy665;
-	goto yy71;
+		YYDEBUG(655, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ENDWHILE);
+}
 yy656:
-	YYDEBUG(656, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy666;
-	if (yych == 'e') goto yy666;
-	goto yy71;
+		YYDEBUG(656, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy685;
+		if (yych == 'e') goto yy685;
+		goto yy85;
 yy657:
-	YYDEBUG(657, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy667;
-	if (yych == 'e') goto yy667;
-	goto yy40;
+		YYDEBUG(657, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy686;
+		if (yych == 'l') goto yy686;
+		goto yy85;
 yy658:
-	YYDEBUG(658, *YYCURSOR);
-	yyaccept = 87;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= '@') {
-			if (yych <= '/') goto yy659;
-			if (yych <= '9') goto yy658;
-		} else {
-			if (yych <= 'Z') goto yy658;
-			if (yych >= '\\') goto yy647;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych == '_') goto yy658;
-		} else {
-			if (yych <= 'z') goto yy658;
-			if (yych >= 0x80) goto yy658;
+		YYDEBUG(658, *YYCURSOR);
+		yyaccept = 71;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
 		}
-	}
+		if (yych == '\\') goto yy160;
 yy659:
-	YYDEBUG(659, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_STR(T_NAME_RELATIVE, sizeof("namespace\\") - 1);
+		YYDEBUG(659, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_FUNCTION);
 }
 yy660:
-	YYDEBUG(660, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy669;
-	if (yych == 'e') goto yy669;
-	goto yy40;
+		YYDEBUG(660, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy687;
+		if (yych == 't') goto yy687;
+		goto yy47;
 yy661:
-	YYDEBUG(661, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	yyless(yyleng - 1);
-	HANDLE_NEWLINES(yytext, yyleng);
-	RETURN_TOKEN_WITH_IDENT(T_YIELD_FROM);
-}
+		YYDEBUG(661, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy688;
+		if (yych == 'o') goto yy688;
+		goto yy47;
 yy662:
-	YYDEBUG(662, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy671;
-	goto yy40;
+		YYDEBUG(662, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy689;
+		if (yych == 'o') goto yy689;
+		goto yy47;
 yy663:
-	YYDEBUG(663, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy673;
-	if (yych == 'i') goto yy673;
-	goto yy40;
+		YYDEBUG(663, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'F') goto yy690;
+		if (yych == 'f') goto yy690;
+		goto yy47;
 yy664:
-	YYDEBUG(664, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy674;
-	goto yy40;
+		YYDEBUG(664, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy692;
+		if (yych == 'e') goto yy692;
+		goto yy47;
 yy665:
-	YYDEBUG(665, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	yyless(4);
-	RETURN_TOKEN_WITH_STR(T_STRING, 0);
-}
+		YYDEBUG(665, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy694;
+		if (yych == 'e') goto yy694;
+		goto yy47;
 yy666:
-	YYDEBUG(666, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy675;
-	if (yych == 'n') goto yy675;
-	goto yy71;
+		YYDEBUG(666, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy696;
+		if (yych == 'd') goto yy696;
+		goto yy47;
 yy667:
-	YYDEBUG(667, *YYCURSOR);
-	yyaccept = 88;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(667, *YYCURSOR);
+		yyaccept = 72;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy668:
-	YYDEBUG(668, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_INCLUDE_ONCE);
+		YYDEBUG(668, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_READONLY);
 }
 yy669:
-	YYDEBUG(669, *YYCURSOR);
-	yyaccept = 89;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(669, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy698;
+		if (yych == 'o') goto yy698;
+		goto yy47;
 yy670:
-	YYDEBUG(670, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_REQUIRE_ONCE);
-}
+		YYDEBUG(670, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'O') goto yy699;
+		if (yych == 'o') goto yy699;
+		goto yy85;
 yy671:
-	YYDEBUG(671, *YYCURSOR);
-	yyaccept = 90;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(671, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy700;
+		goto yy47;
 yy672:
-	YYDEBUG(672, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_FUNC_C);
-}
+		YYDEBUG(672, *YYCURSOR);
+		yyaccept = 73;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy673:
-	YYDEBUG(673, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy676;
-	if (yych == 'l') goto yy676;
-	goto yy40;
+		YYDEBUG(673, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_FILE);
+}
 yy674:
-	YYDEBUG(674, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy677;
-	goto yy40;
+		YYDEBUG(674, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy702;
+		if (yych == 'o') goto yy702;
+		goto yy47;
 yy675:
-	YYDEBUG(675, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy655;
-	if (yych == 't') goto yy655;
-	goto yy71;
+		YYDEBUG(675, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy703;
+		if (yych == 'o') goto yy703;
+		goto yy47;
 yy676:
-	YYDEBUG(676, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy679;
-	if (yych == 'e') goto yy679;
-	goto yy40;
+		YYDEBUG(676, *YYCURSOR);
+		yyaccept = 74;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy677:
-	YYDEBUG(677, *YYCURSOR);
-	yyaccept = 91;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
-yy678:
-	YYDEBUG(678, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_NS_C);
+		YYDEBUG(677, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_LINE);
 }
+yy678:
+		YYDEBUG(678, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy704;
+		goto yy47;
 yy679:
-	YYDEBUG(679, *YYCURSOR);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy680;
-	if (yych != 'r') goto yy40;
+		YYDEBUG(679, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy705;
+		if (yych == 'a') goto yy705;
+		goto yy47;
 yy680:
-	YYDEBUG(680, *YYCURSOR);
-	yyaccept = 92;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING0+yych & 8) {
-		goto yy39;
-	}
-	if (yych == '\\') goto yy127;
+		YYDEBUG(680, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy706;
+		goto yy47;
 yy681:
-	YYDEBUG(681, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_HALT_COMPILER);
+		YYDEBUG(681, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy708;
+		if (yych == 'e') goto yy708;
+		goto yy47;
+yy682:
+		YYDEBUG(682, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy710;
+		if (yych == 'h') goto yy710;
+		goto yy47;
+yy683:
+		YYDEBUG(683, *YYCURSOR);
+		yyaccept = 75;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy684:
+		YYDEBUG(684, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ENDSWITCH);
 }
-/* *********************************** */
-yyc_ST_LOOKING_FOR_PROPERTY:
-	YYDEBUG(682, *YYCURSOR);
-	YYFILL(4);
-	yych = *YYCURSOR;
-	if (yybm_ST_LOOKING_FOR_PROPERTY0+yych & 64) {
-		goto yy685;
-	}
-	if (yych <= '?') {
-		if (yych <= '-') {
-			if (yych == '#') goto yy686;
-			if (yych >= '-') goto yy687;
-		} else {
-			if (yych == '/') goto yy688;
-			if (yych >= '?') goto yy689;
+yy685:
+		YYDEBUG(685, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy712;
+		if (yych == 'n') goto yy712;
+		goto yy85;
+yy686:
+		YYDEBUG(686, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy713;
+		if (yych == 'e') goto yy713;
+		goto yy85;
+yy687:
+		YYDEBUG(687, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy714;
+		if (yych == 's') goto yy714;
+		goto yy47;
+yy688:
+		YYDEBUG(688, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy716;
+		if (yych == 'n') goto yy716;
+		goto yy47;
+yy689:
+		YYDEBUG(689, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'F') goto yy717;
+		if (yych == 'f') goto yy717;
+		goto yy47;
+yy690:
+		YYDEBUG(690, *YYCURSOR);
+		yyaccept = 76;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
 		}
-	} else {
+		if (yych == '\\') goto yy160;
+yy691:
+		YYDEBUG(691, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+    RETURN_TOKEN_WITH_IDENT(T_INSTEADOF);
+}
+yy692:
+		YYDEBUG(692, *YYCURSOR);
+		yyaccept = 77;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy693:
+		YYDEBUG(693, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_INTERFACE);
+}
+yy694:
+		YYDEBUG(694, *YYCURSOR);
+		yyaccept = 78;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy719;
+yy695:
+		YYDEBUG(695, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_NAMESPACE);
+}
+yy696:
+		YYDEBUG(696, *YYCURSOR);
+		yyaccept = 79;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy697:
+		YYDEBUG(697, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_PROTECTED);
+}
+yy698:
+		YYDEBUG(698, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy720;
+		if (yych == 'n') goto yy720;
+		goto yy47;
+yy699:
+		YYDEBUG(699, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'M') goto yy721;
+		if (yych == 'm') goto yy721;
+		goto yy85;
+yy700:
+		YYDEBUG(700, *YYCURSOR);
+		yyaccept = 80;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy701:
+		YYDEBUG(701, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CLASS_C);
+}
+yy702:
+		YYDEBUG(702, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy722;
+		if (yych == 'n') goto yy722;
+		goto yy47;
+yy703:
+		YYDEBUG(703, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'M') goto yy723;
+		if (yych == 'm') goto yy723;
+		goto yy47;
+yy704:
+		YYDEBUG(704, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy724;
+		goto yy47;
+yy705:
+		YYDEBUG(705, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy726;
+		if (yych == 'c') goto yy726;
+		goto yy47;
+yy706:
+		YYDEBUG(706, *YYCURSOR);
+		yyaccept = 81;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy707:
+		YYDEBUG(707, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_TRAIT_C);
+}
+yy708:
+		YYDEBUG(708, *YYCURSOR);
+		yyaccept = 82;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy709:
+		YYDEBUG(709, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ENDDECLARE);
+}
+yy710:
+		YYDEBUG(710, *YYCURSOR);
+		yyaccept = 83;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy711:
+		YYDEBUG(711, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ENDFOREACH);
+}
+yy712:
+		YYDEBUG(712, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'D') goto yy727;
+		if (yych == 'd') goto yy727;
+		goto yy85;
+yy713:
+		YYDEBUG(713, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'M') goto yy728;
+		if (yych == 'm') goto yy728;
+		goto yy85;
+yy714:
+		YYDEBUG(714, *YYCURSOR);
+		yyaccept = 84;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy715:
+		YYDEBUG(715, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_IMPLEMENTS);
+}
+yy716:
+		YYDEBUG(716, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy729;
+		if (yych == 'c') goto yy729;
+		goto yy47;
+yy717:
+		YYDEBUG(717, *YYCURSOR);
+		yyaccept = 85;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy718:
+		YYDEBUG(718, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_INSTANCEOF);
+}
+yy719:
+		YYDEBUG(719, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy683;
-			if (yych <= 'Z') goto yy690;
-			if (yych >= '_') goto yy690;
-		} else {
-			if (yych <= '`') goto yy683;
-			if (yych <= 'z') goto yy690;
-			if (yych >= 0x80) goto yy690;
+			if (yych <= '@') goto yy85;
+			if (yych <= 'Z') goto yy730;
+			if (yych <= '^') goto yy85;
+			goto yy730;
+		} else {
+			if (yych <= '`') goto yy85;
+			if (yych <= 'z') goto yy730;
+			if (yych <= 0x7F) goto yy85;
+			goto yy730;
+		}
+yy720:
+		YYDEBUG(720, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy733;
+		if (yych == 'c') goto yy733;
+		goto yy47;
+yy721:
+		YYDEBUG(721, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '^') {
+			if (yych <= '9') {
+				if (yych <= '/') goto yy734;
+				goto yy85;
+			} else {
+				if (yych <= '@') goto yy734;
+				if (yych <= 'Z') goto yy85;
+				goto yy734;
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych <= '_') goto yy85;
+				goto yy734;
+			} else {
+				if (yych <= 'z') goto yy85;
+				if (yych <= 0x7F) goto yy734;
+				goto yy85;
+			}
+		}
+yy722:
+		YYDEBUG(722, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy736;
+		goto yy47;
+yy723:
+		YYDEBUG(723, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'P') goto yy737;
+		if (yych == 'p') goto yy737;
+		goto yy47;
+yy724:
+		YYDEBUG(724, *YYCURSOR);
+		yyaccept = 86;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy725:
+		YYDEBUG(725, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_METHOD_C);
+}
+yy726:
+		YYDEBUG(726, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy738;
+		if (yych == 'e') goto yy738;
+		goto yy47;
+yy727:
+		YYDEBUG(727, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'S') goto yy739;
+		if (yych == 's') goto yy739;
+		goto yy85;
+yy728:
+		YYDEBUG(728, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy741;
+		if (yych == 'e') goto yy741;
+		goto yy85;
+yy729:
+		YYDEBUG(729, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy742;
+		if (yych == 'e') goto yy742;
+		goto yy47;
+yy730:
+		YYDEBUG(730, *YYCURSOR);
+		yyaccept = 87;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(731, *YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= '@') {
+				if (yych <= '/') goto yy732;
+				if (yych <= '9') goto yy730;
+			} else {
+				if (yych <= 'Z') goto yy730;
+				if (yych >= '\\') goto yy719;
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych == '_') goto yy730;
+			} else {
+				if (yych <= 'z') goto yy730;
+				if (yych >= 0x80) goto yy730;
+			}
+		}
+yy732:
+		YYDEBUG(732, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_STR(T_NAME_RELATIVE, sizeof("namespace\\") - 1);
+}
+yy733:
+		YYDEBUG(733, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy744;
+		if (yych == 'e') goto yy744;
+		goto yy47;
+yy734:
+		YYDEBUG(734, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(735, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	yyless(yyleng - 1);
+	HANDLE_NEWLINES(yytext, yyleng);
+	RETURN_TOKEN_WITH_IDENT(T_YIELD_FROM);
+}
+yy736:
+		YYDEBUG(736, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy746;
+		goto yy47;
+yy737:
+		YYDEBUG(737, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy748;
+		if (yych == 'i') goto yy748;
+		goto yy47;
+yy738:
+		YYDEBUG(738, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy749;
+		goto yy47;
+yy739:
+		YYDEBUG(739, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(740, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	yyless(4);
+	RETURN_TOKEN_WITH_STR(T_STRING, 0);
+}
+yy741:
+		YYDEBUG(741, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy750;
+		if (yych == 'n') goto yy750;
+		goto yy85;
+yy742:
+		YYDEBUG(742, *YYCURSOR);
+		yyaccept = 88;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy743:
+		YYDEBUG(743, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_INCLUDE_ONCE);
+}
+yy744:
+		YYDEBUG(744, *YYCURSOR);
+		yyaccept = 89;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy745:
+		YYDEBUG(745, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_REQUIRE_ONCE);
+}
+yy746:
+		YYDEBUG(746, *YYCURSOR);
+		yyaccept = 90;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy747:
+		YYDEBUG(747, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_FUNC_C);
+}
+yy748:
+		YYDEBUG(748, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy751;
+		if (yych == 'l') goto yy751;
+		goto yy47;
+yy749:
+		YYDEBUG(749, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy752;
+		goto yy47;
+yy750:
+		YYDEBUG(750, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'T') goto yy727;
+		if (yych == 't') goto yy727;
+		goto yy85;
+yy751:
+		YYDEBUG(751, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy754;
+		if (yych == 'e') goto yy754;
+		goto yy47;
+yy752:
+		YYDEBUG(752, *YYCURSOR);
+		yyaccept = 91;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy753:
+		YYDEBUG(753, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_NS_C);
+}
+yy754:
+		YYDEBUG(754, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy755;
+		if (yych != 'r') goto yy47;
+yy755:
+		YYDEBUG(755, *YYCURSOR);
+		yyaccept = 92;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy46;
 		}
+		if (yych == '\\') goto yy160;
+yy756:
+		YYDEBUG(756, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_HALT_COMPILER);
+}
 	}
-yy683:
-	YYDEBUG(683, *YYCURSOR);
-	++YYCURSOR;
-yy684:
-	YYDEBUG(684, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
+/* *********************************** */
+yyc_ST_LOOKING_FOR_PROPERTY:
 	{
+		static const unsigned char yybm = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,  64,  64,   0,   0,  64,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			 64,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128,   0,   0,   0,   0,   0,   0, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0, 128, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(757, *YYCURSOR);
+		YYFILL(4);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 64) {
+			goto yy761;
+		}
+		if (yych <= '?') {
+			if (yych <= '-') {
+				if (yych == '#') goto yy764;
+				if (yych >= '-') goto yy766;
+			} else {
+				if (yych == '/') goto yy767;
+				if (yych >= '?') goto yy768;
+			}
+		} else {
+			if (yych <= '_') {
+				if (yych <= '@') goto yy759;
+				if (yych <= 'Z') goto yy769;
+				if (yych >= '_') goto yy769;
+			} else {
+				if (yych <= '`') goto yy759;
+				if (yych <= 'z') goto yy769;
+				if (yych >= 0x80) goto yy769;
+			}
+		}
+yy759:
+		YYDEBUG(759, *YYCURSOR);
+		++YYCURSOR;
+yy760:
+		YYDEBUG(760, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(0);
 	yy_pop_state();
 	goto restart;
 }
-yy685:
-	YYDEBUG(685, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_LOOKING_FOR_PROPERTY0+yych & 64) {
-		goto yy685;
-	}
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy761:
+		YYDEBUG(761, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(762, *YYCURSOR);
+		if (yybm0+yych & 64) {
+			goto yy761;
+		}
+		YYDEBUG(763, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	goto return_whitespace;
 }
-yy686:
-	YYDEBUG(686, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy764:
+		YYDEBUG(764, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(765, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	while (YYCURSOR < YYLIMIT) {
 		switch (*YYCURSOR++) {
 			case '\r':
@@ -8314,52 +8190,55 @@
 	yyleng = YYCURSOR - SCNG(yy_text);
 	RETURN_OR_SKIP_TOKEN(T_COMMENT);
 }
-yy687:
-	YYDEBUG(687, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy691;
-	goto yy684;
-yy688:
-	YYDEBUG(688, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '*') goto yy692;
-	if (yych == '/') goto yy686;
-	goto yy684;
-yy689:
-	YYDEBUG(689, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '-') goto yy694;
-	goto yy684;
-yy690:
-	YYDEBUG(690, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_LOOKING_FOR_PROPERTY0+yych & 128) {
-		goto yy690;
-	}
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy766:
+		YYDEBUG(766, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy772;
+		goto yy760;
+yy767:
+		YYDEBUG(767, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '*') goto yy774;
+		if (yych == '/') goto yy764;
+		goto yy760;
+yy768:
+		YYDEBUG(768, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '-') goto yy776;
+		goto yy760;
+yy769:
+		YYDEBUG(769, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(770, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy769;
+		}
+		YYDEBUG(771, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_pop_state();
 	RETURN_TOKEN_WITH_STR(T_STRING, 0);
 }
-yy691:
-	YYDEBUG(691, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy772:
+		YYDEBUG(772, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(773, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_OBJECT_OPERATOR);
 }
-yy692:
-	YYDEBUG(692, *YYCURSOR);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '*') goto yy696;
-yy693:
-	YYDEBUG(693, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy774:
+		YYDEBUG(774, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '*') goto yy778;
+yy775:
+		YYDEBUG(775, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	int doc_com;
 
 	if (yyleng > 2) {
@@ -8394,67 +8273,106 @@
 
 	RETURN_OR_SKIP_TOKEN(T_COMMENT);
 }
-yy694:
-	YYDEBUG(694, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy697;
-yy695:
-	YYDEBUG(695, *YYCURSOR);
-	YYCURSOR = YYMARKER;
-	if (yyaccept == 0) {
-		goto yy684;
-	} else {
-		goto yy693;
-	}
-yy696:
-	YYDEBUG(696, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy695;
-		if (yych <= '\n') goto yy698;
-		goto yy695;
-	} else {
-		if (yych <= '\r') goto yy698;
-		if (yych == ' ') goto yy698;
-		goto yy695;
-	}
-yy697:
-	YYDEBUG(697, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy776:
+		YYDEBUG(776, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy779;
+yy777:
+		YYDEBUG(777, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept == 0) {
+			goto yy760;
+		} else {
+			goto yy775;
+		}
+yy778:
+		YYDEBUG(778, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy777;
+			if (yych <= '\n') goto yy781;
+			goto yy777;
+		} else {
+			if (yych <= '\r') goto yy781;
+			if (yych == ' ') goto yy781;
+			goto yy777;
+		}
+yy779:
+		YYDEBUG(779, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(780, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_NULLSAFE_OBJECT_OPERATOR);
 }
-yy698:
-	YYDEBUG(698, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy693;
-		if (yych <= '\n') goto yy698;
-		goto yy693;
-	} else {
-		if (yych <= '\r') goto yy698;
-		if (yych == ' ') goto yy698;
-		goto yy693;
+yy781:
+		YYDEBUG(781, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(782, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy775;
+			if (yych <= '\n') goto yy781;
+			goto yy775;
+		} else {
+			if (yych <= '\r') goto yy781;
+			if (yych == ' ') goto yy781;
+			goto yy775;
+		}
 	}
 /* *********************************** */
 yyc_ST_BACKQUOTE:
-	YYDEBUG(699, *YYCURSOR);
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= '_') {
-		if (yych == '$') goto yy701;
-	} else {
-		if (yych <= '`') goto yy702;
-		if (yych == '{') goto yy703;
-	}
-	++YYCURSOR;
-yy700:
-	YYDEBUG(700, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
 	{
+		static const unsigned char yybm = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128,   0,   0,   0,   0,   0,   0, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0, 128, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(783, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych <= '_') {
+			if (yych == '$') goto yy787;
+		} else {
+			if (yych <= '`') goto yy788;
+			if (yych == '{') goto yy790;
+		}
+		YYDEBUG(785, *YYCURSOR);
+		++YYCURSOR;
+yy786:
+		YYDEBUG(786, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	if (YYCURSOR > YYLIMIT) {
 		RETURN_END_TOKEN;
 	}
@@ -8498,164 +8416,208 @@
 		RETURN_TOKEN(T_ERROR);
 	}
 }
-yy701:
-	YYDEBUG(701, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy700;
-		if (yych <= 'Z') goto yy704;
-		if (yych <= '^') goto yy700;
-		goto yy704;
-	} else {
-		if (yych <= 'z') {
-			if (yych <= '`') goto yy700;
-			goto yy704;
-		} else {
-			if (yych <= '{') goto yy706;
-			if (yych <= 0x7F) goto yy700;
-			goto yy704;
+yy787:
+		YYDEBUG(787, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy786;
+			if (yych <= 'Z') goto yy791;
+			if (yych <= '^') goto yy786;
+			goto yy791;
+		} else {
+			if (yych <= 'z') {
+				if (yych <= '`') goto yy786;
+				goto yy791;
+			} else {
+				if (yych <= '{') goto yy794;
+				if (yych <= 0x7F) goto yy786;
+				goto yy791;
+			}
 		}
-	}
-yy702:
-	YYDEBUG(702, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy788:
+		YYDEBUG(788, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(789, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	BEGIN(ST_IN_SCRIPTING);
 	RETURN_TOKEN('`');
 }
-yy703:
-	YYDEBUG(703, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '$') goto yy707;
-	goto yy700;
-yy704:
-	YYDEBUG(704, *YYCURSOR);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(4);
-	yych = *YYCURSOR;
-	if (yybm_ST_BACKQUOTE0+yych & 128) {
-		goto yy704;
-	}
-	if (yych <= '>') {
-		if (yych == '-') goto yy708;
-	} else {
-		if (yych <= '?') goto yy710;
-		if (yych <= '@') goto yy705;
-		if (yych <= '') goto yy711;
-	}
-yy705:
-	YYDEBUG(705, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy790:
+		YYDEBUG(790, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '$') goto yy796;
+		goto yy786;
+yy791:
+		YYDEBUG(791, *YYCURSOR);
+		YYMARKER = ++YYCURSOR;
+		YYFILL(4);
+		yych = *YYCURSOR;
+		YYDEBUG(792, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy791;
+		}
+		if (yych <= '>') {
+			if (yych == '-') goto yy798;
+		} else {
+			if (yych <= '?') goto yy800;
+			if (yych <= '@') goto yy793;
+			if (yych <= '') goto yy801;
+		}
+yy793:
+		YYDEBUG(793, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy706:
-	YYDEBUG(706, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy794:
+		YYDEBUG(794, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(795, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME);
 	enter_nesting('{');
 	RETURN_TOKEN(T_DOLLAR_OPEN_CURLY_BRACES);
 }
-yy707:
-	YYDEBUG(707, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy796:
+		YYDEBUG(796, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(797, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_IN_SCRIPTING);
 	yyless(1);
 	enter_nesting('{');
 	RETURN_TOKEN(T_CURLY_OPEN);
 }
-yy708:
-	YYDEBUG(708, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy712;
-yy709:
-	YYDEBUG(709, *YYCURSOR);
-	YYCURSOR = YYMARKER;
-	goto yy705;
-yy710:
-	YYDEBUG(710, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '-') goto yy713;
-	goto yy709;
-yy711:
-	YYDEBUG(711, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy798:
+		YYDEBUG(798, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy803;
+yy799:
+		YYDEBUG(799, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy793;
+yy800:
+		YYDEBUG(800, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '-') goto yy804;
+		goto yy799;
+yy801:
+		YYDEBUG(801, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(802, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy712:
-	YYDEBUG(712, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy709;
-		if (yych <= 'Z') goto yy714;
-		if (yych <= '^') goto yy709;
-		goto yy714;
-	} else {
-		if (yych <= '`') goto yy709;
-		if (yych <= 'z') goto yy714;
-		if (yych <= 0x7F) goto yy709;
-		goto yy714;
-	}
-yy713:
-	YYDEBUG(713, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy715;
-	goto yy709;
-yy714:
-	YYDEBUG(714, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy803:
+		YYDEBUG(803, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy799;
+			if (yych <= 'Z') goto yy805;
+			if (yych <= '^') goto yy799;
+			goto yy805;
+		} else {
+			if (yych <= '`') goto yy799;
+			if (yych <= 'z') goto yy805;
+			if (yych <= 0x7F) goto yy799;
+			goto yy805;
+		}
+yy804:
+		YYDEBUG(804, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy807;
+		goto yy799;
+yy805:
+		YYDEBUG(805, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(806, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy715:
-	YYDEBUG(715, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy709;
-		if (yych <= 'Z') goto yy716;
-		if (yych <= '^') goto yy709;
-	} else {
-		if (yych <= '`') goto yy709;
-		if (yych <= 'z') goto yy716;
-		if (yych <= 0x7F) goto yy709;
-	}
-yy716:
-	YYDEBUG(716, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy807:
+		YYDEBUG(807, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy799;
+			if (yych <= 'Z') goto yy808;
+			if (yych <= '^') goto yy799;
+		} else {
+			if (yych <= '`') goto yy799;
+			if (yych <= 'z') goto yy808;
+			if (yych <= 0x7F) goto yy799;
+		}
+yy808:
+		YYDEBUG(808, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(809, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 4);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
+	}
 /* *********************************** */
 yyc_ST_DOUBLE_QUOTES:
-	YYDEBUG(717, *YYCURSOR);
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= '#') {
-		if (yych == '"') goto yy719;
-	} else {
-		if (yych <= '$') goto yy720;
-		if (yych == '{') goto yy721;
-	}
-	++YYCURSOR;
-yy718:
-	YYDEBUG(718, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
 	{
+		static const unsigned char yybm = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128,   0,   0,   0,   0,   0,   0, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0, 128, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(810, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych <= '#') {
+			if (yych == '"') goto yy814;
+		} else {
+			if (yych <= '$') goto yy816;
+			if (yych == '{') goto yy817;
+		}
+		YYDEBUG(812, *YYCURSOR);
+		++YYCURSOR;
+yy813:
+		YYDEBUG(813, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) {
 		YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1;
 		SET_DOUBLE_QUOTES_SCANNED_LENGTH(0);
@@ -8707,160 +8669,204 @@
 		RETURN_TOKEN(T_ERROR);
 	}
 }
-yy719:
-	YYDEBUG(719, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy814:
+		YYDEBUG(814, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(815, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	BEGIN(ST_IN_SCRIPTING);
 	RETURN_TOKEN('"');
 }
-yy720:
-	YYDEBUG(720, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy718;
-		if (yych <= 'Z') goto yy722;
-		if (yych <= '^') goto yy718;
-		goto yy722;
-	} else {
-		if (yych <= 'z') {
-			if (yych <= '`') goto yy718;
-			goto yy722;
-		} else {
-			if (yych <= '{') goto yy724;
-			if (yych <= 0x7F) goto yy718;
-			goto yy722;
-		}
-	}
-yy721:
-	YYDEBUG(721, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '$') goto yy725;
-	goto yy718;
-yy722:
-	YYDEBUG(722, *YYCURSOR);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(4);
-	yych = *YYCURSOR;
-	if (yybm_ST_DOUBLE_QUOTES0+yych & 128) {
-		goto yy722;
-	}
-	if (yych <= '>') {
-		if (yych == '-') goto yy726;
-	} else {
-		if (yych <= '?') goto yy728;
-		if (yych <= '@') goto yy723;
-		if (yych <= '') goto yy729;
-	}
-yy723:
-	YYDEBUG(723, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy816:
+		YYDEBUG(816, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy813;
+			if (yych <= 'Z') goto yy818;
+			if (yych <= '^') goto yy813;
+			goto yy818;
+		} else {
+			if (yych <= 'z') {
+				if (yych <= '`') goto yy813;
+				goto yy818;
+			} else {
+				if (yych <= '{') goto yy821;
+				if (yych <= 0x7F) goto yy813;
+				goto yy818;
+			}
+		}
+yy817:
+		YYDEBUG(817, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '$') goto yy823;
+		goto yy813;
+yy818:
+		YYDEBUG(818, *YYCURSOR);
+		YYMARKER = ++YYCURSOR;
+		YYFILL(4);
+		yych = *YYCURSOR;
+		YYDEBUG(819, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy818;
+		}
+		if (yych <= '>') {
+			if (yych == '-') goto yy825;
+		} else {
+			if (yych <= '?') goto yy827;
+			if (yych <= '@') goto yy820;
+			if (yych <= '') goto yy828;
+		}
+yy820:
+		YYDEBUG(820, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy724:
-	YYDEBUG(724, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy821:
+		YYDEBUG(821, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(822, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME);
 	enter_nesting('{');
 	RETURN_TOKEN(T_DOLLAR_OPEN_CURLY_BRACES);
 }
-yy725:
-	YYDEBUG(725, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy823:
+		YYDEBUG(823, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(824, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_IN_SCRIPTING);
 	yyless(1);
 	enter_nesting('{');
 	RETURN_TOKEN(T_CURLY_OPEN);
 }
-yy726:
-	YYDEBUG(726, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy730;
-yy727:
-	YYDEBUG(727, *YYCURSOR);
-	YYCURSOR = YYMARKER;
-	goto yy723;
-yy728:
-	YYDEBUG(728, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '-') goto yy731;
-	goto yy727;
-yy729:
-	YYDEBUG(729, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy825:
+		YYDEBUG(825, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy830;
+yy826:
+		YYDEBUG(826, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy820;
+yy827:
+		YYDEBUG(827, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '-') goto yy831;
+		goto yy826;
+yy828:
+		YYDEBUG(828, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(829, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy730:
-	YYDEBUG(730, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy727;
-		if (yych <= 'Z') goto yy732;
-		if (yych <= '^') goto yy727;
-		goto yy732;
-	} else {
-		if (yych <= '`') goto yy727;
-		if (yych <= 'z') goto yy732;
-		if (yych <= 0x7F) goto yy727;
-		goto yy732;
-	}
-yy731:
-	YYDEBUG(731, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy733;
-	goto yy727;
-yy732:
-	YYDEBUG(732, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy830:
+		YYDEBUG(830, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy826;
+			if (yych <= 'Z') goto yy832;
+			if (yych <= '^') goto yy826;
+			goto yy832;
+		} else {
+			if (yych <= '`') goto yy826;
+			if (yych <= 'z') goto yy832;
+			if (yych <= 0x7F) goto yy826;
+			goto yy832;
+		}
+yy831:
+		YYDEBUG(831, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy834;
+		goto yy826;
+yy832:
+		YYDEBUG(832, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(833, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy733:
-	YYDEBUG(733, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy727;
-		if (yych <= 'Z') goto yy734;
-		if (yych <= '^') goto yy727;
-	} else {
-		if (yych <= '`') goto yy727;
-		if (yych <= 'z') goto yy734;
-		if (yych <= 0x7F) goto yy727;
-	}
-yy734:
-	YYDEBUG(734, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy834:
+		YYDEBUG(834, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy826;
+			if (yych <= 'Z') goto yy835;
+			if (yych <= '^') goto yy826;
+		} else {
+			if (yych <= '`') goto yy826;
+			if (yych <= 'z') goto yy835;
+			if (yych <= 0x7F) goto yy826;
+		}
+yy835:
+		YYDEBUG(835, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(836, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 4);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
+	}
 /* *********************************** */
 yyc_ST_HEREDOC:
-	YYDEBUG(735, *YYCURSOR);
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych == '$') goto yy737;
-	if (yych == '{') goto yy738;
-	++YYCURSOR;
-yy736:
-	YYDEBUG(736, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
 	{
+		static const unsigned char yybm = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128,   0,   0,   0,   0,   0,   0, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0, 128, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(837, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych == '$') goto yy841;
+		if (yych == '{') goto yy842;
+		YYDEBUG(839, *YYCURSOR);
+		++YYCURSOR;
+yy840:
+		YYDEBUG(840, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	zend_heredoc_label *heredoc_label = zend_ptr_stack_top(&SCNG(heredoc_label_stack));
 	int newline = 0, indentation = 0, spacing = 0;
 
@@ -8982,339 +8988,420 @@
 
 	RETURN_TOKEN_WITH_VAL(T_ENCAPSED_AND_WHITESPACE);
 }
-yy737:
-	YYDEBUG(737, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy736;
-		if (yych <= 'Z') goto yy739;
-		if (yych <= '^') goto yy736;
-		goto yy739;
-	} else {
-		if (yych <= 'z') {
-			if (yych <= '`') goto yy736;
-			goto yy739;
-		} else {
-			if (yych <= '{') goto yy741;
-			if (yych <= 0x7F) goto yy736;
-			goto yy739;
-		}
-	}
-yy738:
-	YYDEBUG(738, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '$') goto yy742;
-	goto yy736;
-yy739:
-	YYDEBUG(739, *YYCURSOR);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(4);
-	yych = *YYCURSOR;
-	if (yybm_ST_HEREDOC0+yych & 128) {
-		goto yy739;
-	}
-	if (yych <= '>') {
-		if (yych == '-') goto yy743;
-	} else {
-		if (yych <= '?') goto yy745;
-		if (yych <= '@') goto yy740;
-		if (yych <= '') goto yy746;
-	}
-yy740:
-	YYDEBUG(740, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy841:
+		YYDEBUG(841, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy840;
+			if (yych <= 'Z') goto yy843;
+			if (yych <= '^') goto yy840;
+			goto yy843;
+		} else {
+			if (yych <= 'z') {
+				if (yych <= '`') goto yy840;
+				goto yy843;
+			} else {
+				if (yych <= '{') goto yy846;
+				if (yych <= 0x7F) goto yy840;
+				goto yy843;
+			}
+		}
+yy842:
+		YYDEBUG(842, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '$') goto yy848;
+		goto yy840;
+yy843:
+		YYDEBUG(843, *YYCURSOR);
+		YYMARKER = ++YYCURSOR;
+		YYFILL(4);
+		yych = *YYCURSOR;
+		YYDEBUG(844, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy843;
+		}
+		if (yych <= '>') {
+			if (yych == '-') goto yy850;
+		} else {
+			if (yych <= '?') goto yy852;
+			if (yych <= '@') goto yy845;
+			if (yych <= '') goto yy853;
+		}
+yy845:
+		YYDEBUG(845, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy741:
-	YYDEBUG(741, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy846:
+		YYDEBUG(846, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(847, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME);
 	enter_nesting('{');
 	RETURN_TOKEN(T_DOLLAR_OPEN_CURLY_BRACES);
 }
-yy742:
-	YYDEBUG(742, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy848:
+		YYDEBUG(848, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(849, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_IN_SCRIPTING);
 	yyless(1);
 	enter_nesting('{');
 	RETURN_TOKEN(T_CURLY_OPEN);
 }
-yy743:
-	YYDEBUG(743, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy747;
-yy744:
-	YYDEBUG(744, *YYCURSOR);
-	YYCURSOR = YYMARKER;
-	goto yy740;
-yy745:
-	YYDEBUG(745, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '-') goto yy748;
-	goto yy744;
-yy746:
-	YYDEBUG(746, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy850:
+		YYDEBUG(850, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy855;
+yy851:
+		YYDEBUG(851, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy845;
+yy852:
+		YYDEBUG(852, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '-') goto yy856;
+		goto yy851;
+yy853:
+		YYDEBUG(853, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(854, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy747:
-	YYDEBUG(747, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy744;
-		if (yych <= 'Z') goto yy749;
-		if (yych <= '^') goto yy744;
-		goto yy749;
-	} else {
-		if (yych <= '`') goto yy744;
-		if (yych <= 'z') goto yy749;
-		if (yych <= 0x7F) goto yy744;
-		goto yy749;
-	}
-yy748:
-	YYDEBUG(748, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy750;
-	goto yy744;
-yy749:
-	YYDEBUG(749, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy855:
+		YYDEBUG(855, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy851;
+			if (yych <= 'Z') goto yy857;
+			if (yych <= '^') goto yy851;
+			goto yy857;
+		} else {
+			if (yych <= '`') goto yy851;
+			if (yych <= 'z') goto yy857;
+			if (yych <= 0x7F) goto yy851;
+			goto yy857;
+		}
+yy856:
+		YYDEBUG(856, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy859;
+		goto yy851;
+yy857:
+		YYDEBUG(857, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(858, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy750:
-	YYDEBUG(750, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy744;
-		if (yych <= 'Z') goto yy751;
-		if (yych <= '^') goto yy744;
-	} else {
-		if (yych <= '`') goto yy744;
-		if (yych <= 'z') goto yy751;
-		if (yych <= 0x7F) goto yy744;
-	}
-yy751:
-	YYDEBUG(751, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy859:
+		YYDEBUG(859, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy851;
+			if (yych <= 'Z') goto yy860;
+			if (yych <= '^') goto yy851;
+		} else {
+			if (yych <= '`') goto yy851;
+			if (yych <= 'z') goto yy860;
+			if (yych <= 0x7F) goto yy851;
+		}
+yy860:
+		YYDEBUG(860, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(861, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 4);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
+	}
 /* *********************************** */
 yyc_ST_LOOKING_FOR_VARNAME:
-	YYDEBUG(752, *YYCURSOR);
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy753;
-		if (yych <= 'Z') goto yy755;
-		if (yych >= '_') goto yy755;
-	} else {
-		if (yych <= '`') goto yy753;
-		if (yych <= 'z') goto yy755;
-		if (yych >= 0x80) goto yy755;
-	}
-yy753:
-	YYDEBUG(753, *YYCURSOR);
-	++YYCURSOR;
-yy754:
-	YYDEBUG(754, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
 	{
+		static const unsigned char yybm = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128,   0,   0,   0,   0,   0,   0, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0, 128, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(862, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy864;
+			if (yych <= 'Z') goto yy866;
+			if (yych >= '_') goto yy866;
+		} else {
+			if (yych <= '`') goto yy864;
+			if (yych <= 'z') goto yy866;
+			if (yych >= 0x80) goto yy866;
+		}
+yy864:
+		YYDEBUG(864, *YYCURSOR);
+		++YYCURSOR;
+yy865:
+		YYDEBUG(865, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(0);
 	yy_pop_state();
 	yy_push_state(ST_IN_SCRIPTING);
 	goto restart;
 }
-yy755:
-	YYDEBUG(755, *YYCURSOR);
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '_') {
-		if (yych <= '@') {
-			if (yych <= '/') goto yy754;
-			if (yych <= '9') goto yy757;
-			goto yy754;
-		} else {
-			if (yych <= '') goto yy757;
-			if (yych <= '^') goto yy754;
-			goto yy757;
-		}
-	} else {
-		if (yych <= '|') {
-			if (yych <= '`') goto yy754;
-			if (yych <= 'z') goto yy757;
-			goto yy754;
-		} else {
-			if (yych <= '}') goto yy757;
-			if (yych <= 0x7F) goto yy754;
-			goto yy757;
+yy866:
+		YYDEBUG(866, *YYCURSOR);
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '_') {
+			if (yych <= '@') {
+				if (yych <= '/') goto yy865;
+				if (yych <= '9') goto yy868;
+				goto yy865;
+			} else {
+				if (yych <= '') goto yy868;
+				if (yych <= '^') goto yy865;
+				goto yy868;
+			}
+		} else {
+			if (yych <= '|') {
+				if (yych <= '`') goto yy865;
+				if (yych <= 'z') goto yy868;
+				goto yy865;
+			} else {
+				if (yych <= '}') goto yy868;
+				if (yych <= 0x7F) goto yy865;
+				goto yy868;
+			}
 		}
-	}
-yy756:
-	YYDEBUG(756, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-yy757:
-	YYDEBUG(757, *YYCURSOR);
-	if (yybm_ST_LOOKING_FOR_VARNAME0+yych & 128) {
-		goto yy756;
-	}
-	if (yych <= '@') goto yy758;
-	if (yych <= '') goto yy759;
-	if (yych == '}') goto yy759;
-yy758:
-	YYDEBUG(758, *YYCURSOR);
-	YYCURSOR = YYMARKER;
-	goto yy754;
-yy759:
-	YYDEBUG(759, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy867:
+		YYDEBUG(867, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy868:
+		YYDEBUG(868, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy867;
+		}
+		if (yych <= '@') goto yy869;
+		if (yych <= '') goto yy870;
+		if (yych == '}') goto yy870;
+yy869:
+		YYDEBUG(869, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy865;
+yy870:
+		YYDEBUG(870, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(871, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 1);
 	yy_pop_state();
 	yy_push_state(ST_IN_SCRIPTING);
 	RETURN_TOKEN_WITH_STR(T_STRING_VARNAME, 0);
 }
+	}
 /* *********************************** */
 yyc_ST_VAR_OFFSET:
-	YYDEBUG(760, *YYCURSOR);
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= '0') {
-		if (yych <= ' ') {
-			if (yych <= '\f') {
-				if (yych <= 0x08) goto yy761;
-				if (yych <= '\n') goto yy762;
+	{
+		static const unsigned char yybm = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			248, 248, 216, 216, 216, 216, 216, 216, 
+			152, 152,   0,   0,   0,   0,   0,   0, 
+			  0, 144, 144, 144, 144, 144, 144,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,   0,   0,   0,   0,  16, 
+			  0, 144, 144, 144, 144, 144, 144,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,   0,   0,   0,   0,   0, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+		};
+		YYDEBUG(872, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych <= '0') {
+			if (yych <= ' ') {
+				if (yych <= '\f') {
+					if (yych <= 0x08) goto yy874;
+					if (yych <= '\n') goto yy876;
+				} else {
+					if (yych <= '\r') goto yy876;
+					if (yych >= ' ') goto yy876;
+				}
 			} else {
-				if (yych <= '\r') goto yy762;
-				if (yych >= ' ') goto yy762;
-			}
-		} else {
-			if (yych <= '$') {
-				if (yych <= '"') goto yy763;
-				if (yych <= '#') goto yy762;
-				goto yy765;
-			} else {
-				if (yych == '\'') goto yy762;
-				if (yych <= '/') goto yy763;
-				goto yy766;
-			}
-		}
-	} else {
-		if (yych <= '') {
-			if (yych <= 'Z') {
-				if (yych <= '9') goto yy768;
-				if (yych <= '@') goto yy763;
-				goto yy769;
-			} else {
-				if (yych <= '') goto yy763;
-				if (yych <= '\\') goto yy762;
-				goto yy770;
+				if (yych <= '$') {
+					if (yych <= '"') goto yy878;
+					if (yych <= '#') goto yy876;
+					goto yy880;
+				} else {
+					if (yych == '\'') goto yy876;
+					if (yych <= '/') goto yy878;
+					goto yy881;
+				}
 			}
 		} else {
-			if (yych <= '`') {
-				if (yych == '_') goto yy769;
-				goto yy763;
+			if (yych <= '') {
+				if (yych <= 'Z') {
+					if (yych <= '9') goto yy883;
+					if (yych <= '@') goto yy878;
+					goto yy885;
+				} else {
+					if (yych <= '') goto yy878;
+					if (yych <= '\\') goto yy876;
+					goto yy888;
+				}
 			} else {
-				if (yych <= 'z') goto yy769;
-				if (yych <= '~') goto yy763;
-				if (yych >= 0x80) goto yy769;
+				if (yych <= '`') {
+					if (yych == '_') goto yy885;
+					goto yy878;
+				} else {
+					if (yych <= 'z') goto yy885;
+					if (yych <= '~') goto yy878;
+					if (yych >= 0x80) goto yy885;
+				}
 			}
 		}
-	}
-yy761:
-	YYDEBUG(761, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy874:
+		YYDEBUG(874, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(875, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	if (YYCURSOR > YYLIMIT) {
 		RETURN_END_TOKEN;
 	}
 
 	RETURN_TOKEN(T_BAD_CHARACTER);
 }
-yy762:
-	YYDEBUG(762, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy876:
+		YYDEBUG(876, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(877, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* Invalid rule to return a more explicit parse error with proper line number */
 	yyless(0);
 	yy_pop_state();
 	ZVAL_NULL(zendlval);
 	RETURN_TOKEN_WITH_VAL(T_ENCAPSED_AND_WHITESPACE);
 }
-yy763:
-	YYDEBUG(763, *YYCURSOR);
-	++YYCURSOR;
-yy764:
-	YYDEBUG(764, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy878:
+		YYDEBUG(878, *YYCURSOR);
+		++YYCURSOR;
+yy879:
+		YYDEBUG(879, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* Only '' or '-' can be valid, but returning other tokens will allow a more explicit parse error */
 	RETURN_TOKEN(yytext0);
 }
-yy765:
-	YYDEBUG(765, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy764;
-		if (yych <= 'Z') goto yy771;
-		if (yych <= '^') goto yy764;
-		goto yy771;
-	} else {
-		if (yych <= '`') goto yy764;
-		if (yych <= 'z') goto yy771;
-		if (yych <= 0x7F) goto yy764;
-		goto yy771;
-	}
-yy766:
-	YYDEBUG(766, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'X') {
-		if (yych <= 'B') {
-			if (yych <= '/') goto yy767;
-			if (yych <= '9') goto yy773;
-			if (yych >= 'B') goto yy775;
-		} else {
-			if (yych == 'O') goto yy777;
-			if (yych >= 'X') goto yy778;
-		}
-	} else {
-		if (yych <= 'b') {
-			if (yych == '_') goto yy779;
-			if (yych >= 'b') goto yy775;
+yy880:
+		YYDEBUG(880, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy879;
+			if (yych <= 'Z') goto yy890;
+			if (yych <= '^') goto yy879;
+			goto yy890;
+		} else {
+			if (yych <= '`') goto yy879;
+			if (yych <= 'z') goto yy890;
+			if (yych <= 0x7F) goto yy879;
+			goto yy890;
+		}
+yy881:
+		YYDEBUG(881, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'X') {
+			if (yych <= 'B') {
+				if (yych <= '/') goto yy882;
+				if (yych <= '9') goto yy893;
+				if (yych >= 'B') goto yy896;
+			} else {
+				if (yych == 'O') goto yy898;
+				if (yych >= 'X') goto yy899;
+			}
 		} else {
-			if (yych <= 'o') {
-				if (yych >= 'o') goto yy777;
+			if (yych <= 'b') {
+				if (yych == '_') goto yy900;
+				if (yych >= 'b') goto yy896;
 			} else {
-				if (yych == 'x') goto yy778;
+				if (yych <= 'o') {
+					if (yych >= 'o') goto yy898;
+				} else {
+					if (yych == 'x') goto yy899;
+				}
 			}
 		}
-	}
-yy767:
-	YYDEBUG(767, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Offset could be treated as a long */
+yy882:
+		YYDEBUG(882, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Offset could be treated as a long */
 	if (yyleng < MAX_LENGTH_OF_LONG - 1 || (yyleng == MAX_LENGTH_OF_LONG - 1 && strcmp(yytext, long_min_digits) < 0)) {
 		char *end;
 		errno = 0;
@@ -9329,76 +9416,82 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_NUM_STRING);
 }
-yy768:
-	YYDEBUG(768, *YYCURSOR);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET0+yych & 8) {
-		goto yy768;
-	}
-	if (yych == '_') goto yy779;
-	goto yy767;
-yy769:
-	YYDEBUG(769, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET0+yych & 16) {
-		goto yy769;
-	}
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy883:
+		YYDEBUG(883, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(884, *YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy883;
+		}
+		if (yych == '_') goto yy900;
+		goto yy882;
+yy885:
+		YYDEBUG(885, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(886, *YYCURSOR);
+		if (yybm0+yych & 16) {
+			goto yy885;
+		}
+		YYDEBUG(887, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_STR(T_STRING, 0);
 }
-yy770:
-	YYDEBUG(770, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy888:
+		YYDEBUG(888, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(889, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_pop_state();
 	RETURN_TOKEN('');
 }
-yy771:
-	YYDEBUG(771, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '^') {
-		if (yych <= '9') {
-			if (yych >= '0') goto yy771;
-		} else {
-			if (yych <= '@') goto yy772;
-			if (yych <= 'Z') goto yy771;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= '_') goto yy771;
+yy890:
+		YYDEBUG(890, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(891, *YYCURSOR);
+		if (yych <= '^') {
+			if (yych <= '9') {
+				if (yych >= '0') goto yy890;
+			} else {
+				if (yych <= '@') goto yy892;
+				if (yych <= 'Z') goto yy890;
+			}
 		} else {
-			if (yych <= 'z') goto yy771;
-			if (yych >= 0x80) goto yy771;
+			if (yych <= '`') {
+				if (yych <= '_') goto yy890;
+			} else {
+				if (yych <= 'z') goto yy890;
+				if (yych >= 0x80) goto yy890;
+			}
 		}
-	}
-yy772:
-	YYDEBUG(772, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy892:
+		YYDEBUG(892, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy773:
-	YYDEBUG(773, *YYCURSOR);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy774;
-	if (yych <= '9') goto yy773;
-	if (yych == '_') goto yy779;
-yy774:
-	YYDEBUG(774, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Offset must be treated as a string */
+yy893:
+		YYDEBUG(893, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(894, *YYCURSOR);
+		if (yych <= '/') goto yy895;
+		if (yych <= '9') goto yy893;
+		if (yych == '_') goto yy900;
+yy895:
+		YYDEBUG(895, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Offset must be treated as a string */
 	if (yyleng == 1) {
 		ZVAL_INTERNED_STR(zendlval, ZSTR_CHAR((zend_uchar)*(yytext)));
 	} else {
@@ -9406,124 +9499,169 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_NUM_STRING);
 }
-yy775:
-	YYDEBUG(775, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET0+yych & 32) {
-		goto yy780;
-	}
-yy776:
-	YYDEBUG(776, *YYCURSOR);
-	YYCURSOR = YYMARKER;
-	if (yyaccept == 0) {
-		goto yy767;
-	} else {
-		goto yy774;
-	}
-yy777:
-	YYDEBUG(777, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET0+yych & 64) {
-		goto yy781;
-	}
-	goto yy776;
-yy778:
-	YYDEBUG(778, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET0+yych & 128) {
-		goto yy782;
-	}
-	goto yy776;
-yy779:
-	YYDEBUG(779, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy776;
-	if (yych <= '9') goto yy773;
-	goto yy776;
-yy780:
-	YYDEBUG(780, *YYCURSOR);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET0+yych & 32) {
-		goto yy780;
-	}
-	if (yych == '_') goto yy775;
-	goto yy774;
-yy781:
-	YYDEBUG(781, *YYCURSOR);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET0+yych & 64) {
-		goto yy781;
-	}
-	if (yych == '_') goto yy777;
-	goto yy774;
-yy782:
-	YYDEBUG(782, *YYCURSOR);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET0+yych & 128) {
-		goto yy782;
+yy896:
+		YYDEBUG(896, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 32) {
+			goto yy901;
+		}
+yy897:
+		YYDEBUG(897, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept == 0) {
+			goto yy882;
+		} else {
+			goto yy895;
+		}
+yy898:
+		YYDEBUG(898, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 64) {
+			goto yy903;
+		}
+		goto yy897;
+yy899:
+		YYDEBUG(899, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 128) {
+			goto yy905;
+		}
+		goto yy897;
+yy900:
+		YYDEBUG(900, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '/') goto yy897;
+		if (yych <= '9') goto yy893;
+		goto yy897;
+yy901:
+		YYDEBUG(901, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(902, *YYCURSOR);
+		if (yybm0+yych & 32) {
+			goto yy901;
+		}
+		if (yych == '_') goto yy896;
+		goto yy895;
+yy903:
+		YYDEBUG(903, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(904, *YYCURSOR);
+		if (yybm0+yych & 64) {
+			goto yy903;
+		}
+		if (yych == '_') goto yy898;
+		goto yy895;
+yy905:
+		YYDEBUG(905, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(906, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy905;
+		}
+		if (yych == '_') goto yy899;
+		goto yy895;
 	}
-	if (yych == '_') goto yy778;
-	goto yy774;
 /* *********************************** */
 yyc_SHEBANG:
-	YYDEBUG(783, *YYCURSOR);
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych == '#') goto yy785;
-	++YYCURSOR;
-yy784:
-	YYDEBUG(784, *YYCURSOR);
-	yyleng = YYCURSOR - SCNG(yy_text);
 	{
+		static const unsigned char yybm = {
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128,   0, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(907, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych == '#') goto yy911;
+		YYDEBUG(909, *YYCURSOR);
+		++YYCURSOR;
+yy910:
+		YYDEBUG(910, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(0);
 	BEGIN(INITIAL);
 	goto restart;
 }
-yy785:
-	YYDEBUG(785, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych != '!') goto yy784;
-yy786:
-	YYDEBUG(786, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_SHEBANG0+yych & 128) {
-		goto yy786;
-	}
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy911:
+		YYDEBUG(911, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych != '!') goto yy910;
+yy912:
+		YYDEBUG(912, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(913, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy912;
+		}
+		YYDEBUG(914, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(915, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	CG(zend_lineno)++;
 	BEGIN(INITIAL);
 	goto restart;
 }
+	}
 /* *********************************** */
 yyc_INITIAL:
-	YYDEBUG(787, *YYCURSOR);
+	YYDEBUG(916, *YYCURSOR);
 	YYFILL(7);
 	yych = *YYCURSOR;
-	if (yych == '<') goto yy789;
+	if (yych == '<') goto yy920;
+	YYDEBUG(918, *YYCURSOR);
 	++YYCURSOR;
-yy788:
-	YYDEBUG(788, *YYCURSOR);
+yy919:
+	YYDEBUG(919, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	if (YYCURSOR > YYLIMIT) {
@@ -9576,19 +9714,20 @@
 	HANDLE_NEWLINES(yytext, yyleng);
 	RETURN_TOKEN_WITH_VAL(T_INLINE_HTML);
 }
-yy789:
-	YYDEBUG(789, *YYCURSOR);
+yy920:
+	YYDEBUG(920, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != '?') goto yy788;
+	if (yych != '?') goto yy919;
+	YYDEBUG(921, *YYCURSOR);
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'O') {
-		if (yych == '=') goto yy791;
+		if (yych == '=') goto yy923;
 	} else {
-		if (yych <= 'P') goto yy792;
-		if (yych == 'p') goto yy792;
+		if (yych <= 'P') goto yy925;
+		if (yych == 'p') goto yy925;
 	}
-yy790:
-	YYDEBUG(790, *YYCURSOR);
+yy922:
+	YYDEBUG(922, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	if (CG(short_tags)) {
@@ -9598,9 +9737,10 @@
 		goto inline_char_handler;
 	}
 }
-yy791:
-	YYDEBUG(791, *YYCURSOR);
+yy923:
+	YYDEBUG(923, *YYCURSOR);
 	++YYCURSOR;
+	YYDEBUG(924, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	BEGIN(ST_IN_SCRIPTING);
@@ -9610,32 +9750,32 @@
 	}
 	RETURN_TOKEN(T_OPEN_TAG_WITH_ECHO);
 }
-yy792:
-	YYDEBUG(792, *YYCURSOR);
+yy925:
+	YYDEBUG(925, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy794;
-	if (yych == 'h') goto yy794;
-yy793:
-	YYDEBUG(793, *YYCURSOR);
+	if (yych == 'H') goto yy927;
+	if (yych == 'h') goto yy927;
+yy926:
+	YYDEBUG(926, *YYCURSOR);
 	YYCURSOR = YYMARKER;
-	goto yy790;
-yy794:
-	YYDEBUG(794, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy795;
-	if (yych != 'p') goto yy793;
-yy795:
-	YYDEBUG(795, *YYCURSOR);
+	goto yy922;
+yy927:
+	YYDEBUG(927, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == 'P') goto yy928;
+	if (yych != 'p') goto yy926;
+yy928:
+	YYDEBUG(928, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy796;
-		if (yych <= '\n') goto yy797;
+		if (yych <= 0x08) goto yy929;
+		if (yych <= '\n') goto yy930;
 	} else {
-		if (yych <= '\r') goto yy799;
-		if (yych == ' ') goto yy797;
+		if (yych <= '\r') goto yy932;
+		if (yych == ' ') goto yy930;
 	}
-yy796:
-	YYDEBUG(796, *YYCURSOR);
+yy929:
+	YYDEBUG(929, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	/* Allow <?php followed by end of file. */
@@ -9651,27 +9791,30 @@
 	}
 	goto inline_char_handler;
 }
-yy797:
-	YYDEBUG(797, *YYCURSOR);
+yy930:
+	YYDEBUG(930, *YYCURSOR);
 	++YYCURSOR;
-yy798:
-	YYDEBUG(798, *YYCURSOR);
+yy931:
+	YYDEBUG(931, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	HANDLE_NEWLINE(yytextyyleng-1);
 	BEGIN(ST_IN_SCRIPTING);
 	RETURN_OR_SKIP_TOKEN(T_OPEN_TAG);
 }
-yy799:
-	YYDEBUG(799, *YYCURSOR);
+yy932:
+	YYDEBUG(932, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy797;
-	goto yy798;
+	if (yych == '\n') goto yy930;
+	goto yy931;
 /* *********************************** */
 yyc_ST_END_HEREDOC:
-	YYDEBUG(800, *YYCURSOR);
+	YYDEBUG(933, *YYCURSOR);
 	YYFILL(1);
+	yych = *YYCURSOR;
+	YYDEBUG(935, *YYCURSOR);
 	++YYCURSOR;
+	YYDEBUG(936, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack));
@@ -9687,9 +9830,12 @@
 }
 /* *********************************** */
 yyc_ST_NOWDOC:
-	YYDEBUG(801, *YYCURSOR);
+	YYDEBUG(937, *YYCURSOR);
 	YYFILL(1);
+	yych = *YYCURSOR;
+	YYDEBUG(939, *YYCURSOR);
 	++YYCURSOR;
+	YYDEBUG(940, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	zend_heredoc_label *heredoc_label = zend_ptr_stack_top(&SCNG(heredoc_label_stack));

php-8.2.23.tar.xz/Zend/zend_language_scanner.l -> php-8.2.28.tar.xz/Zend/zend_language_scanner.l Changed

php-8.2.23.tar.xz/Zend/zend_language_scanner_defs.h -> php-8.2.28.tar.xz/Zend/zend_language_scanner_defs.h Changed

php-8.2.23.tar.xz/Zend/zend_max_execution_timer.c -> php-8.2.28.tar.xz/Zend/zend_max_execution_timer.c Changed

php-8.2.23.tar.xz/Zend/zend_object_handlers.c -> php-8.2.28.tar.xz/Zend/zend_object_handlers.c Changed

@@ -30,6 +30,7 @@
 #include "zend_closures.h"
 #include "zend_compile.h"
 #include "zend_hash.h"
+#include "zend_observer.h"
 
 #define DEBUG_OBJECT_HANDLERS 0
 
@@ -1280,7 +1281,10 @@
 	func->arg_flags0 = 0;
 	func->arg_flags1 = 0;
 	func->arg_flags2 = 0;
-	func->fn_flags = ZEND_ACC_CALL_VIA_TRAMPOLINE | ZEND_ACC_PUBLIC | ZEND_ACC_VARIADIC;
+	func->fn_flags = ZEND_ACC_CALL_VIA_TRAMPOLINE
+		| ZEND_ACC_PUBLIC
+		| ZEND_ACC_VARIADIC
+		| (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE);
 	if (is_static) {
 		func->fn_flags |= ZEND_ACC_STATIC;
 	}
@@ -1294,7 +1298,8 @@
 	 * value so that it doesn't contain garbage when the engine allocates space for the next stack
 	 * frame. This didn't cause any issues until now due to "lucky" structure layout. */
 	func->last_var = 0;
-	func->T = (fbc->type == ZEND_USER_FUNCTION)? MAX(fbc->op_array.last_var + fbc->op_array.T, 2) : 2;
+	uint32_t min_T = 2 + ZEND_OBSERVER_ENABLED;
+	func->T = (fbc->type == ZEND_USER_FUNCTION)? MAX(fbc->op_array.last_var + fbc->op_array.T, min_T) : min_T;
 	func->filename = (fbc->type == ZEND_USER_FUNCTION)? fbc->op_array.filename : ZSTR_EMPTY_ALLOC();
 	func->line_start = (fbc->type == ZEND_USER_FUNCTION)? fbc->op_array.line_start : 0;
 	func->line_end = (fbc->type == ZEND_USER_FUNCTION)? fbc->op_array.line_end : 0;

php-8.2.23.tar.xz/Zend/zend_operators.h -> php-8.2.28.tar.xz/Zend/zend_operators.h Changed

php-8.2.23.tar.xz/Zend/zend_portability.h -> php-8.2.28.tar.xz/Zend/zend_portability.h Changed

php-8.2.23.tar.xz/Zend/zend_string.c -> php-8.2.28.tar.xz/Zend/zend_string.c Changed

@@ -23,6 +23,10 @@
 # include "valgrind/callgrind.h"
 #endif
 
+#if __has_feature(memory_sanitizer)
+# include <sanitizer/msan_interface.h>
+#endif
+
 ZEND_API zend_new_interned_string_func_t zend_new_interned_string;
 ZEND_API zend_string_init_interned_func_t zend_string_init_interned;
 ZEND_API zend_string_init_existing_interned_func_t zend_string_init_existing_interned;
@@ -388,32 +392,32 @@
 ZEND_API zend_never_inline NOIPA bool ZEND_FASTCALL zend_string_equal_val(const zend_string *s1, const zend_string *s2)
 {
 	const char *ptr = ZSTR_VAL(s1);
-	size_t delta = (const char*)s2 - (const char*)s1;
+	uintptr_t delta = (uintptr_t) s2 - (uintptr_t) s1;
 	size_t len = ZSTR_LEN(s1);
 	zend_ulong ret;
 
 	__asm__ (
-		".LL0%=:\n\t"
+		"0:\n\t"
 		"movl (%2,%3), %0\n\t"
 		"xorl (%2), %0\n\t"
-		"jne .LL1%=\n\t"
+		"jne 1f\n\t"
 		"addl $0x4, %2\n\t"
 		"subl $0x4, %1\n\t"
-		"ja .LL0%=\n\t"
+		"ja 0b\n\t"
 		"movl $0x1, %0\n\t"
-		"jmp .LL3%=\n\t"
-		".LL1%=:\n\t"
+		"jmp 3f\n\t"
+		"1:\n\t"
 		"cmpl $0x4,%1\n\t"
-		"jb .LL2%=\n\t"
+		"jb 2f\n\t"
 		"xorl %0, %0\n\t"
-		"jmp .LL3%=\n\t"
-		".LL2%=:\n\t"
+		"jmp 3f\n\t"
+		"2:\n\t"
 		"negl %1\n\t"
 		"lea 0x20(,%1,8), %1\n\t"
 		"shll %b1, %0\n\t"
 		"sete %b0\n\t"
 		"movzbl %b0, %0\n\t"
-		".LL3%=:\n"
+		"3:\n"
 		: "=&a"(ret),
 		  "+c"(len),
 		  "+r"(ptr)
@@ -426,32 +430,32 @@
 ZEND_API zend_never_inline NOIPA bool ZEND_FASTCALL zend_string_equal_val(const zend_string *s1, const zend_string *s2)
 {
 	const char *ptr = ZSTR_VAL(s1);
-	size_t delta = (const char*)s2 - (const char*)s1;
+	uintptr_t delta = (uintptr_t) s2 - (uintptr_t) s1;
 	size_t len = ZSTR_LEN(s1);
 	zend_ulong ret;
 
 	__asm__ (
-		".LL0%=:\n\t"
+		"0:\n\t"
 		"movq (%2,%3), %0\n\t"
 		"xorq (%2), %0\n\t"
-		"jne .LL1%=\n\t"
+		"jne 1f\n\t"
 		"addq $0x8, %2\n\t"
 		"subq $0x8, %1\n\t"
-		"ja .LL0%=\n\t"
+		"ja 0b\n\t"
 		"movq $0x1, %0\n\t"
-		"jmp .LL3%=\n\t"
-		".LL1%=:\n\t"
+		"jmp 3f\n\t"
+		"1:\n\t"
 		"cmpq $0x8,%1\n\t"
-		"jb .LL2%=\n\t"
+		"jb 2f\n\t"
 		"xorq %0, %0\n\t"
-		"jmp .LL3%=\n\t"
-		".LL2%=:\n\t"
+		"jmp 3f\n\t"
+		"2:\n\t"
 		"negq %1\n\t"
 		"lea 0x40(,%1,8), %1\n\t"
 		"shlq %b1, %0\n\t"
 		"sete %b0\n\t"
 		"movzbq %b0, %0\n\t"
-		".LL3%=:\n"
+		"3:\n"
 		: "=&a"(ret),
 		  "+c"(len),
 		  "+r"(ptr)
@@ -490,3 +494,27 @@
 
 	return res;
 }
+
+/* strlcpy and strlcat are not intercepted by msan, so we need to do it ourselves. */
+#if __has_feature(memory_sanitizer)
+static size_t (*libc_strlcpy)(char *__restrict, const char *__restrict, size_t);
+size_t strlcpy(char *__restrict dest, const char *__restrict src, size_t n)
+{
+	if (!libc_strlcpy) {
+		libc_strlcpy = dlsym(RTLD_NEXT, "strlcpy");
+	}
+	size_t result = libc_strlcpy(dest, src, n);
+	__msan_unpoison_string(dest);
+	return result;
+}
+static size_t (*libc_strlcat)(char *__restrict, const char *__restrict, size_t);
+size_t strlcat (char *__restrict dest, const char *restrict src, size_t n)
+{
+	if (!libc_strlcat) {
+		libc_strlcat = dlsym(RTLD_NEXT, "strlcat");
+	}
+	size_t result = libc_strlcat(dest, src, n);
+	__msan_unpoison_string(dest);
+	return result;
+}
+#endif

php-8.2.23.tar.xz/Zend/zend_strtod.c -> php-8.2.28.tar.xz/Zend/zend_strtod.c Changed

php-8.2.23.tar.xz/Zend/zend_virtual_cwd.h -> php-8.2.28.tar.xz/Zend/zend_virtual_cwd.h Changed

php-8.2.23.tar.xz/Zend/zend_vm_def.h -> php-8.2.28.tar.xz/Zend/zend_vm_def.h Changed

php-8.2.23.tar.xz/Zend/zend_vm_execute.h -> php-8.2.28.tar.xz/Zend/zend_vm_execute.h Changed

@@ -7023,6 +7023,16 @@
 	function_name = RT_CONSTANT(opline, opline->op2);
 	if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) {
 		ZEND_ASSERT(!error);
+
+		/* Deprecation can be emitted from zend_is_callable_ex(), which can
+		 * invoke a user error handler and throw an exception.
+		 * For the CONST and CV case we reuse the same exception block below
+		 * to make sure we don't increase VM size too much. */
+		if (!(IS_CONST & (IS_TMP_VAR|IS_VAR)) && UNEXPECTED(EG(exception))) {
+
+			HANDLE_EXCEPTION();
+		}
+
 		func = fcc.function_handler;
 		object_or_called_scope = fcc.called_scope;
 		if (func->common.fn_flags & ZEND_ACC_CLOSURE) {
@@ -9368,6 +9378,16 @@
 	function_name = _get_zval_ptr_var(opline->op2.var EXECUTE_DATA_CC);
 	if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) {
 		ZEND_ASSERT(!error);
+
+		/* Deprecation can be emitted from zend_is_callable_ex(), which can
+		 * invoke a user error handler and throw an exception.
+		 * For the CONST and CV case we reuse the same exception block below
+		 * to make sure we don't increase VM size too much. */
+		if (!((IS_TMP_VAR|IS_VAR) & (IS_TMP_VAR|IS_VAR)) && UNEXPECTED(EG(exception))) {
+			zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
+			HANDLE_EXCEPTION();
+		}
+
 		func = fcc.function_handler;
 		object_or_called_scope = fcc.called_scope;
 		if (func->common.fn_flags & ZEND_ACC_CLOSURE) {
@@ -11742,6 +11762,16 @@
 	function_name = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
 	if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) {
 		ZEND_ASSERT(!error);
+
+		/* Deprecation can be emitted from zend_is_callable_ex(), which can
+		 * invoke a user error handler and throw an exception.
+		 * For the CONST and CV case we reuse the same exception block below
+		 * to make sure we don't increase VM size too much. */
+		if (!(IS_CV & (IS_TMP_VAR|IS_VAR)) && UNEXPECTED(EG(exception))) {
+
+			HANDLE_EXCEPTION();
+		}
+
 		func = fcc.function_handler;
 		object_or_called_scope = fcc.called_scope;
 		if (func->common.fn_flags & ZEND_ACC_CLOSURE) {

php-8.2.23.tar.xz/Zend/zend_weakrefs.c -> php-8.2.28.tar.xz/Zend/zend_weakrefs.c Changed

php-8.2.23.tar.xz/build/genif.sh -> php-8.2.28.tar.xz/build/genif.sh Changed

php-8.2.23.tar.xz/build/php.m4 -> php-8.2.28.tar.xz/build/php.m4 Changed

php-8.2.23.tar.xz/buildconf -> php-8.2.28.tar.xz/buildconf Changed

php-8.2.23.tar.xz/configure -> php-8.2.28.tar.xz/configure Changed

@@ -1,12 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for PHP 8.2.23.
+# Generated by GNU Autoconf 2.69 for PHP 8.2.28.
 #
 # Report bugs to <https://github.com/php/php-src/issues>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
-# Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -17,65 +16,63 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else case e in #(
-  e) case `(set -o) 2>/dev/null` in #(
+else
+  case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
-esac ;;
 esac
 fi
 
 
-
-# Reset variables that may have inherited troublesome values from
-# the environment.
-
-# IFS needs to be set, to space, tab, and newline, in precisely that order.
-# (If _AS_PATH_WALK were called with IFS unset, it would have the
-# side effect of setting IFS to empty, thus disabling word splitting.)
-# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-IFS=" ""	$as_nl"
-
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# Ensure predictable behavior from utilities with locale-dependent output.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# We cannot yet rely on "unset" to work, but we need these variables
-# to be unset--not just set to an empty or harmless value--now, to
-# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
-# also avoids known problems related to "unset" and subshell syntax
-# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
-for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
-do eval test \${$as_var+y} \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-
-# Ensure that fds 0, 1, and 2 are open.
-if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
-if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
-if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\$.*\$"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\$.*\$$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
+      esac;
+      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
 
 # The user is always right.
-if ${PATH_SEPARATOR+false} :; then
+if test "${PATH_SEPARATOR+set}" != set; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -84,6 +81,13 @@
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -92,27 +96,43 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
   done
 IFS=$as_save_IFS
 
      ;;
 esac
-# We did not find ourselves, most probably we were run as 'sh COMMAND'
+# We did not find ourselves, most probably we were run as `sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -133,28 +153,26 @@
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else case e in #(
-  e) case \`(set -o) 2>/dev/null\` in #(
+else
+  case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
-esac ;;
 esac
 fi
 "
@@ -169,55 +187,42 @@
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" )
-then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 
-else case e in #(
-  e) exitcode=1; echo positional parameters were not saved. ;;
-esac
+else
+  exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
-blah=\$(echo \$(echo blah))
-test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null
-then :
+  if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
-else case e in #(
-  e) as_have_required=no ;;
-esac
+else
+  as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
-then :
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-else case e in #(
-  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir$as_base
+	     as_shell=$as_dir/$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
-then :
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
-then :
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
   break 2
 fi
 fi
@@ -225,22 +230,14 @@
        esac
   as_found=false
 done
-IFS=$as_save_IFS
-if $as_found
-then :
-
-else case e in #(
-  e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
-then :
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
   CONFIG_SHELL=$SHELL as_have_required=yes
-fi ;;
-esac
-fi
+fi; }
+IFS=$as_save_IFS
 
 
-      if test "x$CONFIG_SHELL" != x
-then :
+      if test "x$CONFIG_SHELL" != x; then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -257,28 +254,26 @@
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno
-then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
-  if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
 $0: https://github.com/php/php-src/issues about your
 $0: system, including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
   fi
   exit 1
-fi ;;
-esac
+fi
 fi
 fi
 SHELL=${CONFIG_SHELL-/bin/sh}
@@ -299,7 +294,6 @@
 }
 as_unset=as_fn_unset
 
-
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -331,7 +325,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -340,7 +334,7 @@
 	 X"$as_dir" : 'X$//$^/' \| \
 	 X"$as_dir" : 'X$//$$' \| \
 	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -379,18 +373,16 @@
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
-then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else case e in #(
-  e) as_fn_append ()
+else
+  as_fn_append ()
   {
     eval $1=\$$1\$2
-  } ;;
-esac
+  }
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -398,18 +390,16 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
-then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else case e in #(
-  e) as_fn_arith ()
+else
+  as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
-  } ;;
-esac
+  }
 fi # as_fn_arith
 
 
@@ -423,9 +413,9 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -452,7 +442,7 @@
 $as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
 	 X"$0" : 'X$//$$' \| \
 	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/$^/^/*$\/*$/{
 	    s//\1/
 	    q
@@ -485,8 +475,6 @@
     /$LINENO/=
   ' <$as_myself |
     sed '
-      t clear
-      :clear
       s/$LINENO.*/&-/
       t lineno
       b
@@ -498,7 +486,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -512,10 +500,6 @@
   exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -529,12 +513,6 @@
   ECHO_N='-n';;
 esac
 
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO("message") and AS_ECHO_N("message"), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -546,9 +524,9 @@
   if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
     # ... but there are two gotchas:
-    # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
-    # In both cases, we have to default to 'cp -pR'.
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -573,12 +551,10 @@
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
-as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g"
-as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
-as_sed_sh="y%*+%pp%;s%^_$as_cr_alnum%_%g"
-as_tr_sh="eval sed '$as_sed_sh'" # deprecated
+as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
 
 
 
@@ -756,44 +732,48 @@
 # Identity of this package.
 PACKAGE_NAME='PHP'
 PACKAGE_TARNAME='php'
-PACKAGE_VERSION='8.2.23'
-PACKAGE_STRING='PHP 8.2.23'
+PACKAGE_VERSION='8.2.28'
+PACKAGE_STRING='PHP 8.2.28'
 PACKAGE_BUGREPORT='https://github.com/php/php-src/issues'
 PACKAGE_URL='https://www.php.net'
 
 ac_unique_file="main/php_version.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stddef.h>
-#ifdef HAVE_STDIO_H
-# include <stdio.h>
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
 #endif
-#ifdef HAVE_STDLIB_H
+#ifdef STDC_HEADERS
 # include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
 #endif
 #ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
 # include <string.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_header_c_list=
 ac_subst_vars='LTLIBOBJS
 LIBTOOL
 NMEDIT
@@ -1317,6 +1297,8 @@
   *)    ac_optarg=yes ;;
   esac
 
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
@@ -1357,9 +1339,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid feature name: '$ac_useropt'"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1383,9 +1365,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-$^=*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid feature name: '$ac_useropt'"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1596,9 +1578,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-$^=*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid package name: '$ac_useropt'"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1612,9 +1594,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid package name: '$ac_useropt'"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1642,8 +1624,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: '$ac_option'
-Try '$0 --help' for more information"
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1651,16 +1633,16 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | 0-9* | *!_$as_cr_alnum* )
-      as_fn_error $? "invalid variable name: '$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*^-._$as_cr_alnum" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1676,7 +1658,7 @@
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1701,7 +1683,7 @@
   as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
-# There might be people who depend on the old broken behavior: '$host'
+# There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
 build=$build_alias
@@ -1740,7 +1722,7 @@
 	 X"$as_myself" : 'X$//$^/' \| \
 	 X"$as_myself" : 'X$//$$' \| \
 	 X"$as_myself" : 'X$/$' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+$as_echo X"$as_myself" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -1769,7 +1751,7 @@
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
   as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
-ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work"
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
 	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
@@ -1797,7 +1779,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-'configure' configures PHP 8.2.23 to adapt to many kinds of systems.
+\`configure' configures PHP 8.2.28 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1811,11 +1793,11 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print 'checking ...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE disabled
-  -C, --config-cache      alias for '--cache-file=config.cache'
+  -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR configure dir or '..'
+      --srcdir=DIR        find the sources in DIR configure dir or \`..'
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -1823,10 +1805,10 @@
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
                           PREFIX
 
-By default, 'make install' will install all the files in
-'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than '$ac_default_prefix' using '--prefix',
-for instance '--prefix=\$HOME'.
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
 
 For better control, use the options below.
 
@@ -1869,7 +1851,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PHP 8.2.23:";;
+     short | recursive ) echo "Configuration of PHP 8.2.28:";;
    esac
   cat <<\_ACEOF
 
@@ -2265,7 +2247,7 @@
               C compiler flags for LIBZIP, overriding pkg-config
   LIBZIP_LIBS linker flags for LIBZIP, overriding pkg-config
 
-Use these variables to override the choices made by 'configure' or to help
+Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <https://github.com/php/php-src/issues>.
@@ -2285,9 +2267,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.\\/||'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -2315,8 +2297,7 @@
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for configure.gnu first; this name is used for a wrapper for
-    # Metaconfig's "Configure" on case-insensitive file systems.
+    # Check for guested configure.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -2324,7 +2305,7 @@
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -2333,10 +2314,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PHP configure 8.2.23
-generated by GNU Autoconf 2.72
+PHP configure 8.2.28
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -2353,14 +2334,14 @@
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam
+  rm -f conftest.$ac_objext
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2368,19 +2349,17 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext
-then :
+       } && test -s conftest.$ac_objext; then :
   ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1 ;;
-esac
+	ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -2399,7 +2378,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2407,25 +2386,156 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       }
-then :
+       }; then :
   ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-    ac_retval=1 ;;
-esac
+    ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
 
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ---------------------------------------------------- ##
+## Report this to https://github.com/php/php-src/issues ##
+## ---------------------------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -2433,30 +2543,26 @@
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$3=yes"
-else case e in #(
-  e) eval "$3=no" ;;
-esac
+else
+  eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -2467,14 +2573,14 @@
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2482,22 +2588,20 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }
-then :
+       }; then :
   ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1 ;;
-esac
+	ac_retval=1
 fi
   # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
   # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
@@ -2515,22 +2619,28 @@
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-   which can conflict with char $2 (void); below.  */
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 
-#include <limits.h>
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
@@ -2539,7 +2649,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char $2 (void);
+char $2 ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
@@ -2548,89 +2658,42 @@
 #endif
 
 int
-main (void)
+main ()
 {
 return $2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$3=yes"
-else case e in #(
-  e) eval "$3=no" ;;
-esac
+else
+  eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
-# executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }
-then :
-  ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
-       printf "%s\n" "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status ;;
-esac
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
 # ac_fn_cxx_try_compile LINENO
 # ----------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
 ac_fn_cxx_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam
+  rm -f conftest.$ac_objext
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2638,19 +2701,17 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext
-then :
+       } && test -s conftest.$ac_objext; then :
   ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1 ;;
-esac
+	ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -2669,7 +2730,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2677,19 +2738,17 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       }
-then :
+       }; then :
   ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-    ac_retval=1 ;;
-esac
+    ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -2703,17 +2762,16 @@
 ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-printf %s "checking for $2.$3... " >&6; }
-if eval test \${$4+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval \${$4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main (void)
+main ()
 {
 static $2 ac_aggr;
 if (ac_aggr.$3)
@@ -2722,15 +2780,14 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$4=yes"
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main (void)
+main ()
 {
 static $2 ac_aggr;
 if (sizeof ac_aggr.$3)
@@ -2739,48 +2796,41 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$4=yes"
-else case e in #(
-  e) eval "$4=no" ;;
-esac
+else
+  eval "$4=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$4
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
 
-# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR
-# ------------------------------------------------------------------
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
 # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR.
-ac_fn_check_decl ()
+# accordingly.
+ac_fn_c_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   as_decl_name=`echo $2|sed 's/ *(.*//'`
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-printf %s "checking whether $as_decl_name is declared... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  eval ac_save_FLAGS=\$$6
-  as_fn_append $6 " $5"
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 #ifndef $as_decl_name
 #ifdef __cplusplus
@@ -2794,24 +2844,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$3=yes"
-else case e in #(
-  e) eval "$3=no" ;;
-esac
+else
+  eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  eval $6=\$ac_save_FLAGS
- ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_check_decl
+} # ac_fn_c_check_decl
 
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
@@ -2820,18 +2865,17 @@
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) eval "$3=no"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 if (sizeof ($2))
 	 return 0;
@@ -2839,13 +2883,12 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 if (sizeof (($2)))
 	    return 0;
@@ -2853,21 +2896,18 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-else case e in #(
-  e) eval "$3=yes" ;;
-esac
+else
+  eval "$3=yes"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
@@ -2886,7 +2926,7 @@
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 static int test_array 1 - 2 * !(($2) >= 0);
 test_array 0 = 0;
@@ -2896,15 +2936,14 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_lo=0 ac_mid=0
   while :; do
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 static int test_array 1 - 2 * !(($2) <= $ac_mid);
 test_array 0 = 0;
@@ -2914,26 +2953,24 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_hi=$ac_mid; break
-else case e in #(
-  e) as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+else
+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
 			if test $ac_lo -le $ac_mid; then
 			  ac_lo= ac_hi=
 			  break
 			fi
-			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val ;;
-esac
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 static int test_array 1 - 2 * !(($2) < 0);
 test_array 0 = 0;
@@ -2943,15 +2980,14 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_hi=-1 ac_mid=-1
   while :; do
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 static int test_array 1 - 2 * !(($2) >= $ac_mid);
 test_array 0 = 0;
@@ -2961,28 +2997,24 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_lo=$ac_mid; break
-else case e in #(
-  e) as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+else
+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
 			if test $ac_mid -le $ac_hi; then
 			  ac_lo= ac_hi=
 			  break
 			fi
-			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val ;;
-esac
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
-else case e in #(
-  e) ac_lo= ac_hi= ;;
-esac
+else
+  ac_lo= ac_hi=
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
@@ -2990,7 +3022,7 @@
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 static int test_array 1 - 2 * !(($2) <= $ac_mid);
 test_array 0 = 0;
@@ -3000,14 +3032,12 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_hi=$ac_mid
-else case e in #(
-  e) as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ;;
-esac
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in #((
 ?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
@@ -3017,12 +3047,12 @@
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
-static long int longval (void) { return $2; }
-static unsigned long int ulongval (void) { return $2; }
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
 #include <stdio.h>
 #include <stdlib.h>
 int
-main (void)
+main ()
 {
 
   FILE *f = fopen ("conftest.val", "w");
@@ -3050,12 +3080,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else case e in #(
-  e) ac_retval=1 ;;
-esac
+else
+  ac_retval=1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -3066,34 +3094,14 @@
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
-ac_configure_args_raw=
-for ac_arg
-do
-  case $ac_arg in
-  *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  as_fn_append ac_configure_args_raw " '$ac_arg'"
-done
-
-case $ac_configure_args_raw in
-  *$as_nl*)
-    ac_safe_unquote= ;;
-  *)
-    ac_unsafe_z='|&;<>()$`\\"*? ''	' # This string ends in space, tab.
-    ac_unsafe_a="$ac_unsafe_z#~"
-    ac_safe_unquote="s/ '\$^$ac_unsafe_a^$ac_unsafe_z*\$'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
-esac
-
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PHP $as_me 8.2.23, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+It was created by PHP $as_me 8.2.28, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ $0$ac_configure_args_raw
+  $ $0 $@
 
 _ACEOF
 exec 5>>config.log
@@ -3126,12 +3134,8 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    printf "%s\n" "PATH: $as_dir"
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -3166,7 +3170,7 @@
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -3201,13 +3205,11 @@
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    printf "%s\n" "## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -3218,8 +3220,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -3243,7 +3245,7 @@
 )
     echo
 
-    printf "%s\n" "## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -3251,14 +3253,14 @@
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -3266,15 +3268,15 @@
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -3282,8 +3284,8 @@
       echo
     fi
     test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -3297,50 +3299,65 @@
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+$as_echo "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_files="$CONFIG_SITE"
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
-  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-
-for ac_site_file in $ac_site_files
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
-  case $ac_site_file in #(
-  */*) :
-     ;; #(
-  *) :
-    ac_site_file=./$ac_site_file ;;
-esac
-  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -3348,670 +3365,19 @@
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       \\/* | ?:\\/* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-# Test code for whether the C compiler supports C89 (global declarations)
-ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
-
-#include <stddef.h>
-#include <stdarg.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
-struct buf { int x; };
-struct buf * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (char **p, int i)
-{
-  return pi;
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* C89 style stringification. */
-#define noexpand_stringify(a) #a
-const char *stringified = noexpand_stringify(arbitrary+token=sequence);
-
-/* C89 style token pasting.  Exercises some of the corner cases that
-   e.g. old MSVC gets wrong, but not very hard. */
-#define noexpand_concat(a,b) a##b
-#define expand_concat(a,b) noexpand_concat(a,b)
-extern int vA;
-extern int vbee;
-#define aye A
-#define bee B
-int *pvA = &expand_concat(v,aye);
-int *pvbee = &noexpand_concat(v,bee);
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not \xHH hex character constants.
-   These do not provoke an error unfortunately, instead are silently treated
-   as an "x".  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
-   array size at least.  It is necessary to write \x00 == 0 to get something
-   that is true only with -std.  */
-int osf4_cc_array '\''\x00'\'' == 0 ? 1 : -1;
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) '\''x'\''
-int xlc6_cc_arrayFOO(a) == '\''x'\'' ? 1 : -1;
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
-               int, int);'
-
-# Test code for whether the C compiler supports C89 (body of main).
-ac_c_conftest_c89_main='
-ok |= (argc == 0 || f (e, argv, 0) != argv0 || f (e, argv, 1) != argv1);
-'
-
-# Test code for whether the C compiler supports C99 (global declarations)
-ac_c_conftest_c99_globals='
-/* Does the compiler advertise C99 conformance? */
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
-# error "Compiler does not advertise C99 conformance"
-#endif
-
-// See if C++-style comments work.
-
-#include <stdbool.h>
-extern int puts (const char *);
-extern int printf (const char *, ...);
-extern int dprintf (int, const char *, ...);
-extern void *malloc (size_t);
-extern void free (void *);
-
-// Check varargs macros.  These examples are taken from C99 6.10.3.5.
-// dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
-#define debug(...) dprintf (2, __VA_ARGS__)
-#define showlist(...) puts (#__VA_ARGS__)
-#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
-static void
-test_varargs_macros (void)
-{
-  int x = 1234;
-  int y = 5678;
-  debug ("Flag");
-  debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
-  report (x>y, "x is %d but y is %d", x, y);
-}
-
-// Check long long types.
-#define BIG64 18446744073709551615ull
-#define BIG32 4294967295ul
-#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
-#if !BIG_OK
-  #error "your preprocessor is broken"
-#endif
-#if BIG_OK
-#else
-  #error "your preprocessor is broken"
-#endif
-static long long int bignum = -9223372036854775807LL;
-static unsigned long long int ubignum = BIG64;
-
-struct incomplete_array
-{
-  int datasize;
-  double data;
-};
-
-struct named_init {
-  int number;
-  const wchar_t *name;
-  double average;
-};
-
-typedef const char *ccp;
-
-static inline int
-test_restrict (ccp restrict text)
-{
-  // Iterate through items via the restricted pointer.
-  // Also check for declarations in for loops.
-  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
-    continue;
-  return 0;
-}
-
-// Check varargs and va_copy.
-static bool
-test_varargs (const char *format, ...)
-{
-  va_list args;
-  va_start (args, format);
-  va_list args_copy;
-  va_copy (args_copy, args);
-
-  const char *str = "";
-  int number = 0;
-  float fnumber = 0;
-
-  while (*format)
-    {
-      switch (*format++)
-	{
-	case '\''s'\'': // string
-	  str = va_arg (args_copy, const char *);
-	  break;
-	case '\''d'\'': // int
-	  number = va_arg (args_copy, int);
-	  break;
-	case '\''f'\'': // float
-	  fnumber = va_arg (args_copy, double);
-	  break;
-	default:
-	  break;
-	}
-    }
-  va_end (args_copy);
-  va_end (args);
-
-  return *str && number && fnumber;
-}
-'
-
-# Test code for whether the C compiler supports C99 (body of main).
-ac_c_conftest_c99_main='
-  // Check bool.
-  _Bool success = false;
-  success |= (argc != 0);
-
-  // Check restrict.
-  if (test_restrict ("String literal") == 0)
-    success = true;
-  char *restrict newvar = "Another string";
-
-  // Check varargs.
-  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
-  test_varargs_macros ();
-
-  // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
-  ia->datasize = 10;
-  for (int i = 0; i < ia->datasize; ++i)
-    ia->datai = i * 1.234;
-  // Work around memory leak warnings.
-  free (ia);
-
-  // Check named initializers.
-  struct named_init ni = {
-    .number = 34,
-    .name = L"Test wide string",
-    .average = 543.34343,
-  };
-
-  ni.number = 58;
-
-  int dynamic_arrayni.number;
-  dynamic_array0 = argv00;
-  dynamic_arrayni.number - 1 = 543;
-
-  // work around unused variable warnings
-  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar0 == '\''x'\''
-	 || dynamic_arrayni.number - 1 != 543);
-'
-
-# Test code for whether the C compiler supports C11 (global declarations)
-ac_c_conftest_c11_globals='
-/* Does the compiler advertise C11 conformance? */
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
-# error "Compiler does not advertise C11 conformance"
-#endif
-
-// Check _Alignas.
-char _Alignas (double) aligned_as_double;
-char _Alignas (0) no_special_alignment;
-extern char aligned_as_int;
-char _Alignas (0) _Alignas (int) aligned_as_int;
-
-// Check _Alignof.
-enum
-{
-  int_alignment = _Alignof (int),
-  int_array_alignment = _Alignof (int100),
-  char_alignment = _Alignof (char)
-};
-_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
-
-// Check _Noreturn.
-int _Noreturn does_not_return (void) { for (;;) continue; }
-
-// Check _Static_assert.
-struct test_static_assert
-{
-  int x;
-  _Static_assert (sizeof (int) <= sizeof (long int),
-                  "_Static_assert does not work in struct");
-  long int y;
-};
-
-// Check UTF-8 literals.
-#define u8 syntax error!
-char const utf8_literal = u8"happens to be ASCII" "another string";
-
-// Check duplicate typedefs.
-typedef long *long_ptr;
-typedef long int *long_ptr;
-typedef long_ptr long_ptr;
-
-// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
-struct anonymous
-{
-  union {
-    struct { int i; int j; };
-    struct { int k; long int l; } w;
-  };
-  int m;
-} v1;
-'
-
-# Test code for whether the C compiler supports C11 (body of main).
-ac_c_conftest_c11_main='
-  _Static_assert ((offsetof (struct anonymous, i)
-		   == offsetof (struct anonymous, w.k)),
-		  "Anonymous union alignment botch");
-  v1.i = 2;
-  v1.w.k = 5;
-  ok |= v1.i != 5;
-'
-
-# Test code for whether the C compiler supports C11 (complete).
-ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
-${ac_c_conftest_c99_globals}
-${ac_c_conftest_c11_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_c_conftest_c89_main}
-  ${ac_c_conftest_c99_main}
-  ${ac_c_conftest_c11_main}
-  return ok;
-}
-"
-
-# Test code for whether the C compiler supports C99 (complete).
-ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
-${ac_c_conftest_c99_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_c_conftest_c89_main}
-  ${ac_c_conftest_c99_main}
-  return ok;
-}
-"
-
-# Test code for whether the C compiler supports C89 (complete).
-ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_c_conftest_c89_main}
-  return ok;
-}
-"
-
-as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
-as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
-as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
-as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
-as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
-as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
-as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
-as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
-as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
-as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
-as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
-# Test code for whether the C++ compiler supports C++98 (global declarations)
-ac_cxx_conftest_cxx98_globals='
-// Does the compiler advertise C++98 conformance?
-#if !defined __cplusplus || __cplusplus < 199711L
-# error "Compiler does not advertise C++98 conformance"
-#endif
-
-// These inclusions are to reject old compilers that
-// lack the unsuffixed header files.
-#include <cstdlib>
-#include <exception>
-
-// <cassert> and <cstring> are *not* freestanding headers in C++98.
-extern void assert (int);
-namespace std {
-  extern int strcmp (const char *, const char *);
-}
-
-// Namespaces, exceptions, and templates were all added after "C++ 2.0".
-using std::exception;
-using std::strcmp;
-
-namespace {
-
-void test_exception_syntax()
-{
-  try {
-    throw "test";
-  } catch (const char *s) {
-    // Extra parentheses suppress a warning when building autoconf itself,
-    // due to lint rules shared with more typical C programs.
-    assert (!(strcmp) (s, "test"));
-  }
-}
-
-template <typename T> struct test_template
-{
-  T const val;
-  explicit test_template(T t) : val(t) {}
-  template <typename U> T add(U u) { return static_cast<T>(u) + val; }
-};
-
-} // anonymous namespace
-'
-
-# Test code for whether the C++ compiler supports C++98 (body of main)
-ac_cxx_conftest_cxx98_main='
-  assert (argc);
-  assert (! argv0);
-{
-  test_exception_syntax ();
-  test_template<double> tt (2.0);
-  assert (tt.add (4) == 6.0);
-  assert (true && !false);
-}
-'
-
-# Test code for whether the C++ compiler supports C++11 (global declarations)
-ac_cxx_conftest_cxx11_globals='
-// Does the compiler advertise C++ 2011 conformance?
-#if !defined __cplusplus || __cplusplus < 201103L
-# error "Compiler does not advertise C++11 conformance"
-#endif
-
-namespace cxx11test
-{
-  constexpr int get_val() { return 20; }
-
-  struct testinit
-  {
-    int i;
-    double d;
-  };
-
-  class delegate
-  {
-  public:
-    delegate(int n) : n(n) {}
-    delegate(): delegate(2354) {}
-
-    virtual int getval() { return this->n; };
-  protected:
-    int n;
-  };
-
-  class overridden : public delegate
-  {
-  public:
-    overridden(int n): delegate(n) {}
-    virtual int getval() override final { return this->n * 2; }
-  };
-
-  class nocopy
-  {
-  public:
-    nocopy(int i): i(i) {}
-    nocopy() = default;
-    nocopy(const nocopy&) = delete;
-    nocopy & operator=(const nocopy&) = delete;
-  private:
-    int i;
-  };
-
-  // for testing lambda expressions
-  template <typename Ret, typename Fn> Ret eval(Fn f, Ret v)
-  {
-    return f(v);
-  }
-
-  // for testing variadic templates and trailing return types
-  template <typename V> auto sum(V first) -> V
-  {
-    return first;
-  }
-  template <typename V, typename... Args> auto sum(V first, Args... rest) -> V
-  {
-    return first + sum(rest...);
-  }
-}
-'
-
-# Test code for whether the C++ compiler supports C++11 (body of main)
-ac_cxx_conftest_cxx11_main='
-{
-  // Test auto and decltype
-  auto a1 = 6538;
-  auto a2 = 48573953.4;
-  auto a3 = "String literal";
-
-  int total = 0;
-  for (auto i = a3; *i; ++i) { total += *i; }
-
-  decltype(a2) a4 = 34895.034;
-}
-{
-  // Test constexpr
-  short sacxx11test::get_val() = { 0 };
-}
-{
-  // Test initializer lists
-  cxx11test::testinit il = { 4323, 435234.23544 };
-}
-{
-  // Test range-based for
-  int array = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3,
-                 14, 19, 17, 8, 6, 20, 16, 2, 11, 1};
-  for (auto &x : array) { x += 23; }
-}
-{
-  // Test lambda expressions
-  using cxx11test::eval;
-  assert (eval ((int x) { return x*2; }, 21) == 42);
-  double d = 2.0;
-  assert (eval (&(double x) { return d += x; }, 3.0) == 5.0);
-  assert (d == 5.0);
-  assert (eval (=(double x) mutable { return d += x; }, 4.0) == 9.0);
-  assert (d == 5.0);
-}
-{
-  // Test use of variadic templates
-  using cxx11test::sum;
-  auto a = sum(1);
-  auto b = sum(1, 2);
-  auto c = sum(1.0, 2.0, 3.0);
-}
-{
-  // Test constructor delegation
-  cxx11test::delegate d1;
-  cxx11test::delegate d2();
-  cxx11test::delegate d3(45);
-}
-{
-  // Test override and final
-  cxx11test::overridden o1(55464);
-}
-{
-  // Test nullptr
-  char *c = nullptr;
-}
-{
-  // Test template brackets
-  test_template<::test_template<int>> v(test_template<int>(12));
-}
-{
-  // Unicode literals
-  char const *utf8 = u8"UTF-8 string \u2500";
-  char16_t const *utf16 = u"UTF-8 string \u2500";
-  char32_t const *utf32 = U"UTF-32 string \u2500";
-}
-'
-
-# Test code for whether the C compiler supports C++11 (complete).
-ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals}
-${ac_cxx_conftest_cxx11_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_cxx_conftest_cxx98_main}
-  ${ac_cxx_conftest_cxx11_main}
-  return ok;
-}
-"
-
-# Test code for whether the C compiler supports C++98 (complete).
-ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals}
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_cxx_conftest_cxx98_main}
-  return ok;
-}
-"
-
-
-# Auxiliary files required by this configure script.
-ac_aux_files="config.guess config.sub"
-
-# Locations in which to look for auxiliary files.
-ac_aux_dir_candidates="${srcdir}/build"
-
-# Search for a directory containing all of the required auxiliary files,
-# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
-# If we don't find one directory that contains all the files we need,
-# we report the set of missing files from the *first* directory in
-# $ac_aux_dir_candidates and give up.
-ac_missing_aux_files=""
-ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in $ac_aux_dir_candidates
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-  as_found=:
-
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
-  ac_aux_dir_found=yes
-  ac_install_sh=
-  for ac_aux in $ac_aux_files
-  do
-    # As a special case, if "install-sh" is required, that requirement
-    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
-    # and $ac_install_sh is set appropriately for whichever one is found.
-    if test x"$ac_aux" = x"install-sh"
-    then
-      if test -f "${as_dir}install-sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
-        ac_install_sh="${as_dir}install-sh -c"
-      elif test -f "${as_dir}install.sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
-        ac_install_sh="${as_dir}install.sh -c"
-      elif test -f "${as_dir}shtool"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
-        ac_install_sh="${as_dir}shtool install -c"
-      else
-        ac_aux_dir_found=no
-        if $ac_first_candidate; then
-          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
-        else
-          break
-        fi
-      fi
-    else
-      if test -f "${as_dir}${ac_aux}"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
-      else
-        ac_aux_dir_found=no
-        if $ac_first_candidate; then
-          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
-        else
-          break
-        fi
-      fi
-    fi
-  done
-  if test "$ac_aux_dir_found" = yes; then
-    ac_aux_dir="$as_dir"
-    break
-  fi
-  ac_first_candidate=false
-
-  as_found=false
-done
-IFS=$as_save_IFS
-if $as_found
-then :
-
-else case e in #(
-  e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;;
-esac
-fi
-
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-if test -f "${ac_aux_dir}config.guess"; then
-  ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
-fi
-if test -f "${ac_aux_dir}config.sub"; then
-  ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
-fi
-if test -f "$ac_aux_dir/configure"; then
-  ac_configure="$SHELL ${ac_aux_dir}configure"
-fi
-
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -4022,12 +3388,12 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
@@ -4036,24 +3402,24 @@
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  '$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -4063,12 +3429,11 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
-	    and start over" "$LINENO" 5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -4082,49 +3447,70 @@
 
 
 
+ac_aux_dir=
+for ac_dir in build "$srcdir"/build; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build \"$srcdir\"/build" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
 
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-printf %s "checking for grep that handles long lines and -e... " >&6; }
-if test ${ac_cv_path_GREP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -z "$GREP"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in grep ggrep
-   do
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in #(
+case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-#(
 *)
   ac_count=0
-  printf %s 0123456789 >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4150,21 +3536,19 @@
 else
   ac_cv_path_GREP=$GREP
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-printf %s "checking for egrep... " >&6; }
-if test ${ac_cv_path_EGREP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
      if test -z "$EGREP"; then
@@ -4174,31 +3558,25 @@
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in egrep
-   do
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in #(
+case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-#(
 *)
   ac_count=0
-  printf %s 0123456789 >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4225,23 +3603,19 @@
   ac_cv_path_EGREP=$EGREP
 fi
 
-   fi ;;
-esac
+   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
-         EGREP_TRADITIONAL=$EGREP
- ac_cv_path_EGREP_TRADITIONAL=$EGREP
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-printf %s "checking for a sed that does not truncate output... " >&6; }
-if test ${ac_cv_path_SED+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)           ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
      done
@@ -4254,31 +3628,25 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in sed gsed
-   do
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in #(
+case `"$ac_path_SED" --version 2>&1` in
 *GNU*)
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-#(
 *)
   ac_count=0
-  printf %s 0123456789 >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" '' >> "conftest.nl"
+    $as_echo '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4304,11 +3672,10 @@
 else
   ac_cv_path_SED=$SED
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -4366,7 +3733,7 @@
    else
     break
    fi
-   printf "%s\n" "$CURRENT_ARG \\" >>config.nice
+   $as_echo "$CURRENT_ARG \\" >>config.nice
    CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG"
   done
   echo '"$@"' >> config.nice
@@ -4386,31 +3753,26 @@
 
 
 
-
-
-
-  # Make sure we can run config.sub.
-$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-printf %s "checking build system type... " >&6; }
-if test ${ac_cv_build+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_build_alias=$build_alias
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
- ;;
-esac
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -4429,23 +3791,21 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-printf %s "checking host system type... " >&6; }
-if test ${ac_cv_host+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test "x$host_alias" = x; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
-  ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -4464,23 +3824,21 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-printf %s "checking target system type... " >&6; }
-if test ${ac_cv_target+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test "x$target_alias" = x; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
+if ${ac_cv_target+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
-  ac_cv_target=`$SHELL "${ac_aux_dir}config.sub" $target_alias` ||
-    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $target_alias failed" "$LINENO" 5
+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-printf "%s\n" "$ac_cv_target" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
@@ -4521,7 +3879,7 @@
 
 
 ac_IFS=$IFS; IFS="."
-set $(echo 8.2.23 | "${SED}" 's/$0-9\.*$$.*$/\1\.\2/')
+set $(echo 8.2.28 | "${SED}" 's/$0-9\.*$$.*$/\1\.\2/')
 IFS=$ac_IFS
 PHP_MAJOR_VERSION=$1
 PHP_MINOR_VERSION=$2
@@ -4595,13 +3953,12 @@
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PKG_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $PKG_CONFIG in
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
   \\/* | ?:\\/*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;
@@ -4610,15 +3967,11 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4626,16 +3979,15 @@
 IFS=$as_save_IFS
 
   ;;
-esac ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-printf "%s\n" "$PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4644,13 +3996,12 @@
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $ac_pt_PKG_CONFIG in
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
   \\/* | ?:\\/*)
   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
   ;;
@@ -4659,15 +4010,11 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4675,16 +4022,15 @@
 IFS=$as_save_IFS
 
   ;;
-esac ;;
 esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -4692,8 +4038,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -4705,26 +4051,17 @@
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	else
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
-
-
-
-
-
-
-
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4735,44 +4072,38 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CC"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4785,44 +4116,38 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_CC"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4834,8 +4159,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -4843,23 +4168,23 @@
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion -version; do
+for ac_option in --version -v -V -qversion; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -4869,7 +4194,7 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -4877,7 +4202,7 @@
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
@@ -4889,9 +4214,9 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest^ *//'`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest^ *//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -4912,14 +4237,13 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
-# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no'
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
@@ -4934,12 +4258,12 @@
 	# certainly right.
 	break;;
     *.* )
-	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
 	fi
 	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an '-o'
+	# safe: cross compilers may not add the suffix if given an `-o'
 	# argument, so we may need to know it at that point already.
 	# Even if this section looks crufty: it has the advantage of
 	# actually working.
@@ -4950,52 +4274,48 @@
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else case e in #(
-  e) ac_file='' ;;
-esac
+else
+  ac_file=''
 fi
-if test -z "$ac_file"
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See 'config.log' for more details" "$LINENO" 5; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-printf %s "checking for suffix of executables... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
-  # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
-# catch 'conftest.exe'.  For instance with Cygwin, 'ls conftest' will
-# work properly (i.e., refer to 'conftest.exe'), while it won't with
-# 'rm'.
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
@@ -5005,16 +4325,15 @@
     * ) break;;
   esac
 done
-else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -5023,11 +4342,9 @@
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main (void)
+main ()
 {
 FILE *f = fopen ("conftest.out", "w");
- if (!f)
-  return 1;
  return ferror (f) || fclose (f) != 0;
 
   ;
@@ -5037,8 +4354,8 @@
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-printf %s "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -5046,10 +4363,10 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -5057,41 +4374,39 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-as_fn_error 77 "cannot run C compiled programs.
-If you meant to cross compile, use '--host'.
-See 'config.log' for more details" "$LINENO" 5; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-rm -f conftest.$ac_ext conftest$ac_cv_exeext \
-  conftest.o conftest.obj conftest.out
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-printf %s "checking for suffix of object files... " >&6; }
-if test ${ac_cv_objext+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
@@ -5105,12 +4420,11 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -5119,34 +4433,31 @@
        break;;
   esac
 done
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
-esac
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
-printf %s "checking whether the compiler supports GNU C... " >&6; }
-if test ${ac_cv_c_compiler_gnu+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 #ifndef __GNUC__
        choke me
@@ -5156,36 +4467,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
-else case e in #(
-  e) ac_compiler_gnu=no ;;
-esac
+else
+  ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
- ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+y}
+ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-printf %s "checking whether $CC accepts -g... " >&6; }
-if test ${ac_cv_prog_cc_g+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_c_werror_flag=$ac_c_werror_flag
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
@@ -5193,63 +4498,57 @@
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else case e in #(
-  e) CFLAGS=""
+else
+  CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-else case e in #(
-  e) ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
-if test $ac_test_CFLAGS; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -5264,153 +4563,94 @@
     CFLAGS=
   fi
 fi
-ac_prog_cc_stdc=no
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
-printf %s "checking for $CC option to enable C11 features... " >&6; }
-if test ${ac_cv_prog_cc_c11+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cc_c11=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_c_conftest_c11_program
-_ACEOF
-for ac_arg in '' -std=gnu11
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c11=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c11" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC ;;
-esac
-fi
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return pi;
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
 
-if test "x$ac_cv_prog_cc_c11" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cc_c11" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
-     CC="$CC $ac_cv_prog_cc_c11" ;;
-esac
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
-  ac_prog_cc_stdc=c11 ;;
-esac
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
-printf %s "checking for $CC option to enable C99 features... " >&6; }
-if test ${ac_cv_prog_cc_c99+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cc_c99=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_c_conftest_c99_program
-_ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c99=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c99" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC ;;
-esac
-fi
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array '\x00' == 0 ? 1 : -1;
 
-if test "x$ac_cv_prog_cc_c99" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cc_c99" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
-     CC="$CC $ac_cv_prog_cc_c99" ;;
-esac
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
-  ac_prog_cc_stdc=c99 ;;
-esac
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
-printf %s "checking for $CC option to enable C89 features... " >&6; }
-if test ${ac_cv_prog_cc_c89+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_c_conftest_c89_program
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_arrayFOO(a) == 'x' ? 1 : -1;
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv0  ||  f (e, argv, 1) != argv1;
+  ;
+  return 0;
+}
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
+rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC ;;
-esac
-fi
+CC=$ac_save_CC
 
-if test "x$ac_cv_prog_cc_c89" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cc_c89" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
-     CC="$CC $ac_cv_prog_cc_c89" ;;
-esac
 fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
-  ac_prog_cc_stdc=c89 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
-fi
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
 fi
 
 ac_ext=c
@@ -5425,39 +4665,42 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-printf %s "checking how to run the C preprocessor... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test ${ac_cv_prog_CPP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)     # Double quotes because $CC needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
     do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -5467,56 +4710,56 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
   break
 fi
 
     done
     ac_cv_prog_CPP=$CPP
-   ;;
-esac
+
 fi
   CPP=$ac_cv_prog_CPP
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -5526,30 +4769,26 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
 
-else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -5559,192 +4798,230 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
-printf %s "checking for egrep -e... " >&6; }
-if test ${ac_cv_path_EGREP_TRADITIONAL+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -z "$EGREP_TRADITIONAL"; then
-  ac_path_EGREP_TRADITIONAL_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in grep ggrep
-   do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
-# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
-  # Check for GNU $ac_path_EGREP_TRADITIONAL
-case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
-*GNU*)
-  ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
-#(
-*)
-  ac_count=0
-  printf %s 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
-    "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
-      ac_path_EGREP_TRADITIONAL_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_TRADITIONAL_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then
-    :
-  fi
-else
-  ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL
-fi
-
-    if test "$ac_cv_path_EGREP_TRADITIONAL"
-then :
-  ac_cv_path_EGREP_TRADITIONAL="$ac_cv_path_EGREP_TRADITIONAL -E"
-else case e in #(
-  e) if test -z "$EGREP_TRADITIONAL"; then
-  ac_path_EGREP_TRADITIONAL_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in egrep
-   do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
-# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
-  # Check for GNU $ac_path_EGREP_TRADITIONAL
-case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
-*GNU*)
-  ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
-#(
-*)
-  ac_count=0
-  printf %s 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
-    "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
-      ac_path_EGREP_TRADITIONAL_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_TRADITIONAL_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL
-fi
- ;;
-esac
-fi ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
-printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
- EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL
-
 
   ICC="no"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for icc" >&5
-printf %s "checking for icc... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for icc" >&5
+$as_echo_n "checking for icc... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 __INTEL_COMPILER
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "^__INTEL_COMPILER" >/dev/null 2>&1
-then :
+  $EGREP "^__INTEL_COMPILER" >/dev/null 2>&1; then :
   ICC="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-else case e in #(
-  e) ICC="yes"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+  ICC="yes"
     GCC="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
 fi
-rm -rf conftest*
+rm -f conftest*
 
 
 
   SUNCC="no"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suncc" >&5
-printf %s "checking for suncc... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suncc" >&5
+$as_echo_n "checking for suncc... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 __SUNPRO_C
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "^__SUNPRO_C" >/dev/null 2>&1
-then :
+  $EGREP "^__SUNPRO_C" >/dev/null 2>&1; then :
   SUNCC="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-else case e in #(
-  e) SUNCC="yes"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+  SUNCC="yes"
     GCC="no"
     test -n "$auto_cflags" && CFLAGS="-O -xs -xstrconst -zlazyload"
     GCC=""
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+rm -f conftest*
+
+
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if ${ac_cv_prog_cc_c99+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+  your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data;
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+}
+
+int
+main ()
+{
+
+  // Check bool.
+  _Bool success = false;
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs ("s, d' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->datai = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_arrayni.number;
+  dynamic_arrayni.number - 1 = 543;
+
+  // work around unused variable warnings
+  return (!success || bignum == 0LL || ubignum == 0uLL || newvar0 == 'x'
+	  || dynamic_arrayni.number - 1 != 543);
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c99=$ac_arg
 fi
-rm -rf conftest*
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
 
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c99" != xno; then :
 
+fi
 
 
 ac_ext=c
@@ -5752,39 +5029,42 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-printf %s "checking how to run the C preprocessor... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test ${ac_cv_prog_CPP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)     # Double quotes because $CC needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
     do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -5794,56 +5074,56 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
   break
 fi
 
     done
     ac_cv_prog_CPP=$CPP
-   ;;
-esac
+
 fi
   CPP=$ac_cv_prog_CPP
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -5853,30 +5133,26 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
 
-else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -5885,240 +5161,247 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-ac_header= ac_cache=
-for ac_item in $ac_header_c_list
-do
-  if test $ac_cache; then
-    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
-    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
-    fi
-    ac_header= ac_cache=
-  elif test $ac_header; then
-    ac_cache=$ac_item
-  else
-    ac_header=$ac_item
-  fi
-done
-
-
-
-
-
-
-
-
-if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
-then :
-
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-
-
-
-
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test ${ac_cv_safe_to_define___extensions__+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
 
-#         define __EXTENSIONS__ 1
-          $ac_includes_default
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_safe_to_define___extensions__=yes
-else case e in #(
-  e) ac_cv_safe_to_define___extensions__=no ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
-printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
-if test ${ac_cv_should_define__xopen_source+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_should_define__xopen_source=no
-    if test $ac_cv_header_wchar_h = yes
-then :
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <string.h>
 
-          #include <wchar.h>
-          mbstate_t x;
-int
-main (void)
-{
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
 
-  ;
-  return 0;
-}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
 
-            #define _XOPEN_SOURCE 500
-            #include <wchar.h>
-            mbstate_t x;
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 int
-main (void)
+main ()
 {
-
-  ;
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_should_define__xopen_source=yes
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
 
-  printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
-  printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+fi
 
-  printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
-  printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+fi
 
-  printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+done
 
-  printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
+  MINIX=yes
+else
+  MINIX=
+fi
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+  if test "$MINIX" = yes; then
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+$as_echo "#define _MINIX 1" >>confdefs.h
 
-  printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+  fi
 
-  if test $ac_cv_header_minix_config_h = yes
-then :
-  MINIX=yes
-    printf "%s\n" "#define _MINIX 1" >>confdefs.h
 
-    printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-    printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
+int
+main ()
+{
 
-else case e in #(
-  e) MINIX= ;;
-esac
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_safe_to_define___extensions__=yes
+else
+  ac_cv_safe_to_define___extensions__=no
 fi
-  if test $ac_cv_safe_to_define___extensions__ = yes
-then :
-  printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-  if test $ac_cv_should_define__xopen_source = yes
-then :
-  printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
 
-fi
+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-printf %s "checking whether ln -s works... " >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
 
 if test "$cross_compiling" = yes ; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for native build C compiler" >&5
-printf %s "checking for native build C compiler... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native build C compiler" >&5
+$as_echo_n "checking for native build C compiler... " >&6; }
   for ac_prog in gcc clang c99 c89 cc cl
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_BUILD_CC+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$BUILD_CC"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_BUILD_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$BUILD_CC"; then
   ac_cv_prog_BUILD_CC="$BUILD_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_BUILD_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
-printf "%s\n" "$BUILD_CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
+$as_echo "$BUILD_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6126,8 +5409,8 @@
 done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
-printf "%s\n" "$BUILD_CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
+$as_echo "$BUILD_CC" >&6; }
 else
   BUILD_CC=$CC
 fi
@@ -6135,25 +5418,23 @@
 
 php_with_libdir=lib
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for system library directory" >&5
-printf %s "checking for system library directory... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for system library directory" >&5
+$as_echo_n "checking for system library directory... " >&6; }
 
 # Check whether --with-libdir was given.
-if test ${with_libdir+y}
-then :
+if test "${with_libdir+set}" = set; then :
   withval=$with_libdir; PHP_LIBDIR=$withval
-else case e in #(
-  e)
+else
+
   PHP_LIBDIR=lib
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_LIBDIR
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -6161,102 +5442,92 @@
 
 php_enable_rpath=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable runpaths" >&5
-printf %s "checking whether to enable runpaths... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable runpaths" >&5
+$as_echo_n "checking whether to enable runpaths... " >&6; }
 # Check whether --enable-rpath was given.
-if test ${enable_rpath+y}
-then :
+if test "${enable_rpath+set}" = set; then :
   enableval=$enable_rpath; PHP_RPATH=$enableval
-else case e in #(
-  e)
+else
+
   PHP_RPATH=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_RPATH
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
+
 
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -Wl,-rpath," >&5
+$as_echo_n "checking if compiler supports -Wl,-rpath,... " >&6; }
+if ${php_cv_cc_rpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler supports -Wl,-rpath," >&5
-printf %s "checking if compiler supports -Wl,-rpath,... " >&6; }
-if test ${php_cv_cc_rpath+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
   SAVE_LIBS=$LIBS
   LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   php_cv_cc_rpath=yes
-else case e in #(
-  e) php_cv_cc_rpath=no ;;
-esac
+else
+  php_cv_cc_rpath=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  LIBS=$SAVE_LIBS ;;
-esac
+  LIBS=$SAVE_LIBS
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_rpath" >&5
-printf "%s\n" "$php_cv_cc_rpath" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_rpath" >&5
+$as_echo "$php_cv_cc_rpath" >&6; }
 if test $php_cv_cc_rpath = "yes"; then
   ld_runpath_switch=-Wl,-rpath,
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler supports -R" >&5
-printf %s "checking if compiler supports -R... " >&6; }
-  if test ${php_cv_cc_dashr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -R" >&5
+$as_echo_n "checking if compiler supports -R... " >&6; }
+  if ${php_cv_cc_dashr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     SAVE_LIBS=$LIBS
     LIBS="-R /usr/$PHP_LIBDIR $LIBS"
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   php_cv_cc_dashr=yes
-else case e in #(
-  e) php_cv_cc_dashr=no ;;
-esac
+else
+  php_cv_cc_dashr=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-    LIBS=$SAVE_LIBS ;;
-esac
+    LIBS=$SAVE_LIBS
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_dashr" >&5
-printf "%s\n" "$php_cv_cc_dashr" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_dashr" >&5
+$as_echo "$php_cv_cc_dashr" >&6; }
   if test $php_cv_cc_dashr = "yes"; then
     ld_runpath_switch=-R
   else
@@ -6273,13 +5544,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_AWK+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$AWK"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6287,31 +5557,26 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6321,8 +5586,8 @@
 
   case "$AWK" in
     *mawk)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&5
-printf "%s\n" "$as_me: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&5
+$as_echo "$as_me: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&2;}
       ;;
     *gawk)
       ;;
@@ -6330,15 +5595,15 @@
       as_fn_error $? "Could not find awk; Install GNU awk" "$LINENO" 5
       ;;
     *)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $AWK is broken" >&5
-printf %s "checking if $AWK is broken... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $AWK is broken" >&5
+$as_echo_n "checking if $AWK is broken... " >&6; }
       if ! $AWK 'function foo() {}' >/dev/null 2>&1 ; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         as_fn_error $? "You should install GNU awk" "$LINENO" 5
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       fi
       ;;
   esac
@@ -6349,44 +5614,38 @@
 
   # Extract the first word of "bison", so it can be a program name with args.
 set dummy bison; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_YACC+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$YACC"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_YACC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_YACC="bison"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
-printf "%s\n" "$YACC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6395,8 +5654,8 @@
   php_bison_excluded_versions='none'
 
   if test -n "$YACC"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bison version" >&5
-printf %s "checking for bison version... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bison version" >&5
+$as_echo_n "checking for bison version... " >&6; }
 
     php_bison_version=$($YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | tr -d a-z)
     if test -z "$php_bison_version"; then
@@ -6438,11 +5697,11 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST YFLAGS"
 
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_bison_version (ok)" >&5
-printf "%s\n" "$php_bison_version (ok)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_bison_version (ok)" >&5
+$as_echo "$php_bison_version (ok)" >&6; }
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_bison_version" >&5
-printf "%s\n" "$php_bison_version" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_bison_version" >&5
+$as_echo "$php_bison_version" >&6; }
     fi
   fi
 
@@ -6463,44 +5722,38 @@
 
   # Extract the first word of "re2c", so it can be a program name with args.
 set dummy re2c; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_RE2C+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$RE2C"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RE2C+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RE2C"; then
   ac_cv_prog_RE2C="$RE2C" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RE2C="re2c"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 RE2C=$ac_cv_prog_RE2C
 if test -n "$RE2C"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RE2C" >&5
-printf "%s\n" "$RE2C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RE2C" >&5
+$as_echo "$RE2C" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6508,8 +5761,8 @@
   php_re2c_required_version="0.13.4"
 
   if test -n "$RE2C"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for re2c version" >&5
-printf %s "checking for re2c version... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for re2c version" >&5
+$as_echo_n "checking for re2c version... " >&6; }
 
     php_re2c_version=$($RE2C --version | cut -d ' ' -f 2 2>/dev/null)
     if test -z "$php_re2c_version"; then
@@ -6536,11 +5789,11 @@
     fi
 
     if test "$php_re2c_check" != "invalid"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version (ok)" >&5
-printf "%s\n" "$php_re2c_version (ok)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version (ok)" >&5
+$as_echo "$php_re2c_version (ok)" >&6; }
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version" >&5
-printf "%s\n" "$php_re2c_version" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version" >&5
+$as_echo "$php_re2c_version" >&6; }
     fi
   fi
 
@@ -6561,51 +5814,45 @@
 
   # Extract the first word of "php", so it can be a program name with args.
 set dummy php; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_PHP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$PHP"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_PHP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$PHP"; then
   ac_cv_prog_PHP="$PHP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_PHP="php"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 PHP=$ac_cv_prog_PHP
 if test -n "$PHP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP" >&5
-printf "%s\n" "$PHP" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP" >&5
+$as_echo "$PHP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
   if test -n "$PHP"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for php version" >&5
-printf %s "checking for php version... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for php version" >&5
+$as_echo_n "checking for php version... " >&6; }
     php_version=$($PHP -v | head -n1 | cut -d ' ' -f 2 | cut -d '-' -f 1)
     if test -z "$php_version"; then
       php_version=0.0.0
@@ -6615,12 +5862,12 @@
     IFS=$ac_IFS
     php_version_num=`expr ${1:-0} \* 10000 + ${2:-0} \* 100 + ${3:-0}`
         if test "$php_version_num" -lt 70400; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_version (too old)" >&5
-printf "%s\n" "$php_version (too old)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_version (too old)" >&5
+$as_echo "$php_version (too old)" >&6; }
       unset PHP
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_version (ok)" >&5
-printf "%s\n" "$php_version (ok)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_version (ok)" >&5
+$as_echo "$php_version (ok)" >&6; }
     fi
   fi
 
@@ -6631,24 +5878,22 @@
 
 php_enable_re2c_cgoto=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable computed goto gcc extension with re2c" >&5
-printf %s "checking whether to enable computed goto gcc extension with re2c... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable computed goto gcc extension with re2c" >&5
+$as_echo_n "checking whether to enable computed goto gcc extension with re2c... " >&6; }
 # Check whether --enable-re2c-cgoto was given.
-if test ${enable_re2c_cgoto+y}
-then :
+if test "${enable_re2c_cgoto+set}" = set; then :
   enableval=$enable_re2c_cgoto; PHP_RE2C_CGOTO=$enableval
-else case e in #(
-  e)
+else
+
   PHP_RE2C_CGOTO=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_RE2C_CGOTO
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -6656,13 +5901,13 @@
 if test "$PHP_RE2C_CGOTO" = "no"; then
   RE2C_FLAGS=""
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether re2c -g works" >&5
-printf %s "checking whether re2c -g works... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether re2c -g works" >&5
+$as_echo_n "checking whether re2c -g works... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
 int main(int argc, const char **argv)
@@ -6680,22 +5925,20 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
     RE2C_FLAGS=""
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+else
 
-else case e in #(
-  e)
     RE2C_FLAGS="-g"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST RE2C_FLAGS"
@@ -6717,87 +5960,75 @@
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -ffp-contract=off" >&5
-printf %s "checking whether C compiler accepts -ffp-contract=off... " >&6; }
-if test ${ax_cv_check_cflags___ffp_contract_off+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -ffp-contract=off" >&5
+$as_echo_n "checking whether C compiler accepts -ffp-contract=off... " >&6; }
+if ${ax_cv_check_cflags___ffp_contract_off+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -ffp-contract=off"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags___ffp_contract_off=yes
-else case e in #(
-  e) ax_cv_check_cflags___ffp_contract_off=no ;;
-esac
+else
+  ax_cv_check_cflags___ffp_contract_off=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___ffp_contract_off" >&5
-printf "%s\n" "$ax_cv_check_cflags___ffp_contract_off" >&6; }
-if test "x$ax_cv_check_cflags___ffp_contract_off" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___ffp_contract_off" >&5
+$as_echo "$ax_cv_check_cflags___ffp_contract_off" >&6; }
+if test "x$ax_cv_check_cflags___ffp_contract_off" = xyes; then :
   CFLAGS="$CFLAGS -ffp-contract=off"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fvisibility=hidden" >&5
-printf %s "checking whether C compiler accepts -fvisibility=hidden... " >&6; }
-if test ${ax_cv_check_cflags___fvisibility_hidden+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fvisibility=hidden" >&5
+$as_echo_n "checking whether C compiler accepts -fvisibility=hidden... " >&6; }
+if ${ax_cv_check_cflags___fvisibility_hidden+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fvisibility=hidden"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags___fvisibility_hidden=yes
-else case e in #(
-  e) ax_cv_check_cflags___fvisibility_hidden=no ;;
-esac
+else
+  ax_cv_check_cflags___fvisibility_hidden=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fvisibility_hidden" >&5
-printf "%s\n" "$ax_cv_check_cflags___fvisibility_hidden" >&6; }
-if test "x$ax_cv_check_cflags___fvisibility_hidden" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fvisibility_hidden" >&5
+$as_echo "$ax_cv_check_cflags___fvisibility_hidden" >&6; }
+if test "x$ax_cv_check_cflags___fvisibility_hidden" = xyes; then :
   CFLAGS="$CFLAGS -fvisibility=hidden"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
@@ -6818,45 +6049,45 @@
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to force non-PIC code in shared modules" >&5
-printf %s "checking whether to force non-PIC code in shared modules... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to force non-PIC code in shared modules" >&5
+$as_echo_n "checking whether to force non-PIC code in shared modules... " >&6; }
 case $host_alias in
   i?86-*-linux*|i?86-*-freebsd*)
     if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then
       with_pic=no
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
     ;;
   *)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using musl libc" >&5
-printf %s "checking whether we are using musl libc... " >&6; }
-if command -v ldd >/dev/null && ldd --version 2>&1 | grep -q ^musl
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using musl libc" >&5
+$as_echo_n "checking whether we are using musl libc... " >&6; }
+if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1
 then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define __MUSL__ 1" >>confdefs.h
+$as_echo "#define __MUSL__ 1" >>confdefs.h
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "$ac_cv_safe_to_define___extensions__" = yes ; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use -D_GNU_SOURCE cflag" >&5
-printf %s "checking whether to use -D_GNU_SOURCE cflag... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use -D_GNU_SOURCE cflag" >&5
+$as_echo_n "checking whether to use -D_GNU_SOURCE cflag... " >&6; }
   CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -6867,31 +6098,29 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether /dev/urandom exists" >&5
-printf %s "checking whether /dev/urandom exists... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether /dev/urandom exists" >&5
+$as_echo_n "checking whether /dev/urandom exists... " >&6; }
 if test -r "/dev/urandom" && test -c "/dev/urandom"; then
 
-printf "%s\n" "#define HAVE_DEV_URANDOM 1" >>confdefs.h
+$as_echo "#define HAVE_DEV_URANDOM 1" >>confdefs.h
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 # Check whether --enable-gcc-global-regs was given.
-if test ${enable_gcc_global_regs+y}
-then :
+if test "${enable_gcc_global_regs+set}" = set; then :
   enableval=$enable_gcc_global_regs; ZEND_GCC_GLOBAL_REGS=$enableval
-else case e in #(
-  e) ZEND_GCC_GLOBAL_REGS=yes ;;
-esac
+else
+  ZEND_GCC_GLOBAL_REGS=yes
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for global register variables support" >&5
-printf %s "checking for global register variables support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for global register variables support" >&5
+$as_echo_n "checking for global register variables support... " >&6; }
 if test "$ZEND_GCC_GLOBAL_REGS" != "no"; then
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6933,7 +6162,7 @@
 }
 
 int
-main (void)
+main ()
 {
 
 
@@ -6941,43 +6170,40 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
     ZEND_GCC_GLOBAL_REGS=yes
 
-else case e in #(
-  e)
+else
+
     ZEND_GCC_GLOBAL_REGS=no
-   ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 if test "$ZEND_GCC_GLOBAL_REGS" = "yes"; then
 
-printf "%s\n" "#define HAVE_GCC_GLOBAL_REGS 1" >>confdefs.h
+$as_echo "#define HAVE_GCC_GLOBAL_REGS 1" >>confdefs.h
 
 else
   HAVE_GCC_GLOBAL_REGS=no
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_GCC_GLOBAL_REGS" >&5
-printf "%s\n" "$ZEND_GCC_GLOBAL_REGS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_GCC_GLOBAL_REGS" >&5
+$as_echo "$ZEND_GCC_GLOBAL_REGS" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __cpuid_count is available" >&5
+$as_echo_n "checking whether __cpuid_count is available... " >&6; }
+if ${ac_cv_cpuid_count_available+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __cpuid_count is available" >&5
-printf %s "checking whether __cpuid_count is available... " >&6; }
-if test ${ac_cv_cpuid_count_available+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
   #include <cpuid.h>
 
 int
-main (void)
+main ()
 {
 
   unsigned eax, ebx, ecx, edx;
@@ -6987,39 +6213,35 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
   ac_cv_cpuid_count_available=yes
 
-else case e in #(
-  e)
+else
+
   ac_cv_cpuid_count_available=no
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpuid_count_available" >&5
-printf "%s\n" "$ac_cv_cpuid_count_available" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpuid_count_available" >&5
+$as_echo "$ac_cv_cpuid_count_available" >&6; }
 if test "$ac_cv_cpuid_count_available" = "yes"; then
 
-printf "%s\n" "#define HAVE_CPUID_COUNT 1" >>confdefs.h
+$as_echo "#define HAVE_CPUID_COUNT 1" >>confdefs.h
 
 fi
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
-printf %s "checking for pthreads_cflags... " >&6; }
-if test ${ac_cv_pthreads_cflags+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
+$as_echo_n "checking for pthreads_cflags... " >&6; }
+if ${ac_cv_pthreads_cflags+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
 ac_cv_pthreads_cflags=
 if test "$pthreads_working" != "yes"; then
   for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do
@@ -7044,19 +6266,17 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
   pthreads_checked=yes
 
-else case e in #(
-  e)
+else
+
   pthreads_checked=no
 
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -7065,19 +6285,17 @@
     fi
   done
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
-printf "%s\n" "$ac_cv_pthreads_cflags" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
+$as_echo "$ac_cv_pthreads_cflags" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
+$as_echo_n "checking for pthreads_lib... " >&6; }
+if ${ac_cv_pthreads_lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
-printf %s "checking for pthreads_lib... " >&6; }
-if test ${ac_cv_pthreads_lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
 ac_cv_pthreads_lib=
 if test "$pthreads_working" != "yes"; then
  for lib in pthread pthreads c_r; do
@@ -7102,19 +6320,17 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
   pthreads_checked=yes
 
-else case e in #(
-  e)
+else
+
   pthreads_checked=no
 
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -7123,11 +6339,10 @@
     fi
   done
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
-printf "%s\n" "$ac_cv_pthreads_lib" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
+$as_echo "$ac_cv_pthreads_lib" >&6; }
 
 if test "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then
   pthreads_working="yes"
@@ -7135,8 +6350,7 @@
 
 
 # Check whether --enable- was given.
-if test ${enable_+y}
-then :
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
@@ -7197,10 +6411,10 @@
 SAPI_LIBTOOL=libphp.la
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring SAPI modules${T_ME}" >&5
-printf "%s\n" "${T_MD}Configuring SAPI modules${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring SAPI modules${T_ME}" >&5
+$as_echo "${T_MD}Configuring SAPI modules${T_ME}" >&6; }
 
 
 
@@ -7216,15 +6430,13 @@
 
 
 # Check whether --with-apxs2 was given.
-if test ${with_apxs2+y}
-then :
+if test "${with_apxs2+set}" = set; then :
   withval=$with_apxs2; PHP_APXS2=$withval
-else case e in #(
-  e)
+else
+
   PHP_APXS2=no
 
- ;;
-esac
+
 fi
 
 
@@ -7234,8 +6446,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Apache 2 handler module support via DSO through APXS" >&5
-printf %s "checking for Apache 2 handler module support via DSO through APXS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apache 2 handler module support via DSO through APXS" >&5
+$as_echo_n "checking for Apache 2 handler module support via DSO through APXS... " >&6; }
 
 if test "$PHP_APXS2" != "no"; then
   if test "$PHP_APXS2" = "yes"; then
@@ -7260,24 +6472,24 @@
 
   $APXS -q CFLAGS >/dev/null 2>&1
   if test "$?" != "0"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sorry, I cannot run apxs.  Possible reasons follow:" >&5
-printf "%s\n" "Sorry, I cannot run apxs.  Possible reasons follow:" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 1. Perl is not installed" >&5
-printf "%s\n" "1. Perl is not installed" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&5
-printf "%s\n" "2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5
-printf "%s\n" "3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: The output of $APXS follows:" >&5
-printf "%s\n" "The output of $APXS follows:" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, I cannot run apxs.  Possible reasons follow:" >&5
+$as_echo "Sorry, I cannot run apxs.  Possible reasons follow:" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 1. Perl is not installed" >&5
+$as_echo "1. Perl is not installed" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&5
+$as_echo "2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5
+$as_echo "3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: The output of $APXS follows:" >&5
+$as_echo "The output of $APXS follows:" >&6; }
     $APXS -q CFLAGS
     as_fn_error $? "Aborting" "$LINENO" 5
   fi
@@ -7869,14 +7081,14 @@
 
     fi
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7887,15 +7099,13 @@
 
 
 # Check whether --enable-cli was given.
-if test ${enable_cli+y}
-then :
+if test "${enable_cli+set}" = set; then :
   enableval=$enable_cli; PHP_CLI=$enableval
-else case e in #(
-  e)
+else
+
   PHP_CLI=yes
 
- ;;
-esac
+
 fi
 
 
@@ -7905,35 +7115,43 @@
 
 
 
-ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
-if test "x$ac_cv_func_setproctitle" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETPROCTITLE 1" >>confdefs.h
+for ac_func in setproctitle
+do :
+  ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
+if test "x$ac_cv_func_setproctitle" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SETPROCTITLE 1
+_ACEOF
 
 fi
+done
 
 
-ac_fn_c_check_header_compile "$LINENO" "sys/pstat.h" "ac_cv_header_sys_pstat_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_pstat_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_PSTAT_H 1" >>confdefs.h
+for ac_header in sys/pstat.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/pstat.h" "ac_cv_header_sys_pstat_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_pstat_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_PSTAT_H 1
+_ACEOF
 
 fi
 
+done
+
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5
-printf %s "checking for PS_STRINGS... " >&6; }
-if test ${cli_cv_var_PS_STRINGS+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5
+$as_echo_n "checking for PS_STRINGS... " >&6; }
+if ${cli_cv_var_PS_STRINGS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <machine/vmparam.h>
 #include <sys/exec.h>
 
 int
-main (void)
+main ()
 {
 PS_STRINGS->ps_nargvstr = 1;
 PS_STRINGS->ps_argvstr = "foo";
@@ -7941,27 +7159,24 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   cli_cv_var_PS_STRINGS=yes
-else case e in #(
-  e) cli_cv_var_PS_STRINGS=no ;;
-esac
+else
+  cli_cv_var_PS_STRINGS=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cli_cv_var_PS_STRINGS" >&5
-printf "%s\n" "$cli_cv_var_PS_STRINGS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cli_cv_var_PS_STRINGS" >&5
+$as_echo "$cli_cv_var_PS_STRINGS" >&6; }
 if test "$cli_cv_var_PS_STRINGS" = yes ; then
 
-printf "%s\n" "#define HAVE_PS_STRINGS /**/" >>confdefs.h
+$as_echo "#define HAVE_PS_STRINGS /**/" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CLI build" >&5
-printf %s "checking for CLI build... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLI build" >&5
+$as_echo_n "checking for CLI build... " >&6; }
 if test "$PHP_CLI" != "no"; then
 
   src=$abs_srcdir/sapi/cli/Makefile.frag
@@ -8122,8 +7337,8 @@
 
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_CLI" >&5
-printf "%s\n" "$PHP_CLI" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_CLI" >&5
+$as_echo "$PHP_CLI" >&6; }
 
 
 
@@ -8133,15 +7348,13 @@
 
 
 # Check whether --enable-embed was given.
-if test ${enable_embed+y}
-then :
+if test "${enable_embed+set}" = set; then :
   enableval=$enable_embed; PHP_EMBED=$enableval
-else case e in #(
-  e)
+else
+
   PHP_EMBED=no
 
- ;;
-esac
+
 fi
 
 
@@ -8151,8 +7364,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for embedded SAPI library support" >&5
-printf %s "checking for embedded SAPI library support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for embedded SAPI library support" >&5
+$as_echo_n "checking for embedded SAPI library support... " >&6; }
 
 if test "$PHP_EMBED" != "no"; then
   case "$PHP_EMBED" in
@@ -8355,11 +7568,11 @@
 
 
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_EMBED_TYPE" >&5
-printf "%s\n" "$PHP_EMBED_TYPE" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_EMBED_TYPE" >&5
+$as_echo "$PHP_EMBED_TYPE" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8370,15 +7583,13 @@
 
 
 # Check whether --enable-fpm was given.
-if test ${enable_fpm+y}
-then :
+if test "${enable_fpm+set}" = set; then :
   enableval=$enable_fpm; PHP_FPM=$enableval
-else case e in #(
-  e)
+else
+
   PHP_FPM=no
 
- ;;
-esac
+
 fi
 
 
@@ -8418,304 +7629,267 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FPM build" >&5
-printf %s "checking for FPM build... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FPM build" >&5
+$as_echo_n "checking for FPM build... " >&6; }
 if test "$PHP_FPM" != "no"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_FPM" >&5
-printf "%s\n" "$PHP_FPM" >&6; }
-
-
-  ac_fn_c_check_func "$LINENO" "clearenv" "ac_cv_func_clearenv"
-if test "x$ac_cv_func_clearenv" = xyes
-then :
-  printf "%s\n" "#define HAVE_CLEARENV 1" >>confdefs.h
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_FPM" >&5
+$as_echo "$PHP_FPM" >&6; }
 
-fi
-ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
-if test "x$ac_cv_func_setproctitle" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETPROCTITLE 1" >>confdefs.h
 
-fi
-ac_fn_c_check_func "$LINENO" "setproctitle_fast" "ac_cv_func_setproctitle_fast"
-if test "x$ac_cv_func_setproctitle_fast" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETPROCTITLE_FAST 1" >>confdefs.h
+  for ac_func in clearenv setproctitle setproctitle_fast
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
-printf %s "checking for library containing socket... " >&6; }
-if test ${ac_cv_search_socket+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_func_search_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
+$as_echo_n "checking for library containing socket... " >&6; }
+if ${ac_cv_search_socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char socket (void);
+char socket ();
 int
-main (void)
+main ()
 {
 return socket ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' socket
-do
+for ac_lib in '' socket; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"
-then :
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_socket=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_socket+y}
-then :
+  if ${ac_cv_search_socket+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_socket+y}
-then :
+if ${ac_cv_search_socket+:} false; then :
 
-else case e in #(
-  e) ac_cv_search_socket=no ;;
-esac
+else
+  ac_cv_search_socket=no
 fi
 rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS ;;
-esac
+LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
-printf "%s\n" "$ac_cv_search_socket" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
+$as_echo "$ac_cv_search_socket" >&6; }
 ac_res=$ac_cv_search_socket
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing inet_addr" >&5
-printf %s "checking for library containing inet_addr... " >&6; }
-if test ${ac_cv_search_inet_addr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_func_search_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_addr" >&5
+$as_echo_n "checking for library containing inet_addr... " >&6; }
+if ${ac_cv_search_inet_addr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char inet_addr (void);
+char inet_addr ();
 int
-main (void)
+main ()
 {
 return inet_addr ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' nsl
-do
+for ac_lib in '' nsl; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"
-then :
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_inet_addr=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_inet_addr+y}
-then :
+  if ${ac_cv_search_inet_addr+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_inet_addr+y}
-then :
+if ${ac_cv_search_inet_addr+:} false; then :
 
-else case e in #(
-  e) ac_cv_search_inet_addr=no ;;
-esac
+else
+  ac_cv_search_inet_addr=no
 fi
 rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS ;;
-esac
+LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_addr" >&5
-printf "%s\n" "$ac_cv_search_inet_addr" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_addr" >&5
+$as_echo "$ac_cv_search_inet_addr" >&6; }
 ac_res=$ac_cv_search_inet_addr
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for prctl" >&5
-printf %s "checking for prctl... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prctl" >&5
+$as_echo_n "checking for prctl... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/prctl.h>
 int
-main (void)
+main ()
 {
 prctl(0, 0, 0, 0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_PRCTL 1" >>confdefs.h
+$as_echo "#define HAVE_PRCTL 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for procctl" >&5
-printf %s "checking for procctl... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for procctl" >&5
+$as_echo_n "checking for procctl... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/procctl.h>
 int
-main (void)
+main ()
 {
 procctl(0, 0, 0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_PROCCTL 1" >>confdefs.h
+$as_echo "#define HAVE_PROCCTL 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setpflags" >&5
-printf %s "checking for setpflags... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setpflags" >&5
+$as_echo_n "checking for setpflags... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <priv.h>
 int
-main (void)
+main ()
 {
 setpflags(0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_SETPFLAGS 1" >>confdefs.h
+$as_echo "#define HAVE_SETPFLAGS 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
   have_clock_gettime=no
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime" >&5
-printf %s "checking for clock_gettime... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime" >&5
+$as_echo_n "checking for clock_gettime... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 int
-main (void)
+main ()
 {
 struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_clock_gettime=yes
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
   if test "$have_clock_gettime" = "no"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-printf %s "checking for clock_gettime in -lrt... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
+$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
 
     SAVED_LIBS="$LIBS"
     LIBS="$LIBS -lrt"
@@ -8724,50 +7898,47 @@
 /* end confdefs.h.  */
 #include <time.h>
 int
-main (void)
+main ()
 {
 struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
       have_clock_gettime=yes
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
       LIBS="$SAVED_LIBS"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   fi
 
   if test "$have_clock_gettime" = "yes"; then
 
-printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
+$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
 
   fi
 
   have_clock_get_time=no
 
   if test "$have_clock_gettime" = "no"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_get_time" >&5
-printf %s "checking for clock_get_time... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_get_time" >&5
+$as_echo_n "checking for clock_get_time... " >&6; }
 
-    if test "$cross_compiling" = yes
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (cross-compiling)" >&5
-printf "%s\n" "no (cross-compiling)" >&6; }
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross-compiling)" >&5
+$as_echo "no (cross-compiling)" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <mach/mach.h>
       #include <mach/clock.h>
@@ -8791,30 +7962,27 @@
       }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
       have_clock_get_time=yes
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   fi
 
   if test "$have_clock_get_time" = "yes"; then
 
-printf "%s\n" "#define HAVE_CLOCK_GET_TIME 1" >>confdefs.h
+$as_echo "#define HAVE_CLOCK_GET_TIME 1" >>confdefs.h
 
   fi
 
@@ -8822,8 +7990,8 @@
   have_ptrace=no
   have_broken_ptrace=no
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ptrace" >&5
-printf %s "checking for ptrace... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ptrace" >&5
+$as_echo_n "checking for ptrace... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8831,41 +7999,38 @@
     #include <sys/types.h>
     #include <sys/ptrace.h>
 int
-main (void)
+main ()
 {
 ptrace(0, 0, (void *) 0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
     have_ptrace=yes
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
   if test "$have_ptrace" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ptrace works" >&5
-printf %s "checking whether ptrace works... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ptrace works" >&5
+$as_echo_n "checking whether ptrace works... " >&6; }
 
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: skipped (cross-compiling)" >&5
-printf "%s\n" "skipped (cross-compiling)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped (cross-compiling)" >&5
+$as_echo "skipped (cross-compiling)" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
       #include <unistd.h>
@@ -8936,39 +8101,36 @@
       }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
       have_ptrace=no
       have_broken_ptrace=yes
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   fi
 
   if test "$have_ptrace" = "yes"; then
 
-printf "%s\n" "#define HAVE_PTRACE 1" >>confdefs.h
+$as_echo "#define HAVE_PTRACE 1" >>confdefs.h
 
   fi
 
   have_mach_vm_read=no
 
   if test "$have_broken_ptrace" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mach_vm_read" >&5
-printf %s "checking for mach_vm_read... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mach_vm_read" >&5
+$as_echo_n "checking for mach_vm_read... " >&6; }
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8976,7 +8138,7 @@
       #include <mach/mach_vm.h>
 
 int
-main (void)
+main ()
 {
 
       mach_vm_read((vm_map_t)0, (mach_vm_address_t)0, (mach_vm_size_t)0, (vm_offset_t *)0, (mach_msg_type_number_t*)0);
@@ -8985,26 +8147,24 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
       have_mach_vm_read=yes
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
 
   if test "$have_mach_vm_read" = "yes"; then
 
-printf "%s\n" "#define HAVE_MACH_VM_READ 1" >>confdefs.h
+$as_echo "#define HAVE_MACH_VM_READ 1" >>confdefs.h
 
   fi
 
@@ -9019,17 +8179,16 @@
   fi
 
   if test -n "$proc_mem_file" ; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for proc mem file" >&5
-printf %s "checking for proc mem file... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for proc mem file" >&5
+$as_echo_n "checking for proc mem file... " >&6; }
 
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: skipped (cross-compiling)" >&5
-printf "%s\n" "skipped (cross-compiling)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped (cross-compiling)" >&5
+$as_echo "skipped (cross-compiling)" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
       #define _GNU_SOURCE
@@ -9059,30 +8218,29 @@
       }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $proc_mem_file" >&5
-printf "%s\n" "$proc_mem_file" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $proc_mem_file" >&5
+$as_echo "$proc_mem_file" >&6; }
+
+else
 
-else case e in #(
-  e)
       proc_mem_file=""
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   fi
 
   if test -n "$proc_mem_file"; then
 
-printf "%s\n" "#define PROC_MEM_FILE \"$proc_mem_file\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PROC_MEM_FILE "$proc_mem_file"
+_ACEOF
 
   fi
 
@@ -9098,19 +8256,19 @@
     fpm_trace_type=mach
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&5
-printf "%s\n" "$as_me: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&5
+$as_echo "$as_me: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&2;}
   fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if gcc supports __sync_bool_compare_and_swap" >&5
-printf %s "checking if gcc supports __sync_bool_compare_and_swap... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc supports __sync_bool_compare_and_swap" >&5
+$as_echo_n "checking if gcc supports __sync_bool_compare_and_swap... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     int variable = 1;
@@ -9121,207 +8279,195 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_BUILTIN_ATOMIC 1" >>confdefs.h
+$as_echo "#define HAVE_BUILTIN_ATOMIC 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
   have_lq=no
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TCP_INFO" >&5
-printf %s "checking for TCP_INFO... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCP_INFO" >&5
+$as_echo_n "checking for TCP_INFO... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netinet/tcp.h>
 int
-main (void)
+main ()
 {
 struct tcp_info ti; int x = TCP_INFO;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
     have_lq=tcp_info
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
   if test "$have_lq" = "tcp_info"; then
 
-printf "%s\n" "#define HAVE_LQ_TCP_INFO 1" >>confdefs.h
+$as_echo "#define HAVE_LQ_TCP_INFO 1" >>confdefs.h
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TCP_CONNECTION_INFO" >&5
-printf %s "checking for TCP_CONNECTION_INFO... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCP_CONNECTION_INFO" >&5
+$as_echo_n "checking for TCP_CONNECTION_INFO... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netinet/tcp.h>
 int
-main (void)
+main ()
 {
 struct tcp_connection_info ti; int x = TCP_CONNECTION_INFO;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
     have_lq=tcp_connection_info
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
   if test "$have_lq" = "tcp_connection_info"; then
 
-printf "%s\n" "#define HAVE_LQ_TCP_CONNECTION_INFO 1" >>confdefs.h
+$as_echo "#define HAVE_LQ_TCP_CONNECTION_INFO 1" >>confdefs.h
 
   fi
 
   if test "$have_lq" = "no" ; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SO_LISTENQLEN" >&5
-printf %s "checking for SO_LISTENQLEN... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SO_LISTENQLEN" >&5
+$as_echo_n "checking for SO_LISTENQLEN... " >&6; }
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/socket.h>
 int
-main (void)
+main ()
 {
 int x = SO_LISTENQLIMIT; int y = SO_LISTENQLEN;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
       have_lq=so_listenq
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
     if test "$have_lq" = "tcp_info"; then
 
-printf "%s\n" "#define HAVE_LQ_SO_LISTENQ 1" >>confdefs.h
+$as_echo "#define HAVE_LQ_SO_LISTENQ 1" >>confdefs.h
 
     fi
   fi
 
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysconf" >&5
-printf %s "checking for sysconf... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf" >&5
+$as_echo_n "checking for sysconf... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 int
-main (void)
+main ()
 {
 sysconf(_SC_CLK_TCK);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_SYSCONF 1" >>confdefs.h
+$as_echo "#define HAVE_SYSCONF 1" >>confdefs.h
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	 ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for times" >&5
-printf %s "checking for times... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for times" >&5
+$as_echo_n "checking for times... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/times.h>
 int
-main (void)
+main ()
 {
 struct tms t; times(&t);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_TIMES 1" >>confdefs.h
+$as_echo "#define HAVE_TIMES 1" >>confdefs.h
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	 ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for kqueue" >&5
-printf %s "checking for kqueue... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kqueue" >&5
+$as_echo_n "checking for kqueue... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9331,7 +8477,7 @@
 		#include <sys/time.h>
 
 int
-main (void)
+main ()
 {
 
 		int kfd;
@@ -9344,27 +8490,25 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_KQUEUE 1" >>confdefs.h
+$as_echo "#define HAVE_KQUEUE 1" >>confdefs.h
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	 ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for port framework" >&5
-printf %s "checking for port framework... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for port framework" >&5
+$as_echo_n "checking for port framework... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9372,7 +8516,7 @@
 		#include <port.h>
 
 int
-main (void)
+main ()
 {
 
 		int port;
@@ -9386,27 +8530,25 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_PORT 1" >>confdefs.h
+$as_echo "#define HAVE_PORT 1" >>confdefs.h
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	 ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /dev/poll" >&5
-printf %s "checking for /dev/poll... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/poll" >&5
+$as_echo_n "checking for /dev/poll... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9415,7 +8557,7 @@
 		#include <sys/devpoll.h>
 
 int
-main (void)
+main ()
 {
 
 		int n, dp;
@@ -9430,27 +8572,25 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_DEVPOLL 1" >>confdefs.h
+$as_echo "#define HAVE_DEVPOLL 1" >>confdefs.h
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	 ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for epoll" >&5
-printf %s "checking for epoll... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll" >&5
+$as_echo_n "checking for epoll... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9458,7 +8598,7 @@
 		#include <sys/epoll.h>
 
 int
-main (void)
+main ()
 {
 
 		int epollfd;
@@ -9485,27 +8625,25 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_EPOLL 1" >>confdefs.h
+$as_echo "#define HAVE_EPOLL 1" >>confdefs.h
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	 ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for select" >&5
-printf %s "checking for select... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for select" >&5
+$as_echo_n "checking for select... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9519,7 +8657,7 @@
 		#include <unistd.h>
 
 int
-main (void)
+main ()
 {
 
 		fd_set fds;
@@ -9535,23 +8673,21 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_SELECT 1" >>confdefs.h
+$as_echo "#define HAVE_SELECT 1" >>confdefs.h
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	 ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
@@ -9560,15 +8696,13 @@
 
 
 # Check whether --with-fpm-user was given.
-if test ${with_fpm_user+y}
-then :
+if test "${with_fpm_user+set}" = set; then :
   withval=$with_fpm_user; PHP_FPM_USER=$withval
-else case e in #(
-  e)
+else
+
   PHP_FPM_USER=nobody
 
- ;;
-esac
+
 fi
 
 
@@ -9584,15 +8718,13 @@
 
 
 # Check whether --with-fpm-group was given.
-if test ${with_fpm_group+y}
-then :
+if test "${with_fpm_group+set}" = set; then :
   withval=$with_fpm_group; PHP_FPM_GROUP=$withval
-else case e in #(
-  e)
+else
+
   PHP_FPM_GROUP=nobody
 
- ;;
-esac
+
 fi
 
 
@@ -9608,15 +8740,13 @@
 
 
 # Check whether --with-fpm-systemd was given.
-if test ${with_fpm_systemd+y}
-then :
+if test "${with_fpm_systemd+set}" = set; then :
   withval=$with_fpm_systemd; PHP_FPM_SYSTEMD=$withval
-else case e in #(
-  e)
+else
+
   PHP_FPM_SYSTEMD=no
 
- ;;
-esac
+
 fi
 
 
@@ -9632,15 +8762,13 @@
 
 
 # Check whether --with-fpm-acl was given.
-if test ${with_fpm_acl+y}
-then :
+if test "${with_fpm_acl+set}" = set; then :
   withval=$with_fpm_acl; PHP_FPM_ACL=$withval
-else case e in #(
-  e)
+else
+
   PHP_FPM_ACL=no
 
- ;;
-esac
+
 fi
 
 
@@ -9656,15 +8784,13 @@
 
 
 # Check whether --with-fpm-apparmor was given.
-if test ${with_fpm_apparmor+y}
-then :
+if test "${with_fpm_apparmor+set}" = set; then :
   withval=$with_fpm_apparmor; PHP_FPM_APPARMOR=$withval
-else case e in #(
-  e)
+else
+
   PHP_FPM_APPARMOR=no
 
- ;;
-esac
+
 fi
 
 
@@ -9680,15 +8806,13 @@
 
 
 # Check whether --with-fpm-selinux was given.
-if test ${with_fpm_selinux+y}
-then :
+if test "${with_fpm_selinux+set}" = set; then :
   withval=$with_fpm_selinux; PHP_FPM_SELINUX=$withval
-else case e in #(
-  e)
+else
+
   PHP_FPM_SELINUX=no
 
- ;;
-esac
+
 fi
 
 
@@ -9701,17 +8825,17 @@
   if test "$PHP_FPM_SYSTEMD" != "no" ; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd >= 209" >&5
-printf %s "checking for libsystemd >= 209... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd >= 209" >&5
+$as_echo_n "checking for libsystemd >= 209... " >&6; }
 
 if test -n "$SYSTEMD_CFLAGS"; then
     pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -9725,10 +8849,10 @@
     pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -9742,8 +8866,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -9769,10 +8893,10 @@
 and SYSTEMD_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -9782,33 +8906,34 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
 	SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
-           for ac_header in systemd/sd-daemon.h
+    for ac_header in systemd/sd-daemon.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default"
-if test "x$ac_cv_header_systemd_sd_daemon_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYSTEMD_SD_DAEMON_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default"
+if test "x$ac_cv_header_systemd_sd_daemon_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYSTEMD_SD_DAEMON_H 1
+_ACEOF
  HAVE_SD_DAEMON_H="yes"
-else case e in #(
-  e) HAVE_SD_DAEMON_H="no" ;;
-esac
+else
+  HAVE_SD_DAEMON_H="no"
 fi
 
 done
+
     if test $HAVE_SD_DAEMON_H = "no"; then
       as_fn_error $? "Your system does not support systemd." "$LINENO" 5
     else
 
-printf "%s\n" "#define HAVE_SYSTEMD 1" >>confdefs.h
+$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h
 
       PHP_FPM_SD_FILES="fpm/fpm_systemd.c"
 
@@ -9939,15 +9064,20 @@
   fi
 
   if test "$PHP_FPM_ACL" != "no" ; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for acl user/group permissions support" >&5
-printf %s "checking for acl user/group permissions support... " >&6; }
-    ac_fn_c_check_header_compile "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_acl_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_ACL_H 1" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl user/group permissions support" >&5
+$as_echo_n "checking for acl user/group permissions support... " >&6; }
+    for ac_header in sys/acl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_acl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_ACL_H 1
+_ACEOF
 
 fi
 
+done
+
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9966,54 +9096,45 @@
       }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for acl_free in -lacl" >&5
-printf %s "checking for acl_free in -lacl... " >&6; }
-if test ${ac_cv_lib_acl_acl_free+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_free in -lacl" >&5
+$as_echo_n "checking for acl_free in -lacl... " >&6; }
+if ${ac_cv_lib_acl_acl_free+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lacl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char acl_free (void);
+char acl_free ();
 int
-main (void)
+main ()
 {
 return acl_free ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_acl_acl_free=yes
-else case e in #(
-  e) ac_cv_lib_acl_acl_free=no ;;
-esac
+else
+  ac_cv_lib_acl_acl_free=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_free" >&5
-printf "%s\n" "$ac_cv_lib_acl_acl_free" >&6; }
-if test "x$ac_cv_lib_acl_acl_free" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_free" >&5
+$as_echo "$ac_cv_lib_acl_acl_free" >&6; }
+if test "x$ac_cv_lib_acl_acl_free" = xyes; then :
 
 
   case acl in
@@ -10025,17 +9146,16 @@
 
 
           have_fpm_acl=yes
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-else case e in #(
-  e)
-          if test "$cross_compiling" = yes
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: skipped" >&5
-printf "%s\n" "skipped" >&6; }
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+
+          if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped" >&5
+$as_echo "skipped" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/acl.h>
             int main(void)
@@ -10052,101 +9172,93 @@
             }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
             have_fpm_acl=yes
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
             have_fpm_acl=no
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-           ;;
-esac
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-         ;;
-esac
+
 fi
 
 
-else case e in #(
-  e)
+else
+
       have_fpm_acl=no
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
     if test "$have_fpm_acl" = "yes"; then
 
-printf "%s\n" "#define HAVE_FPM_ACL 1" >>confdefs.h
+$as_echo "#define HAVE_FPM_ACL 1" >>confdefs.h
 
     fi
   fi
 
   if test "x$PHP_FPM_APPARMOR" != "xno" ; then
-    ac_fn_c_check_header_compile "$LINENO" "sys/apparmor.h" "ac_cv_header_sys_apparmor_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_apparmor_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_APPARMOR_H 1" >>confdefs.h
+    for ac_header in sys/apparmor.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/apparmor.h" "ac_cv_header_sys_apparmor_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_apparmor_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_APPARMOR_H 1
+_ACEOF
 
 fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for aa_change_profile in -lapparmor" >&5
-printf %s "checking for aa_change_profile in -lapparmor... " >&6; }
-if test ${ac_cv_lib_apparmor_aa_change_profile+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+done
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aa_change_profile in -lapparmor" >&5
+$as_echo_n "checking for aa_change_profile in -lapparmor... " >&6; }
+if ${ac_cv_lib_apparmor_aa_change_profile+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lapparmor  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char aa_change_profile (void);
+char aa_change_profile ();
 int
-main (void)
+main ()
 {
 return aa_change_profile ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_apparmor_aa_change_profile=yes
-else case e in #(
-  e) ac_cv_lib_apparmor_aa_change_profile=no ;;
-esac
+else
+  ac_cv_lib_apparmor_aa_change_profile=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apparmor_aa_change_profile" >&5
-printf "%s\n" "$ac_cv_lib_apparmor_aa_change_profile" >&6; }
-if test "x$ac_cv_lib_apparmor_aa_change_profile" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apparmor_aa_change_profile" >&5
+$as_echo "$ac_cv_lib_apparmor_aa_change_profile" >&6; }
+if test "x$ac_cv_lib_apparmor_aa_change_profile" = xyes; then :
 
 
 
@@ -10159,71 +9271,67 @@
 
 
 
-printf "%s\n" "#define HAVE_APPARMOR 1" >>confdefs.h
+$as_echo "#define HAVE_APPARMOR 1" >>confdefs.h
 
 
-else case e in #(
-  e)
+else
+
       as_fn_error $? "libapparmor required but not found" "$LINENO" 5
-     ;;
-esac
+
 fi
 
   fi
 
   if test "x$PHP_FPM_SELINUX" != "xno" ; then
-    ac_fn_c_check_header_compile "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
-if test "x$ac_cv_header_selinux_selinux_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SELINUX_SELINUX_H 1" >>confdefs.h
+    for ac_header in selinux/selinux.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
+if test "x$ac_cv_header_selinux_selinux_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SELINUX_SELINUX_H 1
+_ACEOF
 
 fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for security_setenforce in -lselinux" >&5
-printf %s "checking for security_setenforce in -lselinux... " >&6; }
-if test ${ac_cv_lib_selinux_security_setenforce+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+done
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for security_setenforce in -lselinux" >&5
+$as_echo_n "checking for security_setenforce in -lselinux... " >&6; }
+if ${ac_cv_lib_selinux_security_setenforce+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lselinux  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char security_setenforce (void);
+char security_setenforce ();
 int
-main (void)
+main ()
 {
 return security_setenforce ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_selinux_security_setenforce=yes
-else case e in #(
-  e) ac_cv_lib_selinux_security_setenforce=no ;;
-esac
+else
+  ac_cv_lib_selinux_security_setenforce=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_security_setenforce" >&5
-printf "%s\n" "$ac_cv_lib_selinux_security_setenforce" >&6; }
-if test "x$ac_cv_lib_selinux_security_setenforce" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_security_setenforce" >&5
+$as_echo "$ac_cv_lib_selinux_security_setenforce" >&6; }
+if test "x$ac_cv_lib_selinux_security_setenforce" = xyes; then :
 
 
 
@@ -10236,7 +9344,7 @@
 
 
 
-printf "%s\n" "#define HAVE_SELINUX 1" >>confdefs.h
+$as_echo "#define HAVE_SELINUX 1" >>confdefs.h
 
 
 fi
@@ -10250,7 +9358,9 @@
 
 
 
-printf "%s\n" "#define PHP_FPM_SYSTEMD \"$php_fpm_systemd\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_FPM_SYSTEMD "$php_fpm_systemd"
+_ACEOF
 
 
   if test -z "$PHP_FPM_USER" -o "$PHP_FPM_USER" = "yes" -o "$PHP_FPM_USER" = "no"; then
@@ -10300,10 +9410,14 @@
 
 
 
-printf "%s\n" "#define PHP_FPM_USER \"$php_fpm_user\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_FPM_USER "$php_fpm_user"
+_ACEOF
 
 
-printf "%s\n" "#define PHP_FPM_GROUP \"$php_fpm_group\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_FPM_GROUP "$php_fpm_group"
+_ACEOF
 
 
 
@@ -10483,30 +9597,28 @@
 
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clang fuzzer SAPI" >&5
-printf %s "checking for clang fuzzer SAPI... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang fuzzer SAPI" >&5
+$as_echo_n "checking for clang fuzzer SAPI... " >&6; }
 
 
 php_enable_fuzzer=no
 
 
 # Check whether --enable-fuzzer was given.
-if test ${enable_fuzzer+y}
-then :
+if test "${enable_fuzzer+set}" = set; then :
   enableval=$enable_fuzzer; PHP_FUZZER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_FUZZER=no
 
- ;;
-esac
+
 fi
 
 
@@ -10520,15 +9632,9 @@
 
 
 if test "$PHP_FUZZER" != "no"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-
-
-
-
-
-
-ac_ext=cpp
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -10538,48 +9644,42 @@
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CXX"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-printf "%s\n" "$CXX" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -10588,48 +9688,42 @@
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_CXX"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-printf "%s\n" "$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -10641,8 +9735,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -10652,7 +9746,7 @@
   fi
 fi
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -10662,7 +9756,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -10672,21 +9766,20 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
-printf %s "checking whether the compiler supports GNU C++... " >&6; }
-if test ${ac_cv_cxx_compiler_gnu+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 #ifndef __GNUC__
        choke me
@@ -10696,36 +9789,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
-else case e in #(
-  e) ac_compiler_gnu=no ;;
-esac
+else
+  ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GXX=yes
 else
   GXX=
 fi
-ac_test_CXXFLAGS=${CXXFLAGS+y}
+ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-printf %s "checking whether $CXX accepts -g... " >&6; }
-if test ${ac_cv_prog_cxx_g+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
    CXXFLAGS="-g"
@@ -10733,63 +9820,57 @@
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
-else case e in #(
-  e) CXXFLAGS=""
+else
+  CXXFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
-else case e in #(
-  e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
-if test $ac_test_CXXFLAGS; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
@@ -10804,106 +9885,6 @@
     CXXFLAGS=
   fi
 fi
-ac_prog_cxx_stdcxx=no
-if test x$ac_prog_cxx_stdcxx = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
-printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx11+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cxx_cxx11=no
-ac_save_CXX=$CXX
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_cxx_conftest_cxx11_program
-_ACEOF
-for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
-do
-  CXX="$ac_save_CXX $ac_arg"
-  if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ac_cv_prog_cxx_cxx11=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CXX=$ac_save_CXX ;;
-esac
-fi
-
-if test "x$ac_cv_prog_cxx_cxx11" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cxx_cxx11" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx11" ;;
-esac
-fi
-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
-  ac_prog_cxx_stdcxx=cxx11 ;;
-esac
-fi
-fi
-if test x$ac_prog_cxx_stdcxx = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
-printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx98+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cxx_cxx98=no
-ac_save_CXX=$CXX
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_cxx_conftest_cxx98_program
-_ACEOF
-for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
-do
-  CXX="$ac_save_CXX $ac_arg"
-  if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ac_cv_prog_cxx_cxx98=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CXX=$ac_save_CXX ;;
-esac
-fi
-
-if test "x$ac_cv_prog_cxx_cxx98" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cxx_cxx98" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx98" ;;
-esac
-fi
-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
-  ac_prog_cxx_stdcxx=cxx98 ;;
-esac
-fi
-fi
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10915,35 +9896,38 @@
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-printf %s "checking how to run the C++ preprocessor... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if test ${ac_cv_prog_CXXCPP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)     # Double quotes because $CXX needs to be expanded
-    for CXXCPP in "$CXX -E" cpp /lib/cpp
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
     do
       ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -10953,56 +9937,56 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
   break
 fi
 
     done
     ac_cv_prog_CXXCPP=$CXXCPP
-   ;;
-esac
+
 fi
   CXXCPP=$ac_cv_prog_CXXCPP
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-printf "%s\n" "$CXXCPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -11012,30 +9996,26 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
 
-else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -11057,50 +10037,44 @@
   if test -z "$LIB_FUZZING_ENGINE"; then
     FUZZING_LIB="-fsanitize=fuzzer"
     FUZZING_CC="$CC"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=fuzzer-no-link" >&5
-printf %s "checking whether C compiler accepts -fsanitize=fuzzer-no-link... " >&6; }
-if test ${ax_cv_check_cflags___fsanitize_fuzzer_no_link+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=fuzzer-no-link" >&5
+$as_echo_n "checking whether C compiler accepts -fsanitize=fuzzer-no-link... " >&6; }
+if ${ax_cv_check_cflags___fsanitize_fuzzer_no_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fsanitize=fuzzer-no-link"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags___fsanitize_fuzzer_no_link=yes
-else case e in #(
-  e) ax_cv_check_cflags___fsanitize_fuzzer_no_link=no ;;
-esac
+else
+  ax_cv_check_cflags___fsanitize_fuzzer_no_link=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&5
-printf "%s\n" "$ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&6; }
-if test "x$ax_cv_check_cflags___fsanitize_fuzzer_no_link" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&5
+$as_echo "$ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&6; }
+if test "x$ax_cv_check_cflags___fsanitize_fuzzer_no_link" = xyes; then :
 
       CFLAGS="$CFLAGS -fsanitize=fuzzer-no-link"
       CXXFLAGS="$CXXFLAGS -fsanitize=fuzzer-no-link"
 
-else case e in #(
-  e)
+else
+
       as_fn_error $? "Compiler doesn't support -fsanitize=fuzzer-no-link" "$LINENO" 5
-     ;;
-esac
+
 fi
 
   else
@@ -11692,29 +10666,27 @@
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_FUZZER" >&5
-printf "%s\n" "$PHP_FUZZER" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_FUZZER" >&5
+$as_echo "$PHP_FUZZER" >&6; }
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LiteSpeed support" >&5
-printf %s "checking for LiteSpeed support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LiteSpeed support" >&5
+$as_echo_n "checking for LiteSpeed support... " >&6; }
 
 
 php_enable_litespeed=no
 
 
 # Check whether --enable-litespeed was given.
-if test ${enable_litespeed+y}
-then :
+if test "${enable_litespeed+set}" = set; then :
   enableval=$enable_litespeed; PHP_LITESPEED=$enableval
-else case e in #(
-  e)
+else
+
   PHP_LITESPEED=no
   test "$PHP_ENABLE_ALL" && PHP_LITESPEED=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -11872,8 +10844,8 @@
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_LITESPEED" >&5
-printf "%s\n" "$PHP_LITESPEED" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_LITESPEED" >&5
+$as_echo "$PHP_LITESPEED" >&6; }
 
 
 
@@ -11881,18 +10853,16 @@
 
 php_enable_phpdbg=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg support" >&5
-printf %s "checking for phpdbg support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for phpdbg support" >&5
+$as_echo_n "checking for phpdbg support... " >&6; }
 # Check whether --enable-phpdbg was given.
-if test ${enable_phpdbg+y}
-then :
+if test "${enable_phpdbg+set}" = set; then :
   enableval=$enable_phpdbg; PHP_PHPDBG=$enableval
-else case e in #(
-  e)
+else
+
   PHP_PHPDBG=yes
   test "$PHP_ENABLE_ALL" && PHP_PHPDBG=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -11918,8 +10888,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -11927,24 +10897,22 @@
 
 php_enable_phpdbg_debug=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg debug build" >&5
-printf %s "checking for phpdbg debug build... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for phpdbg debug build" >&5
+$as_echo_n "checking for phpdbg debug build... " >&6; }
 # Check whether --enable-phpdbg-debug was given.
-if test ${enable_phpdbg_debug+y}
-then :
+if test "${enable_phpdbg_debug+set}" = set; then :
   enableval=$enable_phpdbg_debug; PHP_PHPDBG_DEBUG=$enableval
-else case e in #(
-  e)
+else
+
   PHP_PHPDBG_DEBUG=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_PHPDBG_DEBUG
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -11952,132 +10920,129 @@
 
 php_enable_phpdbg_readline=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg readline support" >&5
-printf %s "checking for phpdbg readline support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for phpdbg readline support" >&5
+$as_echo_n "checking for phpdbg readline support... " >&6; }
 # Check whether --enable-phpdbg-readline was given.
-if test ${enable_phpdbg_readline+y}
-then :
+if test "${enable_phpdbg_readline+set}" = set; then :
   enableval=$enable_phpdbg_readline; PHP_PHPDBG_READLINE=$enableval
-else case e in #(
-  e)
+else
+
   PHP_PHPDBG_READLINE=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_PHPDBG_READLINE
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether termios.h defines TIOCGWINSZ" >&5
-printf %s "checking whether termios.h defines TIOCGWINSZ... " >&6; }
-if test ${ac_cv_sys_tiocgwinsz_in_termios_h+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether termios.h defines TIOCGWINSZ" >&5
+$as_echo_n "checking whether termios.h defines TIOCGWINSZ... " >&6; }
+if ${ac_cv_sys_tiocgwinsz_in_termios_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+#include <sys/types.h>
 #include <termios.h>
-const int tiocgwinsz = TIOCGWINSZ;
+#ifdef TIOCGWINSZ
+  yes
+#endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then :
   ac_cv_sys_tiocgwinsz_in_termios_h=yes
-else case e in #(
-  e) ac_cv_sys_tiocgwinsz_in_termios_h=no ;;
-esac
+else
+  ac_cv_sys_tiocgwinsz_in_termios_h=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f conftest*
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_termios_h" >&5
-printf "%s\n" "$ac_cv_sys_tiocgwinsz_in_termios_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_termios_h" >&5
+$as_echo "$ac_cv_sys_tiocgwinsz_in_termios_h" >&6; }
 
 if test $ac_cv_sys_tiocgwinsz_in_termios_h != yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sys/ioctl.h defines TIOCGWINSZ" >&5
-printf %s "checking whether sys/ioctl.h defines TIOCGWINSZ... " >&6; }
-if test ${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/ioctl.h defines TIOCGWINSZ" >&5
+$as_echo_n "checking whether sys/ioctl.h defines TIOCGWINSZ... " >&6; }
+if ${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+#include <sys/types.h>
 #include <sys/ioctl.h>
-const int tiocgwinsz = TIOCGWINSZ;
+#ifdef TIOCGWINSZ
+  yes
+#endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then :
   ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=yes
-else case e in #(
-  e) ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=no ;;
-esac
+else
+  ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f conftest*
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&5
-printf "%s\n" "$ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&5
+$as_echo "$ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&6; }
 
   if test $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h = yes; then
 
-printf "%s\n" "#define GWINSZ_IN_SYS_IOCTL 1" >>confdefs.h
+$as_echo "#define GWINSZ_IN_SYS_IOCTL 1" >>confdefs.h
 
   fi
 fi
 
 
-printf "%s\n" "#define HAVE_PHPDBG 1" >>confdefs.h
+$as_echo "#define HAVE_PHPDBG 1" >>confdefs.h
 
 
   if test "$PHP_PHPDBG_DEBUG" != "no"; then
 
-printf "%s\n" "#define PHPDBG_DEBUG 1" >>confdefs.h
+$as_echo "#define PHPDBG_DEBUG 1" >>confdefs.h
 
   else
 
-printf "%s\n" "#define PHPDBG_DEBUG 0" >>confdefs.h
+$as_echo "#define PHPDBG_DEBUG 0" >>confdefs.h
 
   fi
 
   PHP_PHPDBG_CFLAGS="-D_GNU_SOURCE -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
   PHP_PHPDBG_FILES="phpdbg.c phpdbg_parser.c phpdbg_lexer.c phpdbg_prompt.c phpdbg_help.c phpdbg_break.c phpdbg_print.c phpdbg_bp.c phpdbg_list.c phpdbg_utils.c phpdbg_info.c phpdbg_cmd.c phpdbg_set.c phpdbg_frame.c phpdbg_watch.c phpdbg_btree.c phpdbg_sigsafe.c phpdbg_io.c phpdbg_out.c"
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg and readline integration" >&5
-printf %s "checking for phpdbg and readline integration... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for phpdbg and readline integration" >&5
+$as_echo_n "checking for phpdbg and readline integration... " >&6; }
   if test "$PHP_PHPDBG_READLINE" = "yes"; then
     if test "$PHP_READLINE" != "no" -o  "$PHP_LIBEDIT" != "no"; then
 
-printf "%s\n" "#define HAVE_PHPDBG_READLINE 1" >>confdefs.h
+$as_echo "#define HAVE_PHPDBG_READLINE 1" >>confdefs.h
 
   	  PHPDBG_EXTRA_LIBS="$PHP_READLINE_LIBS"
-  	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+  	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
   	else
-  	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: readline is not available" >&5
-printf "%s\n" "readline is not available" >&6; }
+  	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: readline is not available" >&5
+$as_echo "readline is not available" >&6; }
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
-printf "%s\n" "disabled" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for userfaultfd faulting on write-protected memory support" >&5
-printf %s "checking for userfaultfd faulting on write-protected memory support... " >&6; }
-if test ${ac_cv_phpdbg_userfaultfd_writefault+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for userfaultfd faulting on write-protected memory support" >&5
+$as_echo_n "checking for userfaultfd faulting on write-protected memory support... " >&6; }
+if ${ac_cv_phpdbg_userfaultfd_writefault+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     #include <linux/userfaultfd.h>
@@ -12086,31 +11051,27 @@
     #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_phpdbg_userfaultfd_writefault=yes
-else case e in #(
-  e) ac_cv_phpdbg_userfaultfd_writefault=no ;;
-esac
+else
+  ac_cv_phpdbg_userfaultfd_writefault=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_phpdbg_userfaultfd_writefault" >&5
-printf "%s\n" "$ac_cv_phpdbg_userfaultfd_writefault" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_phpdbg_userfaultfd_writefault" >&5
+$as_echo "$ac_cv_phpdbg_userfaultfd_writefault" >&6; }
   if test "$ac_cv_phpdbg_userfaultfd_writefault" = "yes"; then
     if test "$enable_zts" != "yes"; then
       CFLAGS_SAVE="$CFLAGS"
       LIBS_SAVE="$LIBS"
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
-printf %s "checking for pthreads_cflags... " >&6; }
-if test ${ac_cv_pthreads_cflags+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
+$as_echo_n "checking for pthreads_cflags... " >&6; }
+if ${ac_cv_pthreads_cflags+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
 ac_cv_pthreads_cflags=
 if test "$pthreads_working" != "yes"; then
   for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do
@@ -12135,19 +11096,17 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
   pthreads_checked=yes
 
-else case e in #(
-  e)
+else
+
   pthreads_checked=no
 
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -12156,19 +11115,17 @@
     fi
   done
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
-printf "%s\n" "$ac_cv_pthreads_cflags" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
+$as_echo "$ac_cv_pthreads_cflags" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
+$as_echo_n "checking for pthreads_lib... " >&6; }
+if ${ac_cv_pthreads_lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
-printf %s "checking for pthreads_lib... " >&6; }
-if test ${ac_cv_pthreads_lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
 ac_cv_pthreads_lib=
 if test "$pthreads_working" != "yes"; then
  for lib in pthread pthreads c_r; do
@@ -12193,19 +11150,17 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
   pthreads_checked=yes
 
-else case e in #(
-  e)
+else
+
   pthreads_checked=no
 
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -12214,37 +11169,36 @@
     fi
   done
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
-printf "%s\n" "$ac_cv_pthreads_lib" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
+$as_echo "$ac_cv_pthreads_lib" >&6; }
 
 if test "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then
   pthreads_working="yes"
 fi
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking working pthreads" >&5
-printf %s "checking working pthreads... " >&6; };
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking working pthreads" >&5
+$as_echo_n "checking working pthreads... " >&6; };
 
       if test "$pthreads_working" = "yes"; then
-      	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&5
-printf "%s\n" "$ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&6; };
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&5
+$as_echo "$ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&6; };
       	PHP_PHPDBG_CFLAGS="$PHP_PHPDBG_CFLAGS $ac_cv_pthreads_cflags"
       	PHPDBG_EXTRA_LIBS="$PHPDBG_EXTRA_LIBS -l$ac_cv_pthreads_lib"
 
-printf "%s\n" "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h
+$as_echo "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h
 
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: pthreads not available" >&5
-printf "%s\n" "$as_me: WARNING: pthreads not available" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pthreads not available" >&5
+$as_echo "$as_me: WARNING: pthreads not available" >&2;}
       fi
 
       CFLAGS="$CFLAGS_SAVE"
       LIBS="$LIBS_SAVE"
     else
 
-printf "%s\n" "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h
+$as_echo "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h
 
     fi
   fi
@@ -12415,15 +11369,13 @@
 
 
 # Check whether --enable-cgi was given.
-if test ${enable_cgi+y}
-then :
+if test "${enable_cgi+set}" = set; then :
   enableval=$enable_cgi; PHP_CGI=$enableval
-else case e in #(
-  e)
+else
+
   PHP_CGI=yes
 
- ;;
-esac
+
 fi
 
 
@@ -12433,48 +11385,46 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CGI build" >&5
-printf %s "checking for CGI build... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CGI build" >&5
+$as_echo_n "checking for CGI build... " >&6; }
 if test "$PHP_CGI" != "no"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sun_len in sys/un.h" >&5
-printf %s "checking for sun_len in sys/un.h... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sun_len in sys/un.h" >&5
+$as_echo_n "checking for sun_len in sys/un.h... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/un.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "sun_len" >/dev/null 2>&1
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  $EGREP "sun_len" >/dev/null 2>&1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_SOCKADDR_UN_SUN_LEN 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKADDR_UN_SUN_LEN 1" >>confdefs.h
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; } ;;
-esac
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -rf conftest*
+rm -f conftest*
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether cross-process locking is required by accept()" >&5
-printf %s "checking whether cross-process locking is required by accept()... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cross-process locking is required by accept()" >&5
+$as_echo_n "checking whether cross-process locking is required by accept()... " >&6; }
     case "`uname -sr`" in
       IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0)
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define USE_LOCKING 1" >>confdefs.h
+$as_echo "#define USE_LOCKING 1" >>confdefs.h
 
       ;;
       *)
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       ;;
     esac
 
@@ -12620,25 +11570,25 @@
   PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/cgi/php-cgi.1"
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for chosen SAPI module" >&5
-printf %s "checking for chosen SAPI module... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_SAPI" >&5
-printf "%s\n" "$PHP_SAPI" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for chosen SAPI module" >&5
+$as_echo_n "checking for chosen SAPI module... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_SAPI" >&5
+$as_echo "$PHP_SAPI" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for executable SAPI binaries" >&5
-printf %s "checking for executable SAPI binaries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for executable SAPI binaries" >&5
+$as_echo_n "checking for executable SAPI binaries... " >&6; }
 if test "$PHP_BINARIES"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_BINARIES" >&5
-printf "%s\n" "$PHP_BINARIES" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_BINARIES" >&5
+$as_echo "$PHP_BINARIES" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
 fi
 
 if test -z "$PHP_INSTALLED_SAPIS"; then
@@ -12685,23 +11635,22 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Running system checks${T_ME}" >&5
-printf "%s\n" "${T_MD}Running system checks${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Running system checks${T_ME}" >&5
+$as_echo "${T_MD}Running system checks${T_ME}" >&6; }
 
 
 
   PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
   # Extract the first word of "sendmail", so it can be a program name with args.
 set dummy sendmail; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PROG_SENDMAIL+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $PROG_SENDMAIL in
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PROG_SENDMAIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PROG_SENDMAIL in
   \\/* | ?:\\/*)
   ac_cv_path_PROG_SENDMAIL="$PROG_SENDMAIL" # Let the user override the test with a path.
   ;;
@@ -12711,15 +11660,11 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_PROG_SENDMAIL="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PROG_SENDMAIL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -12728,16 +11673,15 @@
 
   test -z "$ac_cv_path_PROG_SENDMAIL" && ac_cv_path_PROG_SENDMAIL="/usr/sbin/sendmail"
   ;;
-esac ;;
 esac
 fi
 PROG_SENDMAIL=$ac_cv_path_PROG_SENDMAIL
 if test -n "$PROG_SENDMAIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PROG_SENDMAIL" >&5
-printf "%s\n" "$PROG_SENDMAIL" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROG_SENDMAIL" >&5
+$as_echo "$PROG_SENDMAIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -12747,20 +11691,18 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether system uses EBCDIC" >&5
-printf %s "checking whether system uses EBCDIC... " >&6; }
-if test ${ac_cv_ebcdic+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-  if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system uses EBCDIC" >&5
+$as_echo_n "checking whether system uses EBCDIC... " >&6; }
+if ${ac_cv_ebcdic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  if test "$cross_compiling" = yes; then :
 
   ac_cv_ebcdic=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int main(void) {
@@ -12768,44 +11710,38 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_ebcdic=yes
 
-else case e in #(
-  e)
+else
+
   ac_cv_ebcdic=no
- ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ebcdic" >&5
-printf "%s\n" "$ac_cv_ebcdic" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ebcdic" >&5
+$as_echo "$ac_cv_ebcdic" >&6; }
   if test "$ac_cv_ebcdic" = "yes"; then
     as_fn_error $? "PHP does not support EBCDIC targets" "$LINENO" 5
   fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-printf %s "checking whether byte ordering is bigendian... " >&6; }
-if test ${ac_cv_c_bigendian_php+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian_php+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ac_cv_c_bigendian_php=unknown
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
   ac_cv_c_bigendian_php=unknown
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int main(void)
@@ -12821,40 +11757,34 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_bigendian_php=yes
-else case e in #(
-  e) ac_cv_c_bigendian_php=no ;;
-esac
+else
+  ac_cv_c_bigendian_php=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-  ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian_php" >&5
-printf "%s\n" "$ac_cv_c_bigendian_php" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian_php" >&5
+$as_echo "$ac_cv_c_bigendian_php" >&6; }
  if test $ac_cv_c_bigendian_php = yes; then
 
-printf "%s\n" "#define WORDS_BIGENDIAN /**/" >>confdefs.h
+$as_echo "#define WORDS_BIGENDIAN /**/" >>confdefs.h
 
  fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether writing to stdout works" >&5
-printf %s "checking whether writing to stdout works... " >&6; }
-if test ${ac_cv_write_stdout+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-    if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether writing to stdout works" >&5
+$as_echo_n "checking whether writing to stdout works... " >&6; }
+if ${ac_cv_write_stdout+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    if test "$cross_compiling" = yes; then :
 
       case $host_alias in
         *linux*)
@@ -12865,8 +11795,8 @@
           ;;
       esac
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_UNISTD_H
@@ -12884,30 +11814,26 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
       ac_cv_write_stdout=yes
 
-else case e in #(
-  e)
+else
+
       ac_cv_write_stdout=no
-     ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_write_stdout" >&5
-printf "%s\n" "$ac_cv_write_stdout" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_write_stdout" >&5
+$as_echo "$ac_cv_write_stdout" >&6; }
   if test "$ac_cv_write_stdout" = "yes"; then
 
-printf "%s\n" "#define PHP_WRITE_STDOUT 1" >>confdefs.h
+$as_echo "#define PHP_WRITE_STDOUT 1" >>confdefs.h
 
   fi
 
@@ -12958,27 +11884,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
-if test "x$ac_cv_func_socket" = xyes
-then :
+if test "x$ac_cv_func_socket" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__socket" "ac_cv_func___socket"
-if test "x$ac_cv_func___socket" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__socket" "ac_cv_func___socket"
+if test "x$ac_cv_func___socket" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_SOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKET 1" >>confdefs.h
 
     ac_cv_func_socket=yes
   ;;
@@ -12988,140 +11910,118 @@
   unset ac_cv_lib_socket_socket
   unset ac_cv_lib_socket___socket
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
-printf %s "checking for socket in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_socket+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
+$as_echo_n "checking for socket in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char socket (void);
+char socket ();
 int
-main (void)
+main ()
 {
 return socket ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_socket=yes
-else case e in #(
-  e) ac_cv_lib_socket_socket=no ;;
-esac
+else
+  ac_cv_lib_socket_socket=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
-printf "%s\n" "$ac_cv_lib_socket_socket" >&6; }
-if test "x$ac_cv_lib_socket_socket" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
+$as_echo "$ac_cv_lib_socket_socket" >&6; }
+if test "x$ac_cv_lib_socket_socket" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __socket in -lsocket" >&5
-printf %s "checking for __socket in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___socket+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socket in -lsocket" >&5
+$as_echo_n "checking for __socket in -lsocket... " >&6; }
+if ${ac_cv_lib_socket___socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __socket (void);
+char __socket ();
 int
-main (void)
+main ()
 {
 return __socket ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___socket=yes
-else case e in #(
-  e) ac_cv_lib_socket___socket=no ;;
-esac
+else
+  ac_cv_lib_socket___socket=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socket" >&5
-printf "%s\n" "$ac_cv_lib_socket___socket" >&6; }
-if test "x$ac_cv_lib_socket___socket" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socket" >&5
+$as_echo "$ac_cv_lib_socket___socket" >&6; }
+if test "x$ac_cv_lib_socket___socket" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -13139,10 +12039,10 @@
 
 
 
-printf "%s\n" "#define HAVE_SOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKET 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_socket=yes
   else
@@ -13151,140 +12051,118 @@
   unset ac_cv_lib_network_socket
   unset ac_cv_lib_network___socket
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5
-printf %s "checking for socket in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network_socket+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5
+$as_echo_n "checking for socket in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char socket (void);
+char socket ();
 int
-main (void)
+main ()
 {
 return socket ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network_socket=yes
-else case e in #(
-  e) ac_cv_lib_network_socket=no ;;
-esac
+else
+  ac_cv_lib_network_socket=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5
-printf "%s\n" "$ac_cv_lib_network_socket" >&6; }
-if test "x$ac_cv_lib_network_socket" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5
+$as_echo "$ac_cv_lib_network_socket" >&6; }
+if test "x$ac_cv_lib_network_socket" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __socket in -lnetwork" >&5
-printf %s "checking for __socket in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network___socket+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socket in -lnetwork" >&5
+$as_echo_n "checking for __socket in -lnetwork... " >&6; }
+if ${ac_cv_lib_network___socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __socket (void);
+char __socket ();
 int
-main (void)
+main ()
 {
 return __socket ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network___socket=yes
-else case e in #(
-  e) ac_cv_lib_network___socket=no ;;
-esac
+else
+  ac_cv_lib_network___socket=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___socket" >&5
-printf "%s\n" "$ac_cv_lib_network___socket" >&6; }
-if test "x$ac_cv_lib_network___socket" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___socket" >&5
+$as_echo "$ac_cv_lib_network___socket" >&6; }
+if test "x$ac_cv_lib_network___socket" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -13302,10 +12180,10 @@
 
 
 
-printf "%s\n" "#define HAVE_SOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKET 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_socket=yes
   else
@@ -13327,27 +12205,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair"
-if test "x$ac_cv_func_socketpair" = xyes
-then :
+if test "x$ac_cv_func_socketpair" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__socketpair" "ac_cv_func___socketpair"
-if test "x$ac_cv_func___socketpair" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__socketpair" "ac_cv_func___socketpair"
+if test "x$ac_cv_func___socketpair" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_SOCKETPAIR 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h
 
     ac_cv_func_socketpair=yes
   ;;
@@ -13357,140 +12231,118 @@
   unset ac_cv_lib_socket_socketpair
   unset ac_cv_lib_socket___socketpair
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lsocket" >&5
-printf %s "checking for socketpair in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_socketpair+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lsocket" >&5
+$as_echo_n "checking for socketpair in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_socketpair+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char socketpair (void);
+char socketpair ();
 int
-main (void)
+main ()
 {
 return socketpair ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_socketpair=yes
-else case e in #(
-  e) ac_cv_lib_socket_socketpair=no ;;
-esac
+else
+  ac_cv_lib_socket_socketpair=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socketpair" >&5
-printf "%s\n" "$ac_cv_lib_socket_socketpair" >&6; }
-if test "x$ac_cv_lib_socket_socketpair" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socketpair" >&5
+$as_echo "$ac_cv_lib_socket_socketpair" >&6; }
+if test "x$ac_cv_lib_socket_socketpair" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __socketpair in -lsocket" >&5
-printf %s "checking for __socketpair in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___socketpair+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socketpair in -lsocket" >&5
+$as_echo_n "checking for __socketpair in -lsocket... " >&6; }
+if ${ac_cv_lib_socket___socketpair+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __socketpair (void);
+char __socketpair ();
 int
-main (void)
+main ()
 {
 return __socketpair ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___socketpair=yes
-else case e in #(
-  e) ac_cv_lib_socket___socketpair=no ;;
-esac
+else
+  ac_cv_lib_socket___socketpair=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socketpair" >&5
-printf "%s\n" "$ac_cv_lib_socket___socketpair" >&6; }
-if test "x$ac_cv_lib_socket___socketpair" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socketpair" >&5
+$as_echo "$ac_cv_lib_socket___socketpair" >&6; }
+if test "x$ac_cv_lib_socket___socketpair" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -13508,10 +12360,10 @@
 
 
 
-printf "%s\n" "#define HAVE_SOCKETPAIR 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_socketpair=yes
   else
@@ -13520,140 +12372,118 @@
   unset ac_cv_lib_network_socketpair
   unset ac_cv_lib_network___socketpair
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lnetwork" >&5
-printf %s "checking for socketpair in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network_socketpair+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lnetwork" >&5
+$as_echo_n "checking for socketpair in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_socketpair+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char socketpair (void);
+char socketpair ();
 int
-main (void)
+main ()
 {
 return socketpair ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network_socketpair=yes
-else case e in #(
-  e) ac_cv_lib_network_socketpair=no ;;
-esac
+else
+  ac_cv_lib_network_socketpair=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socketpair" >&5
-printf "%s\n" "$ac_cv_lib_network_socketpair" >&6; }
-if test "x$ac_cv_lib_network_socketpair" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socketpair" >&5
+$as_echo "$ac_cv_lib_network_socketpair" >&6; }
+if test "x$ac_cv_lib_network_socketpair" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __socketpair in -lnetwork" >&5
-printf %s "checking for __socketpair in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network___socketpair+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socketpair in -lnetwork" >&5
+$as_echo_n "checking for __socketpair in -lnetwork... " >&6; }
+if ${ac_cv_lib_network___socketpair+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __socketpair (void);
+char __socketpair ();
 int
-main (void)
+main ()
 {
 return __socketpair ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network___socketpair=yes
-else case e in #(
-  e) ac_cv_lib_network___socketpair=no ;;
-esac
+else
+  ac_cv_lib_network___socketpair=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___socketpair" >&5
-printf "%s\n" "$ac_cv_lib_network___socketpair" >&6; }
-if test "x$ac_cv_lib_network___socketpair" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___socketpair" >&5
+$as_echo "$ac_cv_lib_network___socketpair" >&6; }
+if test "x$ac_cv_lib_network___socketpair" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -13671,10 +12501,10 @@
 
 
 
-printf "%s\n" "#define HAVE_SOCKETPAIR 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_socketpair=yes
   else
@@ -13696,27 +12526,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "htonl" "ac_cv_func_htonl"
-if test "x$ac_cv_func_htonl" = xyes
-then :
+if test "x$ac_cv_func_htonl" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__htonl" "ac_cv_func___htonl"
-if test "x$ac_cv_func___htonl" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__htonl" "ac_cv_func___htonl"
+if test "x$ac_cv_func___htonl" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_HTONL 1" >>confdefs.h
+$as_echo "#define HAVE_HTONL 1" >>confdefs.h
 
     ac_cv_func_htonl=yes
   ;;
@@ -13726,140 +12552,118 @@
   unset ac_cv_lib_socket_htonl
   unset ac_cv_lib_socket___htonl
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for htonl in -lsocket" >&5
-printf %s "checking for htonl in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_htonl+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htonl in -lsocket" >&5
+$as_echo_n "checking for htonl in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_htonl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char htonl (void);
+char htonl ();
 int
-main (void)
+main ()
 {
 return htonl ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_htonl=yes
-else case e in #(
-  e) ac_cv_lib_socket_htonl=no ;;
-esac
+else
+  ac_cv_lib_socket_htonl=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_htonl" >&5
-printf "%s\n" "$ac_cv_lib_socket_htonl" >&6; }
-if test "x$ac_cv_lib_socket_htonl" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_htonl" >&5
+$as_echo "$ac_cv_lib_socket_htonl" >&6; }
+if test "x$ac_cv_lib_socket_htonl" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __htonl in -lsocket" >&5
-printf %s "checking for __htonl in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___htonl+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __htonl in -lsocket" >&5
+$as_echo_n "checking for __htonl in -lsocket... " >&6; }
+if ${ac_cv_lib_socket___htonl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __htonl (void);
+char __htonl ();
 int
-main (void)
+main ()
 {
 return __htonl ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___htonl=yes
-else case e in #(
-  e) ac_cv_lib_socket___htonl=no ;;
-esac
+else
+  ac_cv_lib_socket___htonl=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___htonl" >&5
-printf "%s\n" "$ac_cv_lib_socket___htonl" >&6; }
-if test "x$ac_cv_lib_socket___htonl" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___htonl" >&5
+$as_echo "$ac_cv_lib_socket___htonl" >&6; }
+if test "x$ac_cv_lib_socket___htonl" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -13877,10 +12681,10 @@
 
 
 
-printf "%s\n" "#define HAVE_HTONL 1" >>confdefs.h
+$as_echo "#define HAVE_HTONL 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_htonl=yes
   else
@@ -13889,140 +12693,118 @@
   unset ac_cv_lib_network_htonl
   unset ac_cv_lib_network___htonl
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for htonl in -lnetwork" >&5
-printf %s "checking for htonl in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network_htonl+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htonl in -lnetwork" >&5
+$as_echo_n "checking for htonl in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_htonl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char htonl (void);
+char htonl ();
 int
-main (void)
+main ()
 {
 return htonl ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network_htonl=yes
-else case e in #(
-  e) ac_cv_lib_network_htonl=no ;;
-esac
+else
+  ac_cv_lib_network_htonl=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_htonl" >&5
-printf "%s\n" "$ac_cv_lib_network_htonl" >&6; }
-if test "x$ac_cv_lib_network_htonl" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_htonl" >&5
+$as_echo "$ac_cv_lib_network_htonl" >&6; }
+if test "x$ac_cv_lib_network_htonl" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __htonl in -lnetwork" >&5
-printf %s "checking for __htonl in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network___htonl+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __htonl in -lnetwork" >&5
+$as_echo_n "checking for __htonl in -lnetwork... " >&6; }
+if ${ac_cv_lib_network___htonl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __htonl (void);
+char __htonl ();
 int
-main (void)
+main ()
 {
 return __htonl ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network___htonl=yes
-else case e in #(
-  e) ac_cv_lib_network___htonl=no ;;
-esac
+else
+  ac_cv_lib_network___htonl=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___htonl" >&5
-printf "%s\n" "$ac_cv_lib_network___htonl" >&6; }
-if test "x$ac_cv_lib_network___htonl" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___htonl" >&5
+$as_echo "$ac_cv_lib_network___htonl" >&6; }
+if test "x$ac_cv_lib_network___htonl" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -14040,10 +12822,10 @@
 
 
 
-printf "%s\n" "#define HAVE_HTONL 1" >>confdefs.h
+$as_echo "#define HAVE_HTONL 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_htonl=yes
   else
@@ -14065,27 +12847,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "gethostname" "ac_cv_func_gethostname"
-if test "x$ac_cv_func_gethostname" = xyes
-then :
+if test "x$ac_cv_func_gethostname" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__gethostname" "ac_cv_func___gethostname"
-if test "x$ac_cv_func___gethostname" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__gethostname" "ac_cv_func___gethostname"
+if test "x$ac_cv_func___gethostname" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h
+$as_echo "#define HAVE_GETHOSTNAME 1" >>confdefs.h
 
     ac_cv_func_gethostname=yes
   ;;
@@ -14095,140 +12873,118 @@
   unset ac_cv_lib_nsl_gethostname
   unset ac_cv_lib_nsl___gethostname
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostname in -lnsl" >&5
-printf %s "checking for gethostname in -lnsl... " >&6; }
-if test ${ac_cv_lib_nsl_gethostname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostname in -lnsl" >&5
+$as_echo_n "checking for gethostname in -lnsl... " >&6; }
+if ${ac_cv_lib_nsl_gethostname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gethostname (void);
+char gethostname ();
 int
-main (void)
+main ()
 {
 return gethostname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl_gethostname=yes
-else case e in #(
-  e) ac_cv_lib_nsl_gethostname=no ;;
-esac
+else
+  ac_cv_lib_nsl_gethostname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostname" >&5
-printf "%s\n" "$ac_cv_lib_nsl_gethostname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostname" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostname" >&5
+$as_echo "$ac_cv_lib_nsl_gethostname" >&6; }
+if test "x$ac_cv_lib_nsl_gethostname" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gethostname in -lnsl" >&5
-printf %s "checking for __gethostname in -lnsl... " >&6; }
-if test ${ac_cv_lib_nsl___gethostname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostname in -lnsl" >&5
+$as_echo_n "checking for __gethostname in -lnsl... " >&6; }
+if ${ac_cv_lib_nsl___gethostname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __gethostname (void);
+char __gethostname ();
 int
-main (void)
+main ()
 {
 return __gethostname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl___gethostname=yes
-else case e in #(
-  e) ac_cv_lib_nsl___gethostname=no ;;
-esac
+else
+  ac_cv_lib_nsl___gethostname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostname" >&5
-printf "%s\n" "$ac_cv_lib_nsl___gethostname" >&6; }
-if test "x$ac_cv_lib_nsl___gethostname" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostname" >&5
+$as_echo "$ac_cv_lib_nsl___gethostname" >&6; }
+if test "x$ac_cv_lib_nsl___gethostname" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnsl"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -14246,10 +13002,10 @@
 
 
 
-printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h
+$as_echo "#define HAVE_GETHOSTNAME 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNSL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNSL 1" >>confdefs.h
 
     ac_cv_func_gethostname=yes
   else
@@ -14258,140 +13014,118 @@
   unset ac_cv_lib_network_gethostname
   unset ac_cv_lib_network___gethostname
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostname in -lnetwork" >&5
-printf %s "checking for gethostname in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network_gethostname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostname in -lnetwork" >&5
+$as_echo_n "checking for gethostname in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_gethostname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gethostname (void);
+char gethostname ();
 int
-main (void)
+main ()
 {
 return gethostname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network_gethostname=yes
-else case e in #(
-  e) ac_cv_lib_network_gethostname=no ;;
-esac
+else
+  ac_cv_lib_network_gethostname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_gethostname" >&5
-printf "%s\n" "$ac_cv_lib_network_gethostname" >&6; }
-if test "x$ac_cv_lib_network_gethostname" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_gethostname" >&5
+$as_echo "$ac_cv_lib_network_gethostname" >&6; }
+if test "x$ac_cv_lib_network_gethostname" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gethostname in -lnetwork" >&5
-printf %s "checking for __gethostname in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network___gethostname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostname in -lnetwork" >&5
+$as_echo_n "checking for __gethostname in -lnetwork... " >&6; }
+if ${ac_cv_lib_network___gethostname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __gethostname (void);
+char __gethostname ();
 int
-main (void)
+main ()
 {
 return __gethostname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network___gethostname=yes
-else case e in #(
-  e) ac_cv_lib_network___gethostname=no ;;
-esac
+else
+  ac_cv_lib_network___gethostname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___gethostname" >&5
-printf "%s\n" "$ac_cv_lib_network___gethostname" >&6; }
-if test "x$ac_cv_lib_network___gethostname" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___gethostname" >&5
+$as_echo "$ac_cv_lib_network___gethostname" >&6; }
+if test "x$ac_cv_lib_network___gethostname" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -14409,10 +13143,10 @@
 
 
 
-printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h
+$as_echo "#define HAVE_GETHOSTNAME 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_gethostname=yes
   else
@@ -14434,27 +13168,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "gethostbyaddr" "ac_cv_func_gethostbyaddr"
-if test "x$ac_cv_func_gethostbyaddr" = xyes
-then :
+if test "x$ac_cv_func_gethostbyaddr" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__gethostbyaddr" "ac_cv_func___gethostbyaddr"
-if test "x$ac_cv_func___gethostbyaddr" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__gethostbyaddr" "ac_cv_func___gethostbyaddr"
+if test "x$ac_cv_func___gethostbyaddr" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
+$as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
 
     ac_cv_func_gethostbyaddr=yes
   ;;
@@ -14464,140 +13194,118 @@
   unset ac_cv_lib_nsl_gethostbyaddr
   unset ac_cv_lib_nsl___gethostbyaddr
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnsl" >&5
-printf %s "checking for gethostbyaddr in -lnsl... " >&6; }
-if test ${ac_cv_lib_nsl_gethostbyaddr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnsl" >&5
+$as_echo_n "checking for gethostbyaddr in -lnsl... " >&6; }
+if ${ac_cv_lib_nsl_gethostbyaddr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gethostbyaddr (void);
+char gethostbyaddr ();
 int
-main (void)
+main ()
 {
 return gethostbyaddr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl_gethostbyaddr=yes
-else case e in #(
-  e) ac_cv_lib_nsl_gethostbyaddr=no ;;
-esac
+else
+  ac_cv_lib_nsl_gethostbyaddr=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
-printf "%s\n" "$ac_cv_lib_nsl_gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyaddr" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyaddr" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gethostbyaddr in -lnsl" >&5
-printf %s "checking for __gethostbyaddr in -lnsl... " >&6; }
-if test ${ac_cv_lib_nsl___gethostbyaddr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostbyaddr in -lnsl" >&5
+$as_echo_n "checking for __gethostbyaddr in -lnsl... " >&6; }
+if ${ac_cv_lib_nsl___gethostbyaddr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __gethostbyaddr (void);
+char __gethostbyaddr ();
 int
-main (void)
+main ()
 {
 return __gethostbyaddr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl___gethostbyaddr=yes
-else case e in #(
-  e) ac_cv_lib_nsl___gethostbyaddr=no ;;
-esac
+else
+  ac_cv_lib_nsl___gethostbyaddr=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostbyaddr" >&5
-printf "%s\n" "$ac_cv_lib_nsl___gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_nsl___gethostbyaddr" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostbyaddr" >&5
+$as_echo "$ac_cv_lib_nsl___gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_nsl___gethostbyaddr" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnsl"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -14615,10 +13323,10 @@
 
 
 
-printf "%s\n" "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
+$as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNSL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNSL 1" >>confdefs.h
 
     ac_cv_func_gethostbyaddr=yes
   else
@@ -14627,140 +13335,118 @@
   unset ac_cv_lib_network_gethostbyaddr
   unset ac_cv_lib_network___gethostbyaddr
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnetwork" >&5
-printf %s "checking for gethostbyaddr in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network_gethostbyaddr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnetwork" >&5
+$as_echo_n "checking for gethostbyaddr in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_gethostbyaddr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gethostbyaddr (void);
+char gethostbyaddr ();
 int
-main (void)
+main ()
 {
 return gethostbyaddr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network_gethostbyaddr=yes
-else case e in #(
-  e) ac_cv_lib_network_gethostbyaddr=no ;;
-esac
+else
+  ac_cv_lib_network_gethostbyaddr=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_gethostbyaddr" >&5
-printf "%s\n" "$ac_cv_lib_network_gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_network_gethostbyaddr" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_gethostbyaddr" >&5
+$as_echo "$ac_cv_lib_network_gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_network_gethostbyaddr" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gethostbyaddr in -lnetwork" >&5
-printf %s "checking for __gethostbyaddr in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network___gethostbyaddr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostbyaddr in -lnetwork" >&5
+$as_echo_n "checking for __gethostbyaddr in -lnetwork... " >&6; }
+if ${ac_cv_lib_network___gethostbyaddr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __gethostbyaddr (void);
+char __gethostbyaddr ();
 int
-main (void)
+main ()
 {
 return __gethostbyaddr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network___gethostbyaddr=yes
-else case e in #(
-  e) ac_cv_lib_network___gethostbyaddr=no ;;
-esac
+else
+  ac_cv_lib_network___gethostbyaddr=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___gethostbyaddr" >&5
-printf "%s\n" "$ac_cv_lib_network___gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_network___gethostbyaddr" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___gethostbyaddr" >&5
+$as_echo "$ac_cv_lib_network___gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_network___gethostbyaddr" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -14778,10 +13464,10 @@
 
 
 
-printf "%s\n" "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
+$as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_gethostbyaddr=yes
   else
@@ -14803,27 +13489,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes
-then :
+if test "x$ac_cv_func_dlopen" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__dlopen" "ac_cv_func___dlopen"
-if test "x$ac_cv_func___dlopen" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__dlopen" "ac_cv_func___dlopen"
+if test "x$ac_cv_func___dlopen" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h
+$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
 
     ac_cv_func_dlopen=yes
   ;;
@@ -14833,140 +13515,118 @@
   unset ac_cv_lib_dl_dlopen
   unset ac_cv_lib_dl___dlopen
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-printf %s "checking for dlopen in -ldl... " >&6; }
-if test ${ac_cv_lib_dl_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dlopen (void);
+char dlopen ();
 int
-main (void)
+main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
-else case e in #(
-  e) ac_cv_lib_dl_dlopen=no ;;
-esac
+else
+  ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dlopen in -ldl" >&5
-printf %s "checking for __dlopen in -ldl... " >&6; }
-if test ${ac_cv_lib_dl___dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dlopen in -ldl" >&5
+$as_echo_n "checking for __dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl___dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dlopen (void);
+char __dlopen ();
 int
-main (void)
+main ()
 {
 return __dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl___dlopen=yes
-else case e in #(
-  e) ac_cv_lib_dl___dlopen=no ;;
-esac
+else
+  ac_cv_lib_dl___dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl___dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl___dlopen" >&6; }
-if test "x$ac_cv_lib_dl___dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl___dlopen" >&5
+$as_echo "$ac_cv_lib_dl___dlopen" >&6; }
+if test "x$ac_cv_lib_dl___dlopen" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -ldl"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -14984,10 +13644,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h
+$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBDL 1" >>confdefs.h
 
     ac_cv_func_dlopen=yes
   else
@@ -14996,140 +13656,118 @@
   unset ac_cv_lib_root_dlopen
   unset ac_cv_lib_root___dlopen
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lroot" >&5
-printf %s "checking for dlopen in -lroot... " >&6; }
-if test ${ac_cv_lib_root_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lroot" >&5
+$as_echo_n "checking for dlopen in -lroot... " >&6; }
+if ${ac_cv_lib_root_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dlopen (void);
+char dlopen ();
 int
-main (void)
+main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_root_dlopen=yes
-else case e in #(
-  e) ac_cv_lib_root_dlopen=no ;;
-esac
+else
+  ac_cv_lib_root_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_root_dlopen" >&6; }
-if test "x$ac_cv_lib_root_dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_dlopen" >&5
+$as_echo "$ac_cv_lib_root_dlopen" >&6; }
+if test "x$ac_cv_lib_root_dlopen" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dlopen in -lroot" >&5
-printf %s "checking for __dlopen in -lroot... " >&6; }
-if test ${ac_cv_lib_root___dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dlopen in -lroot" >&5
+$as_echo_n "checking for __dlopen in -lroot... " >&6; }
+if ${ac_cv_lib_root___dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dlopen (void);
+char __dlopen ();
 int
-main (void)
+main ()
 {
 return __dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_root___dlopen=yes
-else case e in #(
-  e) ac_cv_lib_root___dlopen=no ;;
-esac
+else
+  ac_cv_lib_root___dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___dlopen" >&5
-printf "%s\n" "$ac_cv_lib_root___dlopen" >&6; }
-if test "x$ac_cv_lib_root___dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___dlopen" >&5
+$as_echo "$ac_cv_lib_root___dlopen" >&6; }
+if test "x$ac_cv_lib_root___dlopen" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lroot"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -15147,10 +13785,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h
+$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBROOT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBROOT 1" >>confdefs.h
 
     ac_cv_func_dlopen=yes
   else
@@ -15172,27 +13810,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "dlsym" "ac_cv_func_dlsym"
-if test "x$ac_cv_func_dlsym" = xyes
-then :
+if test "x$ac_cv_func_dlsym" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__dlsym" "ac_cv_func___dlsym"
-if test "x$ac_cv_func___dlsym" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__dlsym" "ac_cv_func___dlsym"
+if test "x$ac_cv_func___dlsym" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_DLSYM 1" >>confdefs.h
+$as_echo "#define HAVE_DLSYM 1" >>confdefs.h
 
     ac_cv_func_dlsym=yes
   ;;
@@ -15202,140 +13836,118 @@
   unset ac_cv_lib_dl_dlsym
   unset ac_cv_lib_dl___dlsym
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
-printf %s "checking for dlsym in -ldl... " >&6; }
-if test ${ac_cv_lib_dl_dlsym+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
+$as_echo_n "checking for dlsym in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlsym+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dlsym (void);
+char dlsym ();
 int
-main (void)
+main ()
 {
 return dlsym ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlsym=yes
-else case e in #(
-  e) ac_cv_lib_dl_dlsym=no ;;
-esac
+else
+  ac_cv_lib_dl_dlsym=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlsym" >&6; }
-if test "x$ac_cv_lib_dl_dlsym" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5
+$as_echo "$ac_cv_lib_dl_dlsym" >&6; }
+if test "x$ac_cv_lib_dl_dlsym" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dlsym in -ldl" >&5
-printf %s "checking for __dlsym in -ldl... " >&6; }
-if test ${ac_cv_lib_dl___dlsym+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dlsym in -ldl" >&5
+$as_echo_n "checking for __dlsym in -ldl... " >&6; }
+if ${ac_cv_lib_dl___dlsym+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dlsym (void);
+char __dlsym ();
 int
-main (void)
+main ()
 {
 return __dlsym ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl___dlsym=yes
-else case e in #(
-  e) ac_cv_lib_dl___dlsym=no ;;
-esac
+else
+  ac_cv_lib_dl___dlsym=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl___dlsym" >&5
-printf "%s\n" "$ac_cv_lib_dl___dlsym" >&6; }
-if test "x$ac_cv_lib_dl___dlsym" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl___dlsym" >&5
+$as_echo "$ac_cv_lib_dl___dlsym" >&6; }
+if test "x$ac_cv_lib_dl___dlsym" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -ldl"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -15353,10 +13965,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DLSYM 1" >>confdefs.h
+$as_echo "#define HAVE_DLSYM 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBDL 1" >>confdefs.h
 
     ac_cv_func_dlsym=yes
   else
@@ -15365,140 +13977,118 @@
   unset ac_cv_lib_root_dlsym
   unset ac_cv_lib_root___dlsym
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlsym in -lroot" >&5
-printf %s "checking for dlsym in -lroot... " >&6; }
-if test ${ac_cv_lib_root_dlsym+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -lroot" >&5
+$as_echo_n "checking for dlsym in -lroot... " >&6; }
+if ${ac_cv_lib_root_dlsym+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dlsym (void);
+char dlsym ();
 int
-main (void)
+main ()
 {
 return dlsym ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_root_dlsym=yes
-else case e in #(
-  e) ac_cv_lib_root_dlsym=no ;;
-esac
+else
+  ac_cv_lib_root_dlsym=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_dlsym" >&5
-printf "%s\n" "$ac_cv_lib_root_dlsym" >&6; }
-if test "x$ac_cv_lib_root_dlsym" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_dlsym" >&5
+$as_echo "$ac_cv_lib_root_dlsym" >&6; }
+if test "x$ac_cv_lib_root_dlsym" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dlsym in -lroot" >&5
-printf %s "checking for __dlsym in -lroot... " >&6; }
-if test ${ac_cv_lib_root___dlsym+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dlsym in -lroot" >&5
+$as_echo_n "checking for __dlsym in -lroot... " >&6; }
+if ${ac_cv_lib_root___dlsym+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dlsym (void);
+char __dlsym ();
 int
-main (void)
+main ()
 {
 return __dlsym ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_root___dlsym=yes
-else case e in #(
-  e) ac_cv_lib_root___dlsym=no ;;
-esac
+else
+  ac_cv_lib_root___dlsym=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___dlsym" >&5
-printf "%s\n" "$ac_cv_lib_root___dlsym" >&6; }
-if test "x$ac_cv_lib_root___dlsym" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___dlsym" >&5
+$as_echo "$ac_cv_lib_root___dlsym" >&6; }
+if test "x$ac_cv_lib_root___dlsym" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lroot"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -15516,10 +14106,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DLSYM 1" >>confdefs.h
+$as_echo "#define HAVE_DLSYM 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBROOT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBROOT 1" >>confdefs.h
 
     ac_cv_func_dlsym=yes
   else
@@ -15537,55 +14127,49 @@
 
 if test "$ac_cv_func_dlopen" = "yes"; then
 
-printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBDL 1" >>confdefs.h
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
-printf %s "checking for sin in -lm... " >&6; }
-if test ${ac_cv_lib_m_sin+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
+$as_echo_n "checking for sin in -lm... " >&6; }
+if ${ac_cv_lib_m_sin+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char sin (void);
+char sin ();
 int
-main (void)
+main ()
 {
 return sin ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_m_sin=yes
-else case e in #(
-  e) ac_cv_lib_m_sin=no ;;
-esac
+else
+  ac_cv_lib_m_sin=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
-printf "%s\n" "$ac_cv_lib_m_sin" >&6; }
-if test "x$ac_cv_lib_m_sin" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBM 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
+$as_echo "$ac_cv_lib_m_sin" >&6; }
+if test "x$ac_cv_lib_m_sin" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
 
   LIBS="-lm $LIBS"
 
@@ -15600,27 +14184,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "__atomic_exchange_1" "ac_cv_func___atomic_exchange_1"
-if test "x$ac_cv_func___atomic_exchange_1" = xyes
-then :
+if test "x$ac_cv_func___atomic_exchange_1" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "____atomic_exchange_1" "ac_cv_func_____atomic_exchange_1"
-if test "x$ac_cv_func_____atomic_exchange_1" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "____atomic_exchange_1" "ac_cv_func_____atomic_exchange_1"
+if test "x$ac_cv_func_____atomic_exchange_1" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h
+$as_echo "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h
 
     ac_cv_func___atomic_exchange_1=yes
   ;;
@@ -15630,140 +14210,118 @@
   unset ac_cv_lib_atomic___atomic_exchange_1
   unset ac_cv_lib_atomic_____atomic_exchange_1
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __atomic_exchange_1 in -latomic" >&5
-printf %s "checking for __atomic_exchange_1 in -latomic... " >&6; }
-if test ${ac_cv_lib_atomic___atomic_exchange_1+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __atomic_exchange_1 in -latomic" >&5
+$as_echo_n "checking for __atomic_exchange_1 in -latomic... " >&6; }
+if ${ac_cv_lib_atomic___atomic_exchange_1+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-latomic  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __atomic_exchange_1 (void);
+char __atomic_exchange_1 ();
 int
-main (void)
+main ()
 {
 return __atomic_exchange_1 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_atomic___atomic_exchange_1=yes
-else case e in #(
-  e) ac_cv_lib_atomic___atomic_exchange_1=no ;;
-esac
+else
+  ac_cv_lib_atomic___atomic_exchange_1=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic___atomic_exchange_1" >&5
-printf "%s\n" "$ac_cv_lib_atomic___atomic_exchange_1" >&6; }
-if test "x$ac_cv_lib_atomic___atomic_exchange_1" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic___atomic_exchange_1" >&5
+$as_echo "$ac_cv_lib_atomic___atomic_exchange_1" >&6; }
+if test "x$ac_cv_lib_atomic___atomic_exchange_1" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ____atomic_exchange_1 in -latomic" >&5
-printf %s "checking for ____atomic_exchange_1 in -latomic... " >&6; }
-if test ${ac_cv_lib_atomic_____atomic_exchange_1+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ____atomic_exchange_1 in -latomic" >&5
+$as_echo_n "checking for ____atomic_exchange_1 in -latomic... " >&6; }
+if ${ac_cv_lib_atomic_____atomic_exchange_1+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-latomic  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char ____atomic_exchange_1 (void);
+char ____atomic_exchange_1 ();
 int
-main (void)
+main ()
 {
 return ____atomic_exchange_1 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_atomic_____atomic_exchange_1=yes
-else case e in #(
-  e) ac_cv_lib_atomic_____atomic_exchange_1=no ;;
-esac
+else
+  ac_cv_lib_atomic_____atomic_exchange_1=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic_____atomic_exchange_1" >&5
-printf "%s\n" "$ac_cv_lib_atomic_____atomic_exchange_1" >&6; }
-if test "x$ac_cv_lib_atomic_____atomic_exchange_1" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic_____atomic_exchange_1" >&5
+$as_echo "$ac_cv_lib_atomic_____atomic_exchange_1" >&6; }
+if test "x$ac_cv_lib_atomic_____atomic_exchange_1" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -latomic"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -15781,10 +14339,10 @@
 
 
 
-printf "%s\n" "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h
+$as_echo "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBATOMIC 1" >>confdefs.h
+$as_echo "#define HAVE_LIBATOMIC 1" >>confdefs.h
 
     ac_cv_func___atomic_exchange_1=yes
   else
@@ -15806,27 +14364,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
-if test "x$ac_cv_func_inet_aton" = xyes
-then :
+if test "x$ac_cv_func_inet_aton" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__inet_aton" "ac_cv_func___inet_aton"
-if test "x$ac_cv_func___inet_aton" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__inet_aton" "ac_cv_func___inet_aton"
+if test "x$ac_cv_func___inet_aton" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h
+$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
 
     ac_cv_func_inet_aton=yes
   ;;
@@ -15836,140 +14390,118 @@
   unset ac_cv_lib_resolv_inet_aton
   unset ac_cv_lib_resolv___inet_aton
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5
-printf %s "checking for inet_aton in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv_inet_aton+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5
+$as_echo_n "checking for inet_aton in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv_inet_aton+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char inet_aton (void);
+char inet_aton ();
 int
-main (void)
+main ()
 {
 return inet_aton ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_inet_aton=yes
-else case e in #(
-  e) ac_cv_lib_resolv_inet_aton=no ;;
-esac
+else
+  ac_cv_lib_resolv_inet_aton=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5
-printf "%s\n" "$ac_cv_lib_resolv_inet_aton" >&6; }
-if test "x$ac_cv_lib_resolv_inet_aton" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5
+$as_echo "$ac_cv_lib_resolv_inet_aton" >&6; }
+if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __inet_aton in -lresolv" >&5
-printf %s "checking for __inet_aton in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv___inet_aton+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __inet_aton in -lresolv" >&5
+$as_echo_n "checking for __inet_aton in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv___inet_aton+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __inet_aton (void);
+char __inet_aton ();
 int
-main (void)
+main ()
 {
 return __inet_aton ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___inet_aton=yes
-else case e in #(
-  e) ac_cv_lib_resolv___inet_aton=no ;;
-esac
+else
+  ac_cv_lib_resolv___inet_aton=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___inet_aton" >&5
-printf "%s\n" "$ac_cv_lib_resolv___inet_aton" >&6; }
-if test "x$ac_cv_lib_resolv___inet_aton" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___inet_aton" >&5
+$as_echo "$ac_cv_lib_resolv___inet_aton" >&6; }
+if test "x$ac_cv_lib_resolv___inet_aton" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -15987,10 +14519,10 @@
 
 
 
-printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h
+$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_inet_aton=yes
   else
@@ -15999,140 +14531,118 @@
   unset ac_cv_lib_bind_inet_aton
   unset ac_cv_lib_bind___inet_aton
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lbind" >&5
-printf %s "checking for inet_aton in -lbind... " >&6; }
-if test ${ac_cv_lib_bind_inet_aton+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lbind" >&5
+$as_echo_n "checking for inet_aton in -lbind... " >&6; }
+if ${ac_cv_lib_bind_inet_aton+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char inet_aton (void);
+char inet_aton ();
 int
-main (void)
+main ()
 {
 return inet_aton ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_inet_aton=yes
-else case e in #(
-  e) ac_cv_lib_bind_inet_aton=no ;;
-esac
+else
+  ac_cv_lib_bind_inet_aton=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_inet_aton" >&5
-printf "%s\n" "$ac_cv_lib_bind_inet_aton" >&6; }
-if test "x$ac_cv_lib_bind_inet_aton" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_inet_aton" >&5
+$as_echo "$ac_cv_lib_bind_inet_aton" >&6; }
+if test "x$ac_cv_lib_bind_inet_aton" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __inet_aton in -lbind" >&5
-printf %s "checking for __inet_aton in -lbind... " >&6; }
-if test ${ac_cv_lib_bind___inet_aton+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __inet_aton in -lbind" >&5
+$as_echo_n "checking for __inet_aton in -lbind... " >&6; }
+if ${ac_cv_lib_bind___inet_aton+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __inet_aton (void);
+char __inet_aton ();
 int
-main (void)
+main ()
 {
 return __inet_aton ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___inet_aton=yes
-else case e in #(
-  e) ac_cv_lib_bind___inet_aton=no ;;
-esac
+else
+  ac_cv_lib_bind___inet_aton=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___inet_aton" >&5
-printf "%s\n" "$ac_cv_lib_bind___inet_aton" >&6; }
-if test "x$ac_cv_lib_bind___inet_aton" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___inet_aton" >&5
+$as_echo "$ac_cv_lib_bind___inet_aton" >&6; }
+if test "x$ac_cv_lib_bind___inet_aton" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -16150,10 +14660,10 @@
 
 
 
-printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h
+$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_inet_aton=yes
   else
@@ -16171,1134 +14681,63 @@
 
 
 
-ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_stdint_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "dirent.h" "ac_cv_header_dirent_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_dirent_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_DIRENT_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_param_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_types_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_time_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_netinet_in_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_NETINET_IN_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "alloca.h" "ac_cv_header_alloca_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_alloca_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h
+for ac_header in  \
+stdint.h \
+dirent.h \
+sys/param.h \
+sys/types.h \
+sys/time.h \
+netinet/in.h \
+alloca.h \
+arpa/inet.h \
+arpa/nameser.h \
+crypt.h \
+dns.h \
+fcntl.h \
+grp.h \
+ieeefp.h \
+langinfo.h \
+linux/filter.h \
+linux/sock_diag.h \
+malloc.h \
+os/signpost.h \
+poll.h \
+pty.h \
+pwd.h \
+resolv.h \
+strings.h \
+syslog.h \
+sysexits.h \
+sys/ioctl.h \
+sys/file.h \
+sys/mman.h \
+sys/mount.h \
+sys/poll.h \
+sys/resource.h \
+sys/select.h \
+sys/socket.h \
+sys/stat.h \
+sys/statfs.h \
+sys/statvfs.h \
+sys/vfs.h \
+sys/sysexits.h \
+sys/uio.h \
+sys/wait.h \
+sys/loadavg.h \
+unistd.h \
+unix.h \
+utime.h \
+sys/utsname.h \
+sys/ipc.h \
+dlfcn.h \
+tmmintrin.h \
+nmmintrin.h \
+wmmintrin.h \
+immintrin.h
 
-fi
-ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_arpa_inet_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_ARPA_INET_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "arpa/nameser.h" "ac_cv_header_arpa_nameser_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_arpa_nameser_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_ARPA_NAMESER_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_crypt_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_CRYPT_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "dns.h" "ac_cv_header_dns_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_dns_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_DNS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_fcntl_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "grp.h" "ac_cv_header_grp_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_grp_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_GRP_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "ieeefp.h" "ac_cv_header_ieeefp_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_ieeefp_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_IEEEFP_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_langinfo_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "linux/filter.h" "ac_cv_header_linux_filter_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_linux_filter_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_LINUX_FILTER_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "linux/sock_diag.h" "ac_cv_header_linux_sock_diag_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_linux_sock_diag_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_LINUX_SOCK_DIAG_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_malloc_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_MALLOC_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "os/signpost.h" "ac_cv_header_os_signpost_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_os_signpost_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_OS_SIGNPOST_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "poll.h" "ac_cv_header_poll_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_poll_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_POLL_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "pty.h" "ac_cv_header_pty_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_pty_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_PTY_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "pwd.h" "ac_cv_header_pwd_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_pwd_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_PWD_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_resolv_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_RESOLV_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "strings.h" "ac_cv_header_strings_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_strings_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRINGS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_syslog_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYSLOG_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sysexits.h" "ac_cv_header_sysexits_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sysexits_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYSEXITS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_ioctl_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/file.h" "ac_cv_header_sys_file_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_file_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_FILE_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_mman_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_MMAN_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_mount_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_poll_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_POLL_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_resource_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_RESOURCE_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_select_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_socket_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/stat.h" "ac_cv_header_sys_stat_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_stat_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_STAT_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/statfs.h" "ac_cv_header_sys_statfs_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_statfs_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_STATFS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/statvfs.h" "ac_cv_header_sys_statvfs_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_statvfs_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_STATVFS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/vfs.h" "ac_cv_header_sys_vfs_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_vfs_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_VFS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/sysexits.h" "ac_cv_header_sys_sysexits_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_sysexits_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_SYSEXITS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_uio_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_UIO_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_wait_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_loadavg_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_LOADAVG_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_unistd_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "unix.h" "ac_cv_header_unix_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_unix_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_UNIX_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "utime.h" "ac_cv_header_utime_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_utime_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_UTIME_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_utsname_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_UTSNAME_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_ipc_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_IPC_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "tmmintrin.h" "ac_cv_header_tmmintrin_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_tmmintrin_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_TMMINTRIN_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "nmmintrin.h" "ac_cv_header_nmmintrin_h" "
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
@@ -17316,63 +14755,19 @@
 #endif
 
 "
-if test "x$ac_cv_header_nmmintrin_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_NMMINTRIN_H 1" >>confdefs.h
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
 fi
-ac_fn_c_check_header_compile "$LINENO" "wmmintrin.h" "ac_cv_header_wmmintrin_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
 
-"
-if test "x$ac_cv_header_wmmintrin_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_WMMINTRIN_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "immintrin.h" "ac_cv_header_immintrin_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_immintrin_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_IMMINTRIN_H 1" >>confdefs.h
-
-fi
+done
 
 
 
   ac_fn_c_check_func "$LINENO" "fopencookie" "ac_cv_func_fopencookie"
-if test "x$ac_cv_func_fopencookie" = xyes
-then :
+if test "x$ac_cv_func_fopencookie" = xyes; then :
   have_glibc_fopencookie=yes
 fi
 
@@ -17385,25 +14780,23 @@
 #include <stdio.h>
 
 int
-main (void)
+main ()
 {
 cookie_io_functions_t cookie;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   have_cookie_io_functions_t=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
     if test "$have_cookie_io_functions_t" = "yes"; then
       cookie_io_functions_t=cookie_io_functions_t
       have_fopen_cookie=yes
 
-if test "$cross_compiling" = yes
-then :
+if test "$cross_compiling" = yes; then :
 
     case $host_alias in
     *linux*)
@@ -17414,8 +14807,8 @@
       ;;
   esac
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #define _GNU_SOURCE
@@ -17448,20 +14841,17 @@
 
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
   cookie_io_functions_use_off64_t=yes
 
-else case e in #(
-  e)
+else
+
   cookie_io_functions_use_off64_t=no
- ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
@@ -17474,18 +14864,17 @@
 #include <stdio.h>
 
 int
-main (void)
+main ()
 {
 _IO_cookie_io_functions_t cookie;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   have_IO_cookie_io_functions_t=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       if test "$have_cookie_io_functions_t" = "yes" ; then
         cookie_io_functions_t=_IO_cookie_io_functions_t
         have_fopen_cookie=yes
@@ -17494,51 +14883,51 @@
 
     if test "$have_fopen_cookie" = "yes" ; then
 
-printf "%s\n" "#define HAVE_FOPENCOOKIE 1" >>confdefs.h
+$as_echo "#define HAVE_FOPENCOOKIE 1" >>confdefs.h
 
 
-printf "%s\n" "#define COOKIE_IO_FUNCTIONS_T $cookie_io_functions_t" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COOKIE_IO_FUNCTIONS_T $cookie_io_functions_t
+_ACEOF
 
       if test "$cookie_io_functions_use_off64_t" = "yes" ; then
 
-printf "%s\n" "#define COOKIE_SEEKER_USES_OFF64_T 1" >>confdefs.h
+$as_echo "#define COOKIE_SEEKER_USES_OFF64_T 1" >>confdefs.h
 
       fi
     fi
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken getcwd" >&5
-printf %s "checking for broken getcwd... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken getcwd" >&5
+$as_echo_n "checking for broken getcwd... " >&6; }
   os=`uname -sr 2>/dev/null`
   case $os in
     SunOS*)
 
-printf "%s\n" "#define HAVE_BROKEN_GETCWD 1" >>confdefs.h
+$as_echo "#define HAVE_BROKEN_GETCWD 1" >>confdefs.h
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; };;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; };;
     *)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; };;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; };;
   esac
 
 if test "$GCC" = "yes"; then
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken gcc optimize-strlen" >&5
-printf %s "checking for broken gcc optimize-strlen... " >&6; }
-if test ${ac_cv_have_broken_gcc_strlen_opt+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-  if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken gcc optimize-strlen" >&5
+$as_echo_n "checking for broken gcc optimize-strlen... " >&6; }
+if ${ac_cv_have_broken_gcc_strlen_opt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  if test "$cross_compiling" = yes; then :
 
   ac_cv_have_broken_gcc_strlen_opt=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdlib.h>
@@ -17558,26 +14947,22 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_have_broken_gcc_strlen_opt=yes
 
-else case e in #(
-  e)
+else
+
   ac_cv_have_broken_gcc_strlen_opt=no
- ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_broken_gcc_strlen_opt" >&5
-printf "%s\n" "$ac_cv_have_broken_gcc_strlen_opt" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_broken_gcc_strlen_opt" >&5
+$as_echo "$ac_cv_have_broken_gcc_strlen_opt" >&6; }
   if test "$ac_cv_have_broken_gcc_strlen_opt" = "yes"; then
     CFLAGS="$CFLAGS -fno-optimize-strlen"
   fi
@@ -17585,19 +14970,18 @@
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-printf %s "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if test ${ac_cv_struct_tm+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if ${ac_cv_struct_tm+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <time.h>
 
 int
-main (void)
+main ()
 {
 struct tm tm;
 				     int *p = &tm.tm_sec;
@@ -17606,142 +14990,57 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_struct_tm=time.h
-else case e in #(
-  e) ac_cv_struct_tm=sys/time.h ;;
-esac
+else
+  ac_cv_struct_tm=sys/time.h
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-printf "%s\n" "$ac_cv_struct_tm" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
 if test $ac_cv_struct_tm = sys/time.h; then
 
-printf "%s\n" "#define TM_IN_SYS_TIME 1" >>confdefs.h
-
-fi
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
-printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
-if test ${ac_cv_c_undeclared_builtin_options+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_CFLAGS=$CFLAGS
-   ac_cv_c_undeclared_builtin_options='cannot detect'
-   for ac_arg in '' -fno-builtin; do
-     CFLAGS="$ac_save_CFLAGS $ac_arg"
-     # This test program should *not* compile successfully.
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-(void) strchr;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-
-else case e in #(
-  e) # This test program should compile successfully.
-        # No library function is consistently available on
-        # freestanding implementations, so test against a dummy
-        # declaration.  Include always-available headers on the
-        # off chance that they somehow elicit warnings.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <float.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stddef.h>
-extern void ac_decl (int, char *);
-
-int
-main (void)
-{
-(void) ac_decl (0, (char *) 0);
-  (void) ac_decl;
+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  if test x"$ac_arg" = x
-then :
-  ac_cv_c_undeclared_builtin_options='none needed'
-else case e in #(
-  e) ac_cv_c_undeclared_builtin_options=$ac_arg ;;
-esac
-fi
-          break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-    done
-    CFLAGS=$ac_save_CFLAGS
-   ;;
-esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
-printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
-  case $ac_cv_c_undeclared_builtin_options in #(
-  'cannot detect') :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-as_fn_error $? "cannot make $CC report undeclared builtins
-See 'config.log' for more details" "$LINENO" 5; } ;; #(
-  'none needed') :
-    ac_c_undeclared_builtin_options='' ;; #(
-  *) :
-    ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
-esac
 
 ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
 #include <$ac_cv_struct_tm>
 
 "
-if test "x$ac_cv_member_struct_tm_tm_zone" = xyes
-then :
+if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
 
-printf "%s\n" "#define HAVE_STRUCT_TM_TM_ZONE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_TM_TM_ZONE 1
+_ACEOF
 
 
 fi
 
 if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
 
-printf "%s\n" "#define HAVE_TM_ZONE 1" >>confdefs.h
+$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
 
 else
-  ac_fn_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_tzname" = xyes
-then :
+  ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_tzname" = xyes; then :
   ac_have_decl=1
-else case e in #(
-  e) ac_have_decl=0 ;;
-esac
+else
+  ac_have_decl=0
 fi
-printf "%s\n" "#define HAVE_DECL_TZNAME $ac_have_decl" >>confdefs.h
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
-printf %s "checking for tzname... " >&6; }
-if test ${ac_cv_var_tzname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_TZNAME $ac_have_decl
+_ACEOF
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
+$as_echo_n "checking for tzname... " >&6; }
+if ${ac_cv_var_tzname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 #if !HAVE_DECL_TZNAME
@@ -17749,167 +15048,153 @@
 #endif
 
 int
-main (void)
+main ()
 {
 return tzname00;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_var_tzname=yes
-else case e in #(
-  e) ac_cv_var_tzname=no ;;
-esac
+else
+  ac_cv_var_tzname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
-printf "%s\n" "$ac_cv_var_tzname" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
+$as_echo "$ac_cv_var_tzname" >&6; }
   if test $ac_cv_var_tzname = yes; then
 
-printf "%s\n" "#define HAVE_TZNAME 1" >>confdefs.h
+$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
 
   fi
 fi
 
 
 
-ac_fn_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "#include <time.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_localtime_r" = xyes
-then :
+ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_localtime_r" = xyes; then :
+
+else
+
+$as_echo "#define MISSING_LOCALTIME_R_DECL 1" >>confdefs.h
 
-else case e in #(
-  e)
-printf "%s\n" "#define MISSING_LOCALTIME_R_DECL 1" >>confdefs.h
- ;;
-esac
 fi
-ac_fn_check_decl "$LINENO" "gmtime_r" "ac_cv_have_decl_gmtime_r" "#include <time.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_gmtime_r" = xyes
-then :
-
-else case e in #(
-  e)
-printf "%s\n" "#define MISSING_GMTIME_R_DECL 1" >>confdefs.h
- ;;
-esac
+
+ac_fn_c_check_decl "$LINENO" "gmtime_r" "ac_cv_have_decl_gmtime_r" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_gmtime_r" = xyes; then :
+
+else
+
+$as_echo "#define MISSING_GMTIME_R_DECL 1" >>confdefs.h
+
 fi
-ac_fn_check_decl "$LINENO" "asctime_r" "ac_cv_have_decl_asctime_r" "#include <time.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_asctime_r" = xyes
-then :
-
-else case e in #(
-  e)
-printf "%s\n" "#define MISSING_ASCTIME_R_DECL 1" >>confdefs.h
- ;;
-esac
+
+ac_fn_c_check_decl "$LINENO" "asctime_r" "ac_cv_have_decl_asctime_r" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_asctime_r" = xyes; then :
+
+else
+
+$as_echo "#define MISSING_ASCTIME_R_DECL 1" >>confdefs.h
+
 fi
-ac_fn_check_decl "$LINENO" "ctime_r" "ac_cv_have_decl_ctime_r" "#include <time.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_ctime_r" = xyes
-then :
-
-else case e in #(
-  e)
-printf "%s\n" "#define MISSING_CTIME_R_DECL 1" >>confdefs.h
- ;;
-esac
+
+ac_fn_c_check_decl "$LINENO" "ctime_r" "ac_cv_have_decl_ctime_r" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_ctime_r" = xyes; then :
+
+else
+
+$as_echo "#define MISSING_CTIME_R_DECL 1" >>confdefs.h
+
 fi
-ac_fn_check_decl "$LINENO" "strtok_r" "ac_cv_have_decl_strtok_r" "#include <string.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_strtok_r" = xyes
-then :
-
-else case e in #(
-  e)
-printf "%s\n" "#define MISSING_STRTOK_R_DECL 1" >>confdefs.h
- ;;
-esac
+
+ac_fn_c_check_decl "$LINENO" "strtok_r" "ac_cv_have_decl_strtok_r" "#include <string.h>
+"
+if test "x$ac_cv_have_decl_strtok_r" = xyes; then :
+
+else
+
+$as_echo "#define MISSING_STRTOK_R_DECL 1" >>confdefs.h
+
 fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fclose declaration" >&5
-printf %s "checking for fclose declaration... " >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fclose declaration" >&5
+$as_echo_n "checking for fclose declaration... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main (void)
+main ()
 {
 int (*func)(FILE *) = fclose
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define MISSING_FCLOSE_DECL 0" >>confdefs.h
+$as_echo "#define MISSING_FCLOSE_DECL 0" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
 
-else case e in #(
-  e)
+else
 
-printf "%s\n" "#define MISSING_FCLOSE_DECL 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: missing" >&5
-printf "%s\n" "missing" >&6; }
-   ;;
-esac
+$as_echo "#define MISSING_FCLOSE_DECL 1" >>confdefs.h
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: missing" >&5
+$as_echo "missing" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct flock" >&5
-printf %s "checking for struct flock... " >&6; }
-if test ${ac_cv_struct_flock+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct flock" >&5
+$as_echo_n "checking for struct flock... " >&6; }
+if ${ac_cv_struct_flock+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
 #include <fcntl.h>
 
 int
-main (void)
+main ()
 {
 struct flock x;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
           ac_cv_struct_flock=yes
 
-else case e in #(
-  e)
+else
+
           ac_cv_struct_flock=no
-         ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
- ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_flock" >&5
-printf "%s\n" "$ac_cv_struct_flock" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_flock" >&5
+$as_echo "$ac_cv_struct_flock" >&6; }
 if test "$ac_cv_struct_flock" = "yes" ; then
 
-printf "%s\n" "#define HAVE_STRUCT_FLOCK 1" >>confdefs.h
+$as_echo "#define HAVE_STRUCT_FLOCK 1" >>confdefs.h
 
 fi
 
@@ -17923,36 +15208,35 @@
   #endif
 
 "
-if test "x$ac_cv_type_socklen_t" = xyes
-then :
+if test "x$ac_cv_type_socklen_t" = xyes; then :
 
-printf "%s\n" "#define HAVE_SOCKLEN_T 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SOCKLEN_T 1
+_ACEOF
 
 
 fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of intmax_t" >&5
-printf %s "checking size of intmax_t... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of intmax_t" >&5
+$as_echo_n "checking size of intmax_t... " >&6; }
 
   php_cache_value=php_cv_sizeof_intmax_t
-  if test ${php_cv_sizeof_intmax_t+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  if ${php_cv_sizeof_intmax_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     old_LIBS=$LIBS
     LIBS=
     old_LDFLAGS=$LDFLAGS
     LDFLAGS=
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
     eval $php_cache_value=0
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -17972,64 +15256,62 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     eval $php_cache_value=`cat conftestval`
 
-else case e in #(
-  e)
+else
+
     eval $php_cache_value=0
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
- ;;
-esac
+
 fi
 
   if eval test "\$$php_cache_value" != "0"; then
 
 
-printf "%s\n" "#define SIZEOF_INTMAX_T $php_cv_sizeof_intmax_t" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INTMAX_T $php_cv_sizeof_intmax_t
+_ACEOF
 
 
-printf "%s\n" "#define HAVE_INTMAX_T 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INTMAX_T 1
+_ACEOF
 
 
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_intmax_t" >&5
-printf "%s\n" "$php_cv_sizeof_intmax_t" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_intmax_t" >&5
+$as_echo "$php_cv_sizeof_intmax_t" >&6; }
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5
-printf %s "checking size of ssize_t... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5
+$as_echo_n "checking size of ssize_t... " >&6; }
 
   php_cache_value=php_cv_sizeof_ssize_t
-  if test ${php_cv_sizeof_ssize_t+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  if ${php_cv_sizeof_ssize_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     old_LIBS=$LIBS
     LIBS=
     old_LDFLAGS=$LDFLAGS
     LDFLAGS=
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
     eval $php_cache_value=8
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -18049,64 +15331,62 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     eval $php_cache_value=`cat conftestval`
 
-else case e in #(
-  e)
+else
+
     eval $php_cache_value=0
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
- ;;
-esac
+
 fi
 
   if eval test "\$$php_cache_value" != "0"; then
 
 
-printf "%s\n" "#define SIZEOF_SSIZE_T $php_cv_sizeof_ssize_t" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SSIZE_T $php_cv_sizeof_ssize_t
+_ACEOF
 
 
-printf "%s\n" "#define HAVE_SSIZE_T 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SSIZE_T 1
+_ACEOF
 
 
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ssize_t" >&5
-printf "%s\n" "$php_cv_sizeof_ssize_t" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ssize_t" >&5
+$as_echo "$php_cv_sizeof_ssize_t" >&6; }
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of ptrdiff_t" >&5
-printf %s "checking size of ptrdiff_t... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ptrdiff_t" >&5
+$as_echo_n "checking size of ptrdiff_t... " >&6; }
 
   php_cache_value=php_cv_sizeof_ptrdiff_t
-  if test ${php_cv_sizeof_ptrdiff_t+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  if ${php_cv_sizeof_ptrdiff_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     old_LIBS=$LIBS
     LIBS=
     old_LDFLAGS=$LDFLAGS
     LDFLAGS=
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
     eval $php_cache_value=8
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -18126,253 +15406,241 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     eval $php_cache_value=`cat conftestval`
 
-else case e in #(
-  e)
+else
+
     eval $php_cache_value=0
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
- ;;
-esac
+
 fi
 
   if eval test "\$$php_cache_value" != "0"; then
 
 
-printf "%s\n" "#define SIZEOF_PTRDIFF_T $php_cv_sizeof_ptrdiff_t" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_PTRDIFF_T $php_cv_sizeof_ptrdiff_t
+_ACEOF
 
 
-printf "%s\n" "#define HAVE_PTRDIFF_T 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_PTRDIFF_T 1
+_ACEOF
 
 
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ptrdiff_t" >&5
-printf "%s\n" "$php_cv_sizeof_ptrdiff_t" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ptrdiff_t" >&5
+$as_echo "$php_cv_sizeof_ptrdiff_t" >&6; }
 
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3(sizeof (unsigned char)) >= 0;'.
+# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
-printf %s "checking size of short... " >&6; }
-if test ${ac_cv_sizeof_short+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_short" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+$as_echo_n "checking size of short... " >&6; }
+if ${ac_cv_sizeof_short+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_short" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (short)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_short=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
-printf "%s\n" "$ac_cv_sizeof_short" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+$as_echo "$ac_cv_sizeof_short" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_SHORT $ac_cv_sizeof_short" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+_ACEOF
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3(sizeof (unsigned char)) >= 0;'.
+# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
-printf %s "checking size of int... " >&6; }
-if test ${ac_cv_sizeof_int+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_int" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if ${ac_cv_sizeof_int+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (int)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_int=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-printf "%s\n" "$ac_cv_sizeof_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+_ACEOF
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3(sizeof (unsigned char)) >= 0;'.
+# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-printf %s "checking size of long... " >&6; }
-if test ${ac_cv_sizeof_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3(sizeof (unsigned char)) >= 0;'.
+# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
-printf %s "checking size of long long... " >&6; }
-if test ${ac_cv_sizeof_long_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+$as_echo_n "checking size of long long... " >&6; }
+if ${ac_cv_sizeof_long_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+$as_echo "$ac_cv_sizeof_long_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+_ACEOF
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3(sizeof (unsigned char)) >= 0;'.
+# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-printf %s "checking size of size_t... " >&6; }
-if test ${ac_cv_sizeof_size_t+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_size_t" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
+$as_echo_n "checking size of size_t... " >&6; }
+if ${ac_cv_sizeof_size_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_size_t" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (size_t)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_size_t=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-printf "%s\n" "$ac_cv_sizeof_size_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
+$as_echo "$ac_cv_sizeof_size_t" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+_ACEOF
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3(sizeof (unsigned char)) >= 0;'.
+# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
-printf %s "checking size of off_t... " >&6; }
-if test ${ac_cv_sizeof_off_t+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_off_t" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
+$as_echo_n "checking size of off_t... " >&6; }
+if ${ac_cv_sizeof_off_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_off_t" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (off_t)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_off_t=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
-printf "%s\n" "$ac_cv_sizeof_off_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
+$as_echo "$ac_cv_sizeof_off_t" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_OFF_T $ac_cv_sizeof_off_t" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
+_ACEOF
 
 
   ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "
@@ -18382,17 +15650,17 @@
 #endif
 
 "
-if test "x$ac_cv_type_int8_t" = xyes
-then :
+if test "x$ac_cv_type_int8_t" = xyes; then :
 
-printf "%s\n" "#define HAVE_INT8_T 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INT8_T 1
+_ACEOF
 
 
-else case e in #(
-  e)
+else
+
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "
 #include <stdint.h>
@@ -18401,17 +15669,17 @@
 #endif
 
 "
-if test "x$ac_cv_type_int16_t" = xyes
-then :
+if test "x$ac_cv_type_int16_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INT16_T 1
+_ACEOF
 
-printf "%s\n" "#define HAVE_INT16_T 1" >>confdefs.h
 
+else
 
-else case e in #(
-  e)
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "
 #include <stdint.h>
@@ -18420,17 +15688,17 @@
 #endif
 
 "
-if test "x$ac_cv_type_int32_t" = xyes
-then :
+if test "x$ac_cv_type_int32_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INT32_T 1
+_ACEOF
 
-printf "%s\n" "#define HAVE_INT32_T 1" >>confdefs.h
 
+else
 
-else case e in #(
-  e)
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "
 #include <stdint.h>
@@ -18439,17 +15707,17 @@
 #endif
 
 "
-if test "x$ac_cv_type_int64_t" = xyes
-then :
+if test "x$ac_cv_type_int64_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INT64_T 1
+_ACEOF
 
-printf "%s\n" "#define HAVE_INT64_T 1" >>confdefs.h
 
+else
 
-else case e in #(
-  e)
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" "
 #include <stdint.h>
@@ -18458,17 +15726,17 @@
 #endif
 
 "
-if test "x$ac_cv_type_uint8_t" = xyes
-then :
+if test "x$ac_cv_type_uint8_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINT8_T 1
+_ACEOF
 
-printf "%s\n" "#define HAVE_UINT8_T 1" >>confdefs.h
 
+else
 
-else case e in #(
-  e)
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "
 #include <stdint.h>
@@ -18477,17 +15745,17 @@
 #endif
 
 "
-if test "x$ac_cv_type_uint16_t" = xyes
-then :
+if test "x$ac_cv_type_uint16_t" = xyes; then :
 
-printf "%s\n" "#define HAVE_UINT16_T 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINT16_T 1
+_ACEOF
 
 
-else case e in #(
-  e)
+else
+
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "
 #include <stdint.h>
@@ -18496,17 +15764,17 @@
 #endif
 
 "
-if test "x$ac_cv_type_uint32_t" = xyes
-then :
+if test "x$ac_cv_type_uint32_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINT32_T 1
+_ACEOF
 
-printf "%s\n" "#define HAVE_UINT32_T 1" >>confdefs.h
 
+else
 
-else case e in #(
-  e)
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "
 #include <stdint.h>
@@ -18515,30 +15783,30 @@
 #endif
 
 "
-if test "x$ac_cv_type_uint64_t" = xyes
-then :
+if test "x$ac_cv_type_uint64_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINT64_T 1
+_ACEOF
 
-printf "%s\n" "#define HAVE_UINT64_T 1" >>confdefs.h
 
+else
 
-else case e in #(
-  e)
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
-printf %s "checking for __builtin_expect... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
+$as_echo_n "checking for __builtin_expect... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     return __builtin_expect(1,1) ? 1 : 0;
@@ -18547,37 +15815,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_expect=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_expect=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_EXPECT $have_builtin_expect" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_EXPECT $have_builtin_expect
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_clz" >&5
-printf %s "checking for __builtin_clz... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clz" >&5
+$as_echo_n "checking for __builtin_clz... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     return __builtin_clz(1) ? 1 : 0;
@@ -18586,37 +15854,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_clz=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_clz=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_CLZ $have_builtin_clz" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_CLZ $have_builtin_clz
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzl" >&5
-printf %s "checking for __builtin_clzl... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzl" >&5
+$as_echo_n "checking for __builtin_clzl... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     return __builtin_clzl(1) ? 1 : 0;
@@ -18625,37 +15893,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_clzl=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_clzl=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_CLZL $have_builtin_clzl" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_CLZL $have_builtin_clzl
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzll" >&5
-printf %s "checking for __builtin_clzll... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzll" >&5
+$as_echo_n "checking for __builtin_clzll... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     return __builtin_clzll(1) ? 1 : 0;
@@ -18664,37 +15932,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_clzll=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_clzll=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_CLZLL $have_builtin_clzll" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_CLZLL $have_builtin_clzll
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzl" >&5
-printf %s "checking for __builtin_ctzl... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzl" >&5
+$as_echo_n "checking for __builtin_ctzl... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     return __builtin_ctzl(2L) ? 1 : 0;
@@ -18703,37 +15971,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_ctzl=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_ctzl=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_CTZL $have_builtin_ctzl" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_CTZL $have_builtin_ctzl
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzll" >&5
-printf %s "checking for __builtin_ctzll... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzll" >&5
+$as_echo_n "checking for __builtin_ctzll... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     return __builtin_ctzll(2LL) ? 1 : 0;
@@ -18742,37 +16010,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_ctzll=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_ctzll=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_CTZLL $have_builtin_ctzll" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_CTZLL $have_builtin_ctzll
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_smull_overflow" >&5
-printf %s "checking for __builtin_smull_overflow... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_smull_overflow" >&5
+$as_echo_n "checking for __builtin_smull_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     long tmpvar;
@@ -18782,37 +16050,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_smull_overflow=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_smull_overflow=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_SMULL_OVERFLOW $have_builtin_smull_overflow" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_SMULL_OVERFLOW $have_builtin_smull_overflow
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_smulll_overflow" >&5
-printf %s "checking for __builtin_smulll_overflow... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_smulll_overflow" >&5
+$as_echo_n "checking for __builtin_smulll_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     long long tmpvar;
@@ -18822,37 +16090,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_smulll_overflow=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_smulll_overflow=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_SMULLL_OVERFLOW $have_builtin_smulll_overflow" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_SMULLL_OVERFLOW $have_builtin_smulll_overflow
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddl_overflow" >&5
-printf %s "checking for __builtin_saddl_overflow... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddl_overflow" >&5
+$as_echo_n "checking for __builtin_saddl_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     long tmpvar;
@@ -18862,37 +16130,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_saddl_overflow=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_saddl_overflow=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_SADDL_OVERFLOW $have_builtin_saddl_overflow" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_SADDL_OVERFLOW $have_builtin_saddl_overflow
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddll_overflow" >&5
-printf %s "checking for __builtin_saddll_overflow... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddll_overflow" >&5
+$as_echo_n "checking for __builtin_saddll_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     long long tmpvar;
@@ -18902,37 +16170,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_saddll_overflow=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_saddll_overflow=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_SADDLL_OVERFLOW $have_builtin_saddll_overflow" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_SADDLL_OVERFLOW $have_builtin_saddll_overflow
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubl_overflow" >&5
-printf %s "checking for __builtin_ssubl_overflow... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubl_overflow" >&5
+$as_echo_n "checking for __builtin_ssubl_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     long tmpvar;
@@ -18942,37 +16210,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_ssubl_overflow=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_ssubl_overflow=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_SSUBL_OVERFLOW $have_builtin_ssubl_overflow" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_SSUBL_OVERFLOW $have_builtin_ssubl_overflow
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubll_overflow" >&5
-printf %s "checking for __builtin_ssubll_overflow... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubll_overflow" >&5
+$as_echo_n "checking for __builtin_ssubll_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     long long tmpvar;
@@ -18982,37 +16250,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_ssubll_overflow=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_ssubll_overflow=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_SSUBLL_OVERFLOW $have_builtin_ssubll_overflow" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_SSUBLL_OVERFLOW $have_builtin_ssubll_overflow
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_init" >&5
-printf %s "checking for __builtin_cpu_init... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_init" >&5
+$as_echo_n "checking for __builtin_cpu_init... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     __builtin_cpu_init();
@@ -19021,37 +16289,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_cpu_init=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_cpu_init=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_CPU_INIT $have_builtin_cpu_init" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_CPU_INIT $have_builtin_cpu_init
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_supports" >&5
-printf %s "checking for __builtin_cpu_supports... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_supports" >&5
+$as_echo_n "checking for __builtin_cpu_supports... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     return __builtin_cpu_supports("sse")? 1 : 0;
@@ -19060,42 +16328,41 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_cpu_supports=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_cpu_supports=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_CPU_SUPPORTS $have_builtin_cpu_supports" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_CPU_SUPPORTS $have_builtin_cpu_supports
+_ACEOF
+
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports __alignof__" >&5
+$as_echo_n "checking whether the compiler supports __alignof__... " >&6; }
+if ${ac_cv_alignof_exists+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports __alignof__" >&5
-printf %s "checking whether the compiler supports __alignof__... " >&6; }
-if test ${ac_cv_alignof_exists+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main (void)
+main ()
 {
 
   int align = __alignof__(int);
@@ -19104,184 +16371,184 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
   ac_cv_alignof_exists=yes
 
-else case e in #(
-  e)
+else
+
   ac_cv_alignof_exists=no
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_exists" >&5
-printf "%s\n" "$ac_cv_alignof_exists" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_exists" >&5
+$as_echo "$ac_cv_alignof_exists" >&6; }
 if test "$ac_cv_alignof_exists" = "yes"; then
 
-printf "%s\n" "#define HAVE_ALIGNOF 1" >>confdefs.h
+$as_echo "#define HAVE_ALIGNOF 1" >>confdefs.h
 
 fi
 
 ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include <time.h>
 "
-if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes
-then :
+if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then :
 
-printf "%s\n" "#define HAVE_STRUCT_TM_TM_GMTOFF 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_TM_TM_GMTOFF 1
+_ACEOF
 
 
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_blksize" = xyes
-then :
+if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BLKSIZE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+_ACEOF
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_rdev" = xyes
-then :
+if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_RDEV 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_RDEV 1
+_ACEOF
 
 
 fi
 
 if test "`uname -s 2>/dev/null`" != "QNX"; then
   ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_blocks" = xyes
-then :
+if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BLOCKS 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_BLOCKS 1
+_ACEOF
 
 
-printf "%s\n" "#define HAVE_ST_BLOCKS 1" >>confdefs.h
+$as_echo "#define HAVE_ST_BLOCKS 1" >>confdefs.h
 
-else case e in #(
-  e) case " $LIBOBJS " in
+else
+  case " $LIBOBJS " in
   *" fileblocks.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
  ;;
 esac
- ;;
-esac
+
 fi
 
 
 fi
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes
-then :
+if test "x$ac_cv_type_size_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
 
-else case e in #(
-  e)
-printf "%s\n" "#define size_t unsigned int" >>confdefs.h
- ;;
-esac
 fi
 
-ac_fn_c_check_type "$LINENO" "uid_t" "ac_cv_type_uid_t" "$ac_includes_default"
-if test "x$ac_cv_type_uid_t" = xyes
-then :
-
-else case e in #(
-  e)
-printf "%s\n" "#define uid_t int" >>confdefs.h
- ;;
-esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+if ${ac_cv_type_uid_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "uid_t" >/dev/null 2>&1; then :
+  ac_cv_type_uid_t=yes
+else
+  ac_cv_type_uid_t=no
 fi
+rm -f conftest*
 
-ac_fn_c_check_type "$LINENO" "gid_t" "ac_cv_type_gid_t" "$ac_includes_default"
-if test "x$ac_cv_type_gid_t" = xyes
-then :
-
-else case e in #(
-  e)
-printf "%s\n" "#define gid_t int" >>confdefs.h
- ;;
-esac
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+$as_echo "$ac_cv_type_uid_t" >&6; }
+if test $ac_cv_type_uid_t = no; then
 
+$as_echo "#define uid_t int" >>confdefs.h
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
-printf %s "checking for struct sockaddr_storage... " >&6; }
-if test ${ac_cv_sockaddr_storage+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+$as_echo "#define gid_t int" >>confdefs.h
+
+fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
+$as_echo_n "checking for struct sockaddr_storage... " >&6; }
+if ${ac_cv_sockaddr_storage+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/socket.h>
 int
-main (void)
+main ()
 {
 struct sockaddr_storage s; s
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sockaddr_storage=yes
-else case e in #(
-  e) ac_cv_sockaddr_storage=no ;;
-esac
+else
+  ac_cv_sockaddr_storage=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_storage" >&5
-printf "%s\n" "$ac_cv_sockaddr_storage" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_storage" >&5
+$as_echo "$ac_cv_sockaddr_storage" >&6; }
   if test "$ac_cv_sockaddr_storage" = "yes"; then
 
-printf "%s\n" "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h
 
   fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for field sa_len in struct sockaddr" >&5
-printf %s "checking for field sa_len in struct sockaddr... " >&6; }
-if test ${ac_cv_sockaddr_sa_len+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for field sa_len in struct sockaddr" >&5
+$as_echo_n "checking for field sa_len in struct sockaddr... " >&6; }
+if ${ac_cv_sockaddr_sa_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/socket.h>
 int
-main (void)
+main ()
 {
 static struct sockaddr sa; int n = (int) sa.sa_len; return n;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sockaddr_sa_len=yes
-else case e in #(
-  e) ac_cv_sockaddr_sa_len=no ;;
-esac
+else
+  ac_cv_sockaddr_sa_len=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_sa_len" >&5
-printf "%s\n" "$ac_cv_sockaddr_sa_len" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_sa_len" >&5
+$as_echo "$ac_cv_sockaddr_sa_len" >&6; }
   if test "$ac_cv_sockaddr_sa_len" = "yes"; then
 
-printf "%s\n" "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
 
   fi
 
@@ -19294,13 +16561,12 @@
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __attribute__((ifunc))" >&5
-printf %s "checking for __attribute__((ifunc))... " >&6; }
-if test ${ax_cv_have_func_attribute_ifunc+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((ifunc))" >&5
+$as_echo_n "checking for __attribute__((ifunc))... " >&6; }
+if ${ax_cv_have_func_attribute_ifunc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -19310,7 +16576,7 @@
                     int foo( void ) __attribute__((ifunc("resolve_foo")));
 
 int
-main (void)
+main ()
 {
 
   ;
@@ -19318,31 +16584,27 @@
 }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-                                      if test -s conftest.err
-then :
+if ac_fn_c_try_link "$LINENO"; then :
+                                      if test -s conftest.err; then :
   ax_cv_have_func_attribute_ifunc=no
-else case e in #(
-  e) ax_cv_have_func_attribute_ifunc=yes ;;
-esac
+else
+  ax_cv_have_func_attribute_ifunc=yes
 fi
-else case e in #(
-  e) ax_cv_have_func_attribute_ifunc=no ;;
-esac
+else
+  ax_cv_have_func_attribute_ifunc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-     ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_ifunc" >&5
-printf "%s\n" "$ax_cv_have_func_attribute_ifunc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_ifunc" >&5
+$as_echo "$ax_cv_have_func_attribute_ifunc" >&6; }
 
-    if test yes = $ax_cv_have_func_attribute_ifunc
-then :
+    if test yes = $ax_cv_have_func_attribute_ifunc; then :
 
-printf "%s\n" "#define HAVE_FUNC_ATTRIBUTE_IFUNC 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_FUNC_ATTRIBUTE_IFUNC 1
+_ACEOF
 
 fi
 
@@ -19351,13 +16613,12 @@
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __attribute__((target))" >&5
-printf %s "checking for __attribute__((target))... " >&6; }
-if test ${ax_cv_have_func_attribute_target+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((target))" >&5
+$as_echo_n "checking for __attribute__((target))... " >&6; }
+if ${ax_cv_have_func_attribute_target+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -19365,7 +16626,7 @@
                     int bar( void ) __attribute__((target("sse2")));
 
 int
-main (void)
+main ()
 {
 
   ;
@@ -19373,31 +16634,27 @@
 }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-                                      if test -s conftest.err
-then :
+if ac_fn_c_try_link "$LINENO"; then :
+                                      if test -s conftest.err; then :
   ax_cv_have_func_attribute_target=no
-else case e in #(
-  e) ax_cv_have_func_attribute_target=yes ;;
-esac
+else
+  ax_cv_have_func_attribute_target=yes
 fi
-else case e in #(
-  e) ax_cv_have_func_attribute_target=no ;;
-esac
+else
+  ax_cv_have_func_attribute_target=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-     ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_target" >&5
-printf "%s\n" "$ax_cv_have_func_attribute_target" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_target" >&5
+$as_echo "$ax_cv_have_func_attribute_target" >&6; }
 
-    if test yes = $ax_cv_have_func_attribute_target
-then :
+    if test yes = $ax_cv_have_func_attribute_target; then :
 
-printf "%s\n" "#define HAVE_FUNC_ATTRIBUTE_TARGET 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_FUNC_ATTRIBUTE_TARGET 1
+_ACEOF
 
 fi
 
@@ -19406,442 +16663,145 @@
  ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IPv6 support" >&5
-printf %s "checking for IPv6 support... " >&6; }
-if test ${ac_cv_ipv6_support+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPv6 support" >&5
+$as_echo_n "checking for IPv6 support... " >&6; }
+if ${ac_cv_ipv6_support+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 int
-main (void)
+main ()
 {
 struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr0 = 0;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_ipv6_support=yes
-else case e in #(
-  e) ac_cv_ipv6_support=no ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ipv6_support" >&5
-printf "%s\n" "$ac_cv_ipv6_support" >&6; }
-
-
-ac_fn_c_check_func "$LINENO" "alphasort" "ac_cv_func_alphasort"
-if test "x$ac_cv_func_alphasort" = xyes
-then :
-  printf "%s\n" "#define HAVE_ALPHASORT 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "asctime_r" "ac_cv_func_asctime_r"
-if test "x$ac_cv_func_asctime_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_ASCTIME_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "chroot" "ac_cv_func_chroot"
-if test "x$ac_cv_func_chroot" = xyes
-then :
-  printf "%s\n" "#define HAVE_CHROOT 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ctime_r" "ac_cv_func_ctime_r"
-if test "x$ac_cv_func_ctime_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_CTIME_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "explicit_memset" "ac_cv_func_explicit_memset"
-if test "x$ac_cv_func_explicit_memset" = xyes
-then :
-  printf "%s\n" "#define HAVE_EXPLICIT_MEMSET 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync"
-if test "x$ac_cv_func_fdatasync" = xyes
-then :
-  printf "%s\n" "#define HAVE_FDATASYNC 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
-if test "x$ac_cv_func_flock" = xyes
-then :
-  printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ftok" "ac_cv_func_ftok"
-if test "x$ac_cv_func_ftok" = xyes
-then :
-  printf "%s\n" "#define HAVE_FTOK 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "funopen" "ac_cv_func_funopen"
-if test "x$ac_cv_func_funopen" = xyes
-then :
-  printf "%s\n" "#define HAVE_FUNOPEN 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror"
-if test "x$ac_cv_func_gai_strerror" = xyes
-then :
-  printf "%s\n" "#define HAVE_GAI_STRERROR 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
-if test "x$ac_cv_func_getcwd" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETCWD 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
-if test "x$ac_cv_func_getloadavg" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETLOADAVG 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getlogin" "ac_cv_func_getlogin"
-if test "x$ac_cv_func_getlogin" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETLOGIN 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getprotobyname" "ac_cv_func_getprotobyname"
-if test "x$ac_cv_func_getprotobyname" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETPROTOBYNAME 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getprotobynumber" "ac_cv_func_getprotobynumber"
-if test "x$ac_cv_func_getprotobynumber" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETPROTOBYNUMBER 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getservbyname" "ac_cv_func_getservbyname"
-if test "x$ac_cv_func_getservbyname" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETSERVBYNAME 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getservbyport" "ac_cv_func_getservbyport"
-if test "x$ac_cv_func_getservbyport" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETSERVBYPORT 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getrusage" "ac_cv_func_getrusage"
-if test "x$ac_cv_func_getrusage" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETRUSAGE 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
-if test "x$ac_cv_func_gettimeofday" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r"
-if test "x$ac_cv_func_gmtime_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_GMTIME_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getpwnam_r" "ac_cv_func_getpwnam_r"
-if test "x$ac_cv_func_getpwnam_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETPWNAM_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getgrnam_r" "ac_cv_func_getgrnam_r"
-if test "x$ac_cv_func_getgrnam_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETGRNAM_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getpwuid_r" "ac_cv_func_getpwuid_r"
-if test "x$ac_cv_func_getpwuid_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETPWUID_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getwd" "ac_cv_func_getwd"
-if test "x$ac_cv_func_getwd" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETWD 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "glob" "ac_cv_func_glob"
-if test "x$ac_cv_func_glob" = xyes
-then :
-  printf "%s\n" "#define HAVE_GLOB 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa"
-if test "x$ac_cv_func_inet_ntoa" = xyes
-then :
-  printf "%s\n" "#define HAVE_INET_NTOA 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
-if test "x$ac_cv_func_inet_ntop" = xyes
-then :
-  printf "%s\n" "#define HAVE_INET_NTOP 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
-if test "x$ac_cv_func_inet_pton" = xyes
-then :
-  printf "%s\n" "#define HAVE_INET_PTON 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r"
-if test "x$ac_cv_func_localtime_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_LOCALTIME_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "lchown" "ac_cv_func_lchown"
-if test "x$ac_cv_func_lchown" = xyes
-then :
-  printf "%s\n" "#define HAVE_LCHOWN 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "memcntl" "ac_cv_func_memcntl"
-if test "x$ac_cv_func_memcntl" = xyes
-then :
-  printf "%s\n" "#define HAVE_MEMCNTL 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
-if test "x$ac_cv_func_memmove" = xyes
-then :
-  printf "%s\n" "#define HAVE_MEMMOVE 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp"
-if test "x$ac_cv_func_mkstemp" = xyes
-then :
-  printf "%s\n" "#define HAVE_MKSTEMP 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
-if test "x$ac_cv_func_mmap" = xyes
-then :
-  printf "%s\n" "#define HAVE_MMAP 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "nice" "ac_cv_func_nice"
-if test "x$ac_cv_func_nice" = xyes
-then :
-  printf "%s\n" "#define HAVE_NICE 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo"
-if test "x$ac_cv_func_nl_langinfo" = xyes
-then :
-  printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll"
-if test "x$ac_cv_func_poll" = xyes
-then :
-  printf "%s\n" "#define HAVE_POLL 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "pthread_jit_write_protect_np" "ac_cv_func_pthread_jit_write_protect_np"
-if test "x$ac_cv_func_pthread_jit_write_protect_np" = xyes
-then :
-  printf "%s\n" "#define HAVE_PTHREAD_JIT_WRITE_PROTECT_NP 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv"
-if test "x$ac_cv_func_putenv" = xyes
-then :
-  printf "%s\n" "#define HAVE_PUTENV 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "scandir" "ac_cv_func_scandir"
-if test "x$ac_cv_func_scandir" = xyes
-then :
-  printf "%s\n" "#define HAVE_SCANDIR 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "setitimer" "ac_cv_func_setitimer"
-if test "x$ac_cv_func_setitimer" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETITIMER 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv"
-if test "x$ac_cv_func_setenv" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETENV 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown"
-if test "x$ac_cv_func_shutdown" = xyes
-then :
-  printf "%s\n" "#define HAVE_SHUTDOWN 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
-if test "x$ac_cv_func_sigprocmask" = xyes
-then :
-  printf "%s\n" "#define HAVE_SIGPROCMASK 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "statfs" "ac_cv_func_statfs"
-if test "x$ac_cv_func_statfs" = xyes
-then :
-  printf "%s\n" "#define HAVE_STATFS 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs"
-if test "x$ac_cv_func_statvfs" = xyes
-then :
-  printf "%s\n" "#define HAVE_STATVFS 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "std_syslog" "ac_cv_func_std_syslog"
-if test "x$ac_cv_func_std_syslog" = xyes
-then :
-  printf "%s\n" "#define HAVE_STD_SYSLOG 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
-if test "x$ac_cv_func_strcasecmp" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
-if test "x$ac_cv_func_strnlen" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "strptime" "ac_cv_func_strptime"
-if test "x$ac_cv_func_strptime" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRPTIME 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "strtok_r" "ac_cv_func_strtok_r"
-if test "x$ac_cv_func_strtok_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRTOK_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "symlink" "ac_cv_func_symlink"
-if test "x$ac_cv_func_symlink" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYMLINK 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "tzset" "ac_cv_func_tzset"
-if test "x$ac_cv_func_tzset" = xyes
-then :
-  printf "%s\n" "#define HAVE_TZSET 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv"
-if test "x$ac_cv_func_unsetenv" = xyes
-then :
-  printf "%s\n" "#define HAVE_UNSETENV 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "usleep" "ac_cv_func_usleep"
-if test "x$ac_cv_func_usleep" = xyes
-then :
-  printf "%s\n" "#define HAVE_USLEEP 1" >>confdefs.h
-
+else
+  ac_cv_ipv6_support=no
 fi
-ac_fn_c_check_func "$LINENO" "utime" "ac_cv_func_utime"
-if test "x$ac_cv_func_utime" = xyes
-then :
-  printf "%s\n" "#define HAVE_UTIME 1" >>confdefs.h
-
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
-if test "x$ac_cv_func_vasprintf" = xyes
-then :
-  printf "%s\n" "#define HAVE_VASPRINTF 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ipv6_support" >&5
+$as_echo "$ac_cv_ipv6_support" >&6; }
 
-fi
-ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf"
-if test "x$ac_cv_func_asprintf" = xyes
-then :
-  printf "%s\n" "#define HAVE_ASPRINTF 1" >>confdefs.h
 
-fi
-ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep"
-if test "x$ac_cv_func_nanosleep" = xyes
-then :
-  printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h
+for ac_func in alphasort \
+asctime_r \
+chroot \
+ctime_r \
+explicit_memset \
+fdatasync \
+flock \
+ftok \
+funopen \
+gai_strerror \
+getcwd \
+getloadavg \
+getlogin \
+getprotobyname \
+getprotobynumber \
+getservbyname \
+getservbyport \
+getrusage \
+gettimeofday \
+gmtime_r \
+getpwnam_r \
+getgrnam_r \
+getpwuid_r \
+getwd \
+glob \
+inet_ntoa \
+inet_ntop \
+inet_pton \
+localtime_r \
+lchown \
+memcntl \
+memmove \
+mkstemp \
+mmap \
+nice \
+nl_langinfo \
+poll \
+pthread_jit_write_protect_np \
+putenv \
+scandir \
+setitimer \
+setenv \
+shutdown \
+sigprocmask \
+statfs \
+statvfs \
+std_syslog \
+strcasecmp \
+strnlen \
+strptime \
+strtok_r \
+symlink \
+tzset \
+unsetenv \
+usleep \
+utime \
+vasprintf \
+asprintf \
+nanosleep \
+memmem \
+memrchr \
 
-fi
-ac_fn_c_check_func "$LINENO" "memmem" "ac_cv_func_memmem"
-if test "x$ac_cv_func_memmem" = xyes
-then :
-  printf "%s\n" "#define HAVE_MEMMEM 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "memrchr" "ac_cv_func_memrchr"
-if test "x$ac_cv_func_memrchr" = xyes
-then :
-  printf "%s\n" "#define HAVE_MEMRCHR 1" >>confdefs.h
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
-ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_strerror_r" = xyes
-then :
+ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default"
+if test "x$ac_cv_have_decl_strerror_r" = xyes; then :
   ac_have_decl=1
-else case e in #(
-  e) ac_have_decl=0 ;;
-esac
+else
+  ac_have_decl=0
 fi
-printf "%s\n" "#define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
-
 
-if test $ac_cv_have_decl_strerror_r = yes; then
-  # For backward compatibility's sake, define HAVE_STRERROR_R.
-  # (We used to run AC_CHECK_FUNCS_ONCE for strerror_r, as well
-  # as AC_CHECK_DECLS_ONCE.)
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRERROR_R $ac_have_decl
+_ACEOF
 
-printf "%s\n" "#define HAVE_STRERROR_R 1" >>confdefs.h
+for ac_func in strerror_r
+do :
+  ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r"
+if test "x$ac_cv_func_strerror_r" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STRERROR_R 1
+_ACEOF
 
 fi
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
+$as_echo_n "checking whether strerror_r returns char *... " >&6; }
+if ${ac_cv_func_strerror_r_char_p+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
-printf %s "checking whether strerror_r returns char *... " >&6; }
-if test ${ac_cv_func_strerror_r_char_p+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
     ac_cv_func_strerror_r_char_p=no
     if test $ac_cv_have_decl_strerror_r = yes; then
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <string.h>
+$ac_includes_default
 int
-main (void)
+main ()
 {
 
 	  char buf100;
@@ -19853,21 +16813,49 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_strerror_r_char_p=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    else
+      # strerror_r is not declared.  Choose between
+      # systems that have relatively inaccessible declarations for the
+      # function.  BeOS and DEC UNIX 4.0 fall in this category, but the
+      # former has a strerror_r that returns char*, while the latter
+      # has a strerror_r that returns `int'.
+      # This test should segfault on the DEC system.
+      if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+	extern char *strerror_r ();
+int
+main ()
+{
+char buf100;
+	  char x = *strerror_r (0, buf, sizeof buf);
+	  return ! isalpha (x);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_strerror_r_char_p=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
-printf "%s\n" "$ac_cv_func_strerror_r_char_p" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
+$as_echo "$ac_cv_func_strerror_r_char_p" >&6; }
 if test $ac_cv_func_strerror_r_char_p = yes; then
 
-printf "%s\n" "#define STRERROR_R_CHAR_P 1" >>confdefs.h
+$as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h
 
 fi
 
@@ -19880,14 +16868,13 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how many arguments gethostbyname_r() takes" >&5
-printf %s "checking how many arguments gethostbyname_r() takes... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how many arguments gethostbyname_r() takes" >&5
+$as_echo_n "checking how many arguments gethostbyname_r() takes... " >&6; }
+
+    if ${ac_cv_func_which_gethostbyname_r+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-    if test ${ac_cv_func_which_gethostbyname_r+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
 
 ################################################################
 
@@ -19906,7 +16893,7 @@
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main (void)
+main ()
 {
 
             char *name = "www.gnu.org";
@@ -19916,11 +16903,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_func_which_gethostbyname_r=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 #
 # SIX ARGUMENTS
@@ -19933,7 +16919,7 @@
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main (void)
+main ()
 {
 
             char *name = "www.gnu.org";
@@ -19947,11 +16933,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_func_which_gethostbyname_r=six
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -19966,7 +16951,7 @@
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main (void)
+main ()
 {
 
             char *name = "www.gnu.org";
@@ -19980,11 +16965,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_func_which_gethostbyname_r=five
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -19999,7 +16983,7 @@
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main (void)
+main ()
 {
 
             char *name = "www.gnu.org";
@@ -20011,61 +16995,59 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_func_which_gethostbyname_r=three
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 ################################################################
 
- ;;
-esac
+
 fi
 
 case "$ac_cv_func_which_gethostbyname_r" in
     three|five|six)
 
-printf "%s\n" "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
+$as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
 
     ;;
 esac
 
 case "$ac_cv_func_which_gethostbyname_r" in
     three)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: three" >&5
-printf "%s\n" "three" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: three" >&5
+$as_echo "three" >&6; }
 
-printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_3 1" >>confdefs.h
+$as_echo "#define HAVE_FUNC_GETHOSTBYNAME_R_3 1" >>confdefs.h
 
     ;;
 
     five)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: five" >&5
-printf "%s\n" "five" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: five" >&5
+$as_echo "five" >&6; }
 
-printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_5 1" >>confdefs.h
+$as_echo "#define HAVE_FUNC_GETHOSTBYNAME_R_5 1" >>confdefs.h
 
     ;;
 
     six)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: six" >&5
-printf "%s\n" "six" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: six" >&5
+$as_echo "six" >&6; }
 
-printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_6 1" >>confdefs.h
+$as_echo "#define HAVE_FUNC_GETHOSTBYNAME_R_6 1" >>confdefs.h
 
     ;;
 
     no)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot find function declaration in netdb.h" >&5
-printf "%s\n" "cannot find function declaration in netdb.h" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot find function declaration in netdb.h" >&5
+$as_echo "cannot find function declaration in netdb.h" >&6; }
     ;;
 
     unknown)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5
-printf "%s\n" "can't tell" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5
+$as_echo "can't tell" >&6; }
     ;;
 
     *)
@@ -20087,140 +17069,118 @@
   unset ac_cv_lib_rt_nanosleep
   unset ac_cv_lib_rt___nanosleep
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5
-printf %s "checking for nanosleep in -lrt... " >&6; }
-if test ${ac_cv_lib_rt_nanosleep+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5
+$as_echo_n "checking for nanosleep in -lrt... " >&6; }
+if ${ac_cv_lib_rt_nanosleep+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char nanosleep (void);
+char nanosleep ();
 int
-main (void)
+main ()
 {
 return nanosleep ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt_nanosleep=yes
-else case e in #(
-  e) ac_cv_lib_rt_nanosleep=no ;;
-esac
+else
+  ac_cv_lib_rt_nanosleep=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_nanosleep" >&5
-printf "%s\n" "$ac_cv_lib_rt_nanosleep" >&6; }
-if test "x$ac_cv_lib_rt_nanosleep" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_nanosleep" >&5
+$as_echo "$ac_cv_lib_rt_nanosleep" >&6; }
+if test "x$ac_cv_lib_rt_nanosleep" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __nanosleep in -lrt" >&5
-printf %s "checking for __nanosleep in -lrt... " >&6; }
-if test ${ac_cv_lib_rt___nanosleep+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __nanosleep in -lrt" >&5
+$as_echo_n "checking for __nanosleep in -lrt... " >&6; }
+if ${ac_cv_lib_rt___nanosleep+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __nanosleep (void);
+char __nanosleep ();
 int
-main (void)
+main ()
 {
 return __nanosleep ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt___nanosleep=yes
-else case e in #(
-  e) ac_cv_lib_rt___nanosleep=no ;;
-esac
+else
+  ac_cv_lib_rt___nanosleep=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___nanosleep" >&5
-printf "%s\n" "$ac_cv_lib_rt___nanosleep" >&6; }
-if test "x$ac_cv_lib_rt___nanosleep" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___nanosleep" >&5
+$as_echo "$ac_cv_lib_rt___nanosleep" >&6; }
+if test "x$ac_cv_lib_rt___nanosleep" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lrt"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -20238,10 +17198,10 @@
 
 
 
-printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h
+$as_echo "#define HAVE_NANOSLEEP 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRT 1" >>confdefs.h
 
     ac_cv_func_nanosleep=yes
   else
@@ -20257,140 +17217,118 @@
   unset ac_cv_lib_network_setsockopt
   unset ac_cv_lib_network___setsockopt
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setsockopt in -lnetwork" >&5
-printf %s "checking for setsockopt in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network_setsockopt+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setsockopt in -lnetwork" >&5
+$as_echo_n "checking for setsockopt in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_setsockopt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char setsockopt (void);
+char setsockopt ();
 int
-main (void)
+main ()
 {
 return setsockopt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network_setsockopt=yes
-else case e in #(
-  e) ac_cv_lib_network_setsockopt=no ;;
-esac
+else
+  ac_cv_lib_network_setsockopt=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_setsockopt" >&5
-printf "%s\n" "$ac_cv_lib_network_setsockopt" >&6; }
-if test "x$ac_cv_lib_network_setsockopt" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_setsockopt" >&5
+$as_echo "$ac_cv_lib_network_setsockopt" >&6; }
+if test "x$ac_cv_lib_network_setsockopt" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __setsockopt in -lnetwork" >&5
-printf %s "checking for __setsockopt in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network___setsockopt+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __setsockopt in -lnetwork" >&5
+$as_echo_n "checking for __setsockopt in -lnetwork... " >&6; }
+if ${ac_cv_lib_network___setsockopt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __setsockopt (void);
+char __setsockopt ();
 int
-main (void)
+main ()
 {
 return __setsockopt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network___setsockopt=yes
-else case e in #(
-  e) ac_cv_lib_network___setsockopt=no ;;
-esac
+else
+  ac_cv_lib_network___setsockopt=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___setsockopt" >&5
-printf "%s\n" "$ac_cv_lib_network___setsockopt" >&6; }
-if test "x$ac_cv_lib_network___setsockopt" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___setsockopt" >&5
+$as_echo "$ac_cv_lib_network___setsockopt" >&6; }
+if test "x$ac_cv_lib_network___setsockopt" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -20408,10 +17346,10 @@
 
 
 
-printf "%s\n" "#define HAVE_SETSOCKOPT 1" >>confdefs.h
+$as_echo "#define HAVE_SETSOCKOPT 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_setsockopt=yes
   else
@@ -20422,27 +17360,24 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
-printf %s "checking for getaddrinfo... " >&6; }
-if test ${ac_cv_func_getaddrinfo+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
+$as_echo_n "checking for getaddrinfo... " >&6; }
+if ${ac_cv_func_getaddrinfo+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main (void)
+main ()
 {
 struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  if test "$cross_compiling" = yes
-then :
+if ac_fn_c_try_link "$LINENO"; then :
+  if test "$cross_compiling" = yes; then :
 
         case $host_alias in
       *linux*)
@@ -20453,8 +17388,8 @@
         ;;
     esac
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -20497,45 +17432,38 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_getaddrinfo=yes
-else case e in #(
-  e) ac_cv_func_getaddrinfo=no ;;
-esac
+else
+  ac_cv_func_getaddrinfo=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-else case e in #(
-  e) ac_cv_func_getaddrinfo=no ;;
-esac
+else
+  ac_cv_func_getaddrinfo=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getaddrinfo" >&5
-printf "%s\n" "$ac_cv_func_getaddrinfo" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getaddrinfo" >&5
+$as_echo "$ac_cv_func_getaddrinfo" >&6; }
 if test "$ac_cv_func_getaddrinfo" = yes; then
 
-printf "%s\n" "#define HAVE_GETADDRINFO 1" >>confdefs.h
+$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for copy_file_range" >&5
-printf %s "checking for copy_file_range... " >&6; }
-if test ${ac_cv_copy_file_range+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test "$cross_compiling" = yes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for copy_file_range" >&5
+$as_echo_n "checking for copy_file_range... " >&6; }
+if ${ac_cv_copy_file_range+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
   ac_cv_copy_file_range=no
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef __linux__
@@ -20558,100 +17486,91 @@
 #endif
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_copy_file_range=yes
-else case e in #(
-  e) ac_cv_copy_file_range=no ;;
-esac
+else
+  ac_cv_copy_file_range=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_copy_file_range" >&5
-printf "%s\n" "$ac_cv_copy_file_range" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_copy_file_range" >&5
+$as_echo "$ac_cv_copy_file_range" >&6; }
 
 if test "$ac_cv_copy_file_range" = yes; then
 
-printf "%s\n" "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
+$as_echo "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
 
 fi
 
 ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat"
-if test "x$ac_cv_func_strlcat" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRLCAT 1" >>confdefs.h
+if test "x$ac_cv_func_strlcat" = xyes; then :
+  $as_echo "#define HAVE_STRLCAT 1" >>confdefs.h
 
-else case e in #(
-  e) case " $LIBOBJS " in
+else
+  case " $LIBOBJS " in
   *" strlcat.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS strlcat.$ac_objext"
  ;;
 esac
- ;;
-esac
+
 fi
+
 ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
-if test "x$ac_cv_func_strlcpy" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h
+if test "x$ac_cv_func_strlcpy" = xyes; then :
+  $as_echo "#define HAVE_STRLCPY 1" >>confdefs.h
 
-else case e in #(
-  e) case " $LIBOBJS " in
+else
+  case " $LIBOBJS " in
   *" strlcpy.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS strlcpy.$ac_objext"
  ;;
 esac
- ;;
-esac
+
 fi
+
 ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero"
-if test "x$ac_cv_func_explicit_bzero" = xyes
-then :
-  printf "%s\n" "#define HAVE_EXPLICIT_BZERO 1" >>confdefs.h
+if test "x$ac_cv_func_explicit_bzero" = xyes; then :
+  $as_echo "#define HAVE_EXPLICIT_BZERO 1" >>confdefs.h
 
-else case e in #(
-  e) case " $LIBOBJS " in
+else
+  case " $LIBOBJS " in
   *" explicit_bzero.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS explicit_bzero.$ac_objext"
  ;;
 esac
- ;;
-esac
+
 fi
+
 ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt"
-if test "x$ac_cv_func_getopt" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETOPT 1" >>confdefs.h
+if test "x$ac_cv_func_getopt" = xyes; then :
+  $as_echo "#define HAVE_GETOPT 1" >>confdefs.h
 
-else case e in #(
-  e) case " $LIBOBJS " in
+else
+  case " $LIBOBJS " in
   *" getopt.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS getopt.$ac_objext"
  ;;
 esac
- ;;
-esac
+
 fi
 
+
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-printf %s "checking for working alloca.h... " >&6; }
-if test ${ac_cv_working_alloca_h+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if ${ac_cv_working_alloca_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
-main (void)
+main ()
 {
 char *p = (char *) alloca (2 * sizeof (int));
 			  if (p) return 0;
@@ -20659,54 +17578,52 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_working_alloca_h=yes
-else case e in #(
-  e) ac_cv_working_alloca_h=no ;;
-esac
+else
+  ac_cv_working_alloca_h=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-printf "%s\n" "$ac_cv_working_alloca_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
-printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-printf %s "checking for alloca... " >&6; }
-if test ${ac_cv_func_alloca_works+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_func_alloca_works=$ac_cv_working_alloca_h
-if test "$ac_cv_func_alloca_works" != yes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if ${ac_cv_func_alloca_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdlib.h>
-#include <stddef.h>
-#ifndef alloca
-# ifdef __GNUC__
-#  define alloca __builtin_alloca
-# elif defined _MSC_VER
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
 #  include <malloc.h>
 #  define alloca _alloca
 # else
-#  ifdef  __cplusplus
-extern "C"
-#  endif
+#  ifdef HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
 void *alloca (size_t);
+#    endif
+#   endif
+#  endif
 # endif
 #endif
 
 int
-main (void)
+main ()
 {
 char *p = (char *) alloca (1);
 				    if (p) return 0;
@@ -20714,21 +17631,20 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_alloca_works=yes
+else
+  ac_cv_func_alloca_works=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-fi ;;
-esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-printf "%s\n" "$ac_cv_func_alloca_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
-printf "%s\n" "#define HAVE_ALLOCA 1" >>confdefs.h
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -20738,20 +17654,59 @@
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-printf "%s\n" "#define C_ALLOCA 1" >>confdefs.h
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if ${ac_cv_os_cray+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "webecray" >/dev/null 2>&1; then :
+  ac_cv_os_cray=yes
+else
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
+if test $ac_cv_os_cray = yes; then
+  for ac_func in _getb67 GETB67 getb67; do
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
 
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-printf %s "checking stack direction for C alloca... " >&6; }
-if test ${ac_cv_c_stack_direction+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test "$cross_compiling" = yes
-then :
+    break
+fi
+
+  done
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if ${ac_cv_c_stack_direction+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
   ac_cv_c_stack_direction=0
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -20771,42 +17726,38 @@
   return find_stack_direction (0, argc + !argv + 20) < 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_stack_direction=1
-else case e in #(
-  e) ac_cv_c_stack_direction=-1 ;;
-esac
+else
+  ac_cv_c_stack_direction=-1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-printf "%s\n" "$ac_cv_c_stack_direction" >&6; }
-printf "%s\n" "#define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
+cat >>confdefs.h <<_ACEOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+_ACEOF
 
 
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for type of reentrant time-related functions" >&5
-printf %s "checking for type of reentrant time-related functions... " >&6; }
-if test ${ac_cv_time_r_type+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-if test "$cross_compiling" = yes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of reentrant time-related functions" >&5
+$as_echo_n "checking for type of reentrant time-related functions... " >&6; }
+if ${ac_cv_time_r_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+if test "$cross_compiling" = yes; then :
 
   ac_cv_time_r_type=POSIX
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <time.h>
@@ -20824,20 +17775,18 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_time_r_type=hpux
 
-else case e in #(
-  e)
-  if test "$cross_compiling" = yes
-then :
+else
+
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_time_r_type=POSIX
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <time.h>
@@ -20853,52 +17802,45 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_time_r_type=irix
 
-else case e in #(
-  e)
+else
+
     ac_cv_time_r_type=POSIX
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
- ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_time_r_type" >&5
-printf "%s\n" "$ac_cv_time_r_type" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_time_r_type" >&5
+$as_echo "$ac_cv_time_r_type" >&6; }
   case $ac_cv_time_r_type in
   hpux)
-printf "%s\n" "#define PHP_HPUX_TIME_R 1" >>confdefs.h
+$as_echo "#define PHP_HPUX_TIME_R 1" >>confdefs.h
  ;;
   irix)
-printf "%s\n" "#define PHP_IRIX_TIME_R 1" >>confdefs.h
+$as_echo "#define PHP_IRIX_TIME_R 1" >>confdefs.h
  ;;
   esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for in_addr_t" >&5
-printf %s "checking for in_addr_t... " >&6; }
-if test ${ac_cv_type_in_addr_t+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for in_addr_t" >&5
+$as_echo_n "checking for in_addr_t... " >&6; }
+if ${ac_cv_type_in_addr_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <stdlib.h>
@@ -20908,70 +17850,73 @@
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "in_addr_t^a-zA-Z_0-9" >/dev/null 2>&1
-then :
+  $EGREP "in_addr_t^a-zA-Z_0-9" >/dev/null 2>&1; then :
   ac_cv_type_in_addr_t=yes
-else case e in #(
-  e) ac_cv_type_in_addr_t=no ;;
-esac
+else
+  ac_cv_type_in_addr_t=no
 fi
-rm -rf conftest*
- ;;
-esac
+rm -f conftest*
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_in_addr_t" >&5
-printf "%s\n" "$ac_cv_type_in_addr_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_in_addr_t" >&5
+$as_echo "$ac_cv_type_in_addr_t" >&6; }
 if test $ac_cv_type_in_addr_t = no; then
 
-printf "%s\n" "#define in_addr_t u_int" >>confdefs.h
+$as_echo "#define in_addr_t u_int" >>confdefs.h
 
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for aarch64 CRC32 API" >&5
-printf %s "checking for aarch64 CRC32 API... " >&6; }
-if test ${ac_cv_func___crc32d+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for aarch64 CRC32 API" >&5
+$as_echo_n "checking for aarch64 CRC32 API... " >&6; }
+if ${ac_cv_func___crc32d+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <arm_acle.h>
+# if defined(__GNUC__)
+#  if!defined(__clang__)
+#   pragma GCC push_options
+#   pragma GCC target ("+nothing+crc")
+#  elif defined(__APPLE__)
+#   pragma clang attribute push(__attribute__((target("crc"))), apply_to=function)
+#  else
+#   pragma clang attribute push(__attribute__((target("+nothing+crc"))), apply_to=function)
+#  endif
+# endif
+
 int
-main (void)
+main ()
 {
 __crc32d(0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func___crc32d=yes
-else case e in #(
-  e) ac_cv_func___crc32d="no" ;;
-esac
+else
+  ac_cv_func___crc32d=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func___crc32d" >&5
-printf "%s\n" "$ac_cv_func___crc32d" >&6; }
-if test "$ac_cv_func___crc32d" = "yes"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func___crc32d" >&5
+$as_echo "$ac_cv_func___crc32d" >&6; }
+if test "x$ac_cv_func___crc32d" = xyes; then :
 
-printf "%s\n" "#define HAVE_AARCH64_CRC32 1" >>confdefs.h
+$as_echo "#define HAVE_AARCH64_CRC32 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for asm goto" >&5
-printf %s "checking for asm goto... " >&6; }
-if test ${ac_cv__asm_goto+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test "$cross_compiling" = yes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for asm goto" >&5
+$as_echo_n "checking for asm goto... " >&6; }
+if ${ac_cv__asm_goto+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -20987,17 +17932,15 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv__asm_goto=yes
-else case e in #(
-  e) ac_cv__asm_goto=no ;;
-esac
+else
+  ac_cv__asm_goto=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int main(void) {
@@ -21011,51 +17954,45 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv__asm_goto=yes
-else case e in #(
-  e) ac_cv__asm_goto=no ;;
-esac
+else
+  ac_cv__asm_goto=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv__asm_goto" >&5
-printf "%s\n" "$ac_cv__asm_goto" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv__asm_goto" >&5
+$as_echo "$ac_cv__asm_goto" >&6; }
 
 if test "$ac_cv__asm_goto" = yes; then
 
-printf "%s\n" "#define HAVE_ASM_GOTO 1" >>confdefs.h
+$as_echo "#define HAVE_ASM_GOTO 1" >>confdefs.h
 
 fi
 
 
 php_with_valgrind=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable valgrind support" >&5
-printf %s "checking whether to enable valgrind support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable valgrind support" >&5
+$as_echo_n "checking whether to enable valgrind support... " >&6; }
 
 # Check whether --with-valgrind was given.
-if test ${with_valgrind+y}
-then :
+if test "${with_valgrind+set}" = set; then :
   withval=$with_valgrind; PHP_VALGRIND=$withval
-else case e in #(
-  e)
+else
+
   PHP_VALGRIND=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_VALGRIND
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -21063,17 +18000,17 @@
 if test "$PHP_VALGRIND" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for valgrind" >&5
-printf %s "checking for valgrind... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for valgrind" >&5
+$as_echo_n "checking for valgrind... " >&6; }
 
 if test -n "$VALGRIND_CFLAGS"; then
     pkg_cv_VALGRIND_CFLAGS="$VALGRIND_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5
   ($PKG_CONFIG --exists --print-errors "valgrind") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_VALGRIND_CFLAGS=`$PKG_CONFIG --cflags "valgrind" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -21087,10 +18024,10 @@
     pkg_cv_VALGRIND_LIBS="$VALGRIND_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5
   ($PKG_CONFIG --exists --print-errors "valgrind") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_VALGRIND_LIBS=`$PKG_CONFIG --libs "valgrind" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -21104,8 +18041,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -21122,14 +18059,14 @@
 
 	have_valgrind="no"
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	have_valgrind="no"
 else
 	VALGRIND_CFLAGS=$pkg_cv_VALGRIND_CFLAGS
 	VALGRIND_LIBS=$pkg_cv_VALGRIND_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	have_valgrind="yes"
 fi
 
@@ -21175,7 +18112,7 @@
   done
 
 
-printf "%s\n" "#define HAVE_VALGRIND 1" >>confdefs.h
+$as_echo "#define HAVE_VALGRIND 1" >>confdefs.h
 
   else
     if test "$with_valgrind" = "yes"; then
@@ -21190,27 +18127,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty"
-if test "x$ac_cv_func_openpty" = xyes
-then :
+if test "x$ac_cv_func_openpty" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__openpty" "ac_cv_func___openpty"
-if test "x$ac_cv_func___openpty" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__openpty" "ac_cv_func___openpty"
+if test "x$ac_cv_func___openpty" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h
+$as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
 
     ac_cv_func_openpty=yes
   ;;
@@ -21220,140 +18153,118 @@
   unset ac_cv_lib_util_openpty
   unset ac_cv_lib_util___openpty
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
-printf %s "checking for openpty in -lutil... " >&6; }
-if test ${ac_cv_lib_util_openpty+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
+$as_echo_n "checking for openpty in -lutil... " >&6; }
+if ${ac_cv_lib_util_openpty+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char openpty (void);
+char openpty ();
 int
-main (void)
+main ()
 {
 return openpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_util_openpty=yes
-else case e in #(
-  e) ac_cv_lib_util_openpty=no ;;
-esac
+else
+  ac_cv_lib_util_openpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
-printf "%s\n" "$ac_cv_lib_util_openpty" >&6; }
-if test "x$ac_cv_lib_util_openpty" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
+$as_echo "$ac_cv_lib_util_openpty" >&6; }
+if test "x$ac_cv_lib_util_openpty" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __openpty in -lutil" >&5
-printf %s "checking for __openpty in -lutil... " >&6; }
-if test ${ac_cv_lib_util___openpty+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __openpty in -lutil" >&5
+$as_echo_n "checking for __openpty in -lutil... " >&6; }
+if ${ac_cv_lib_util___openpty+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __openpty (void);
+char __openpty ();
 int
-main (void)
+main ()
 {
 return __openpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_util___openpty=yes
-else case e in #(
-  e) ac_cv_lib_util___openpty=no ;;
-esac
+else
+  ac_cv_lib_util___openpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util___openpty" >&5
-printf "%s\n" "$ac_cv_lib_util___openpty" >&6; }
-if test "x$ac_cv_lib_util___openpty" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util___openpty" >&5
+$as_echo "$ac_cv_lib_util___openpty" >&6; }
+if test "x$ac_cv_lib_util___openpty" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lutil"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -21371,10 +18282,10 @@
 
 
 
-printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h
+$as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBUTIL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBUTIL 1" >>confdefs.h
 
     ac_cv_func_openpty=yes
   else
@@ -21383,140 +18294,118 @@
   unset ac_cv_lib_bsd_openpty
   unset ac_cv_lib_bsd___openpty
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openpty in -lbsd" >&5
-printf %s "checking for openpty in -lbsd... " >&6; }
-if test ${ac_cv_lib_bsd_openpty+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lbsd" >&5
+$as_echo_n "checking for openpty in -lbsd... " >&6; }
+if ${ac_cv_lib_bsd_openpty+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char openpty (void);
+char openpty ();
 int
-main (void)
+main ()
 {
 return openpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bsd_openpty=yes
-else case e in #(
-  e) ac_cv_lib_bsd_openpty=no ;;
-esac
+else
+  ac_cv_lib_bsd_openpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_openpty" >&5
-printf "%s\n" "$ac_cv_lib_bsd_openpty" >&6; }
-if test "x$ac_cv_lib_bsd_openpty" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_openpty" >&5
+$as_echo "$ac_cv_lib_bsd_openpty" >&6; }
+if test "x$ac_cv_lib_bsd_openpty" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __openpty in -lbsd" >&5
-printf %s "checking for __openpty in -lbsd... " >&6; }
-if test ${ac_cv_lib_bsd___openpty+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __openpty in -lbsd" >&5
+$as_echo_n "checking for __openpty in -lbsd... " >&6; }
+if ${ac_cv_lib_bsd___openpty+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __openpty (void);
+char __openpty ();
 int
-main (void)
+main ()
 {
 return __openpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bsd___openpty=yes
-else case e in #(
-  e) ac_cv_lib_bsd___openpty=no ;;
-esac
+else
+  ac_cv_lib_bsd___openpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd___openpty" >&5
-printf "%s\n" "$ac_cv_lib_bsd___openpty" >&6; }
-if test "x$ac_cv_lib_bsd___openpty" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd___openpty" >&5
+$as_echo "$ac_cv_lib_bsd___openpty" >&6; }
+if test "x$ac_cv_lib_bsd___openpty" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbsd"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -21534,10 +18423,10 @@
 
 
 
-printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h
+$as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBSD 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBSD 1" >>confdefs.h
 
     ac_cv_func_openpty=yes
   else
@@ -21555,16 +18444,15 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}General settings${T_ME}" >&5
-printf "%s\n" "${T_MD}General settings${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}General settings${T_ME}" >&5
+$as_echo "${T_MD}General settings${T_ME}" >&6; }
 
 
 
 # Check whether --enable- was given.
-if test ${enable_+y}
-then :
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
@@ -21573,24 +18461,22 @@
 
 php_enable_gcov=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to include gcov symbols" >&5
-printf %s "checking whether to include gcov symbols... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include gcov symbols" >&5
+$as_echo_n "checking whether to include gcov symbols... " >&6; }
 # Check whether --enable-gcov was given.
-if test ${enable_gcov+y}
-then :
+if test "${enable_gcov+set}" = set; then :
   enableval=$enable_gcov; PHP_GCOV=$enableval
-else case e in #(
-  e)
+else
+
   PHP_GCOV=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_GCOV
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -21611,7 +18497,7 @@
   fi
 
 
-printf "%s\n" "#define HAVE_GCOV 1" >>confdefs.h
+$as_echo "#define HAVE_GCOV 1" >>confdefs.h
 
 
   src=$abs_srcdir/build/Makefile.gcov
@@ -21621,8 +18507,9 @@
 
 
 
-  CFLAGS=`echo "$CFLAGS" | "$SED" -e 's/-O0-9s*//g'`
-  CXXFLAGS=`echo "$CXXFLAGS" | "$SED" -e 's/-O0-9s*//g'`
+  sed_script='s/$\t \|^$-O$0-9gsz\|fast\|$$\t \|$$/\1/g'
+  CFLAGS=$(echo "$CFLAGS" | $SED -e "$sed_script")
+  CXXFLAGS=$(echo "$CXXFLAGS" | $SED -e "$sed_script")
 
 
     CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
@@ -21632,24 +18519,22 @@
 
 php_enable_debug=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to include debugging symbols" >&5
-printf %s "checking whether to include debugging symbols... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include debugging symbols" >&5
+$as_echo_n "checking whether to include debugging symbols... " >&6; }
 # Check whether --enable-debug was given.
-if test ${enable_debug+y}
-then :
+if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug; PHP_DEBUG=$enableval
-else case e in #(
-  e)
+else
+
   PHP_DEBUG=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_DEBUG
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -21658,8 +18543,9 @@
   PHP_DEBUG=1
   ZEND_DEBUG=yes
 
-  CFLAGS=`echo "$CFLAGS" | "$SED" -e 's/-O0-9s*//g'`
-  CXXFLAGS=`echo "$CXXFLAGS" | "$SED" -e 's/-O0-9s*//g'`
+  sed_script='s/$\t \|^$-O$0-9gsz\|fast\|$$\t \|$$/\1/g'
+  CFLAGS=$(echo "$CFLAGS" | $SED -e "$sed_script")
+  CXXFLAGS=$(echo "$CXXFLAGS" | $SED -e "$sed_script")
 
     if test "$GCC" = "yes" || test "$ICC" = "yes"; then
     CFLAGS="$CFLAGS -O0"
@@ -21682,24 +18568,22 @@
 
 php_enable_debug_assertions=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable debug assertions in release mode" >&5
-printf %s "checking whether to enable debug assertions in release mode... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable debug assertions in release mode" >&5
+$as_echo_n "checking whether to enable debug assertions in release mode... " >&6; }
 # Check whether --enable-debug-assertions was given.
-if test ${enable_debug_assertions+y}
-then :
+if test "${enable_debug_assertions+set}" = set; then :
   enableval=$enable_debug_assertions; PHP_DEBUG_ASSERTIONS=$enableval
-else case e in #(
-  e)
+else
+
   PHP_DEBUG_ASSERTIONS=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_DEBUG_ASSERTIONS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -21710,18 +18594,16 @@
 fi
 
 # Check whether --enable-zts was given.
-if test ${enable_zts+y}
-then :
+if test "${enable_zts+set}" = set; then :
   enableval=$enable_zts; ZEND_ZTS=$enableval
-else case e in #(
-  e) ZEND_ZTS=no ;;
-esac
+else
+  ZEND_ZTS=no
 fi
 
 
 if test "$ZEND_ZTS" = "yes"; then
 
-printf "%s\n" "#define ZTS 1" >>confdefs.h
+$as_echo "#define ZTS 1" >>confdefs.h
 
   PHP_THREAD_SAFETY=yes
 else
@@ -21731,56 +18613,52 @@
 
 php_enable_rtld_now=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY" >&5
-printf %s "checking whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY" >&5
+$as_echo_n "checking whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY... " >&6; }
 # Check whether --enable-rtld-now was given.
-if test ${enable_rtld_now+y}
-then :
+if test "${enable_rtld_now+set}" = set; then :
   enableval=$enable_rtld_now; PHP_RTLD_NOW=$enableval
-else case e in #(
-  e)
+else
+
   PHP_RTLD_NOW=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_RTLD_NOW
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_RTLD_NOW" = "yes"; then
 
-printf "%s\n" "#define PHP_USE_RTLD_NOW 1" >>confdefs.h
+$as_echo "#define PHP_USE_RTLD_NOW 1" >>confdefs.h
 
 fi
 
 
 php_with_layout=PHP
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking layout of installed files" >&5
-printf %s "checking layout of installed files... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking layout of installed files" >&5
+$as_echo_n "checking layout of installed files... " >&6; }
 
 # Check whether --with-layout was given.
-if test ${with_layout+y}
-then :
+if test "${with_layout+set}" = set; then :
   withval=$with_layout; PHP_LAYOUT=$withval
-else case e in #(
-  e)
+else
+
   PHP_LAYOUT=PHP
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_LAYOUT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -21797,25 +18675,23 @@
 
 php_with_config_file_path=DEFAULT
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking path to configuration file" >&5
-printf %s "checking path to configuration file... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking path to configuration file" >&5
+$as_echo_n "checking path to configuration file... " >&6; }
 
 # Check whether --with-config-file-path was given.
-if test ${with_config_file_path+y}
-then :
+if test "${with_config_file_path+set}" = set; then :
   withval=$with_config_file_path; PHP_CONFIG_FILE_PATH=$withval
-else case e in #(
-  e)
+else
+
   PHP_CONFIG_FILE_PATH=DEFAULT
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_CONFIG_FILE_PATH
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -21831,23 +18707,21 @@
   esac
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to scan for configuration files" >&5
-printf %s "checking where to scan for configuration files... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to scan for configuration files" >&5
+$as_echo_n "checking where to scan for configuration files... " >&6; }
 
 php_with_config_file_scan_dir=DEFAULT
 
 
 
 # Check whether --with-config-file-scan-dir was given.
-if test ${with_config_file_scan_dir+y}
-then :
+if test "${with_config_file_scan_dir+set}" = set; then :
   withval=$with_config_file_scan_dir; PHP_CONFIG_FILE_SCAN_DIR=$withval
-else case e in #(
-  e)
+else
+
   PHP_CONFIG_FILE_SCAN_DIR=DEFAULT
 
- ;;
-esac
+
 fi
 
 
@@ -21860,67 +18734,63 @@
 if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then
   PHP_CONFIG_FILE_SCAN_DIR=
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_CONFIG_FILE_SCAN_DIR" >&5
-printf "%s\n" "$PHP_CONFIG_FILE_SCAN_DIR" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_CONFIG_FILE_SCAN_DIR" >&5
+$as_echo "$PHP_CONFIG_FILE_SCAN_DIR" >&6; }
 
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 
 
 php_enable_sigchild=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP's own SIGCHLD handler" >&5
-printf %s "checking whether to enable PHP's own SIGCHLD handler... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP's own SIGCHLD handler" >&5
+$as_echo_n "checking whether to enable PHP's own SIGCHLD handler... " >&6; }
 # Check whether --enable-sigchild was given.
-if test ${enable_sigchild+y}
-then :
+if test "${enable_sigchild+set}" = set; then :
   enableval=$enable_sigchild; PHP_SIGCHILD=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SIGCHILD=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_SIGCHILD
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SIGCHILD" = "yes"; then
 
-printf "%s\n" "#define PHP_SIGCHILD 1" >>confdefs.h
+$as_echo "#define PHP_SIGCHILD 1" >>confdefs.h
 
 else
 
-printf "%s\n" "#define PHP_SIGCHILD 0" >>confdefs.h
+$as_echo "#define PHP_SIGCHILD 0" >>confdefs.h
 
 fi
 
 
 php_enable_libgcc=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to explicitly link against libgcc" >&5
-printf %s "checking whether to explicitly link against libgcc... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to explicitly link against libgcc" >&5
+$as_echo_n "checking whether to explicitly link against libgcc... " >&6; }
 # Check whether --enable-libgcc was given.
-if test ${enable_libgcc+y}
-then :
+if test "${enable_libgcc+set}" = set; then :
   enableval=$enable_libgcc; PHP_LIBGCC=$enableval
-else case e in #(
-  e)
+else
+
   PHP_LIBGCC=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_LIBGCC
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -21982,109 +18852,97 @@
 
 php_enable_short_tags=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable short tags by default" >&5
-printf %s "checking whether to enable short tags by default... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable short tags by default" >&5
+$as_echo_n "checking whether to enable short tags by default... " >&6; }
 # Check whether --enable-short-tags was given.
-if test ${enable_short_tags+y}
-then :
+if test "${enable_short_tags+set}" = set; then :
   enableval=$enable_short_tags; PHP_SHORT_TAGS=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SHORT_TAGS=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_SHORT_TAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SHORT_TAGS" = "yes"; then
 
-printf "%s\n" "#define DEFAULT_SHORT_OPEN_TAG \"1\"" >>confdefs.h
+$as_echo "#define DEFAULT_SHORT_OPEN_TAG \"1\"" >>confdefs.h
 
 else
 
-printf "%s\n" "#define DEFAULT_SHORT_OPEN_TAG \"0\"" >>confdefs.h
+$as_echo "#define DEFAULT_SHORT_OPEN_TAG \"0\"" >>confdefs.h
 
 fi
 
 
 php_enable_dmalloc=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable dmalloc" >&5
-printf %s "checking whether to enable dmalloc... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dmalloc" >&5
+$as_echo_n "checking whether to enable dmalloc... " >&6; }
 # Check whether --enable-dmalloc was given.
-if test ${enable_dmalloc+y}
-then :
+if test "${enable_dmalloc+set}" = set; then :
   enableval=$enable_dmalloc; PHP_DMALLOC=$enableval
-else case e in #(
-  e)
+else
+
   PHP_DMALLOC=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_DMALLOC
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_DMALLOC" = "yes"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dmalloc_error in -ldmalloc" >&5
-printf %s "checking for dmalloc_error in -ldmalloc... " >&6; }
-if test ${ac_cv_lib_dmalloc_dmalloc_error+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dmalloc_error in -ldmalloc" >&5
+$as_echo_n "checking for dmalloc_error in -ldmalloc... " >&6; }
+if ${ac_cv_lib_dmalloc_dmalloc_error+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dmalloc_error (void);
+char dmalloc_error ();
 int
-main (void)
+main ()
 {
 return dmalloc_error ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dmalloc_dmalloc_error=yes
-else case e in #(
-  e) ac_cv_lib_dmalloc_dmalloc_error=no ;;
-esac
+else
+  ac_cv_lib_dmalloc_dmalloc_error=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_dmalloc_error" >&5
-printf "%s\n" "$ac_cv_lib_dmalloc_dmalloc_error" >&6; }
-if test "x$ac_cv_lib_dmalloc_dmalloc_error" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_dmalloc_error" >&5
+$as_echo "$ac_cv_lib_dmalloc_dmalloc_error" >&6; }
+if test "x$ac_cv_lib_dmalloc_dmalloc_error" = xyes; then :
 
 
 
@@ -22097,15 +18955,14 @@
 
 
 
-printf "%s\n" "#define HAVE_DMALLOC 1" >>confdefs.h
+$as_echo "#define HAVE_DMALLOC 1" >>confdefs.h
 
     CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK"
 
-else case e in #(
-  e)
+else
+
     as_fn_error $? "Problem with enabling dmalloc. Please check config.log for details." "$LINENO" 5
-   ;;
-esac
+
 fi
 
 fi
@@ -22113,66 +18970,63 @@
 
 php_enable_ipv6=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable IPv6 support" >&5
-printf %s "checking whether to enable IPv6 support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable IPv6 support" >&5
+$as_echo_n "checking whether to enable IPv6 support... " >&6; }
 # Check whether --enable-ipv6 was given.
-if test ${enable_ipv6+y}
-then :
+if test "${enable_ipv6+set}" = set; then :
   enableval=$enable_ipv6; PHP_IPV6=$enableval
-else case e in #(
-  e)
+else
+
   PHP_IPV6=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_IPV6
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_IPV6" != "no" && test "$ac_cv_ipv6_support" = yes; then
 
-printf "%s\n" "#define HAVE_IPV6 1" >>confdefs.h
+$as_echo "#define HAVE_IPV6 1" >>confdefs.h
 
 fi
 
 
 php_enable_dtrace=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable DTrace support" >&5
-printf %s "checking whether to enable DTrace support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DTrace support" >&5
+$as_echo_n "checking whether to enable DTrace support... " >&6; }
 # Check whether --enable-dtrace was given.
-if test ${enable_dtrace+y}
-then :
+if test "${enable_dtrace+set}" = set; then :
   enableval=$enable_dtrace; PHP_DTRACE=$enableval
-else case e in #(
-  e)
+else
+
   PHP_DTRACE=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_DTRACE
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_DTRACE" = "yes"; then
-         for ac_header in sys/sdt.h
+  for ac_header in sys/sdt.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sdt_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_SDT_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sdt_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_SDT_H 1
+_ACEOF
 
 
   case "" in
@@ -22274,38 +19128,36 @@
   esac
 
 
-printf "%s\n" "#define HAVE_DTRACE 1" >>confdefs.h
+$as_echo "#define HAVE_DTRACE 1" >>confdefs.h
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_DTRACE_OBJS"
 
 
-else case e in #(
-  e)
+else
+
     as_fn_error $? "Cannot find sys/sdt.h which is required for DTrace support" "$LINENO" 5
-   ;;
-esac
+
 fi
 
 done
+
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how big to make fd sets" >&5
-printf %s "checking how big to make fd sets... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how big to make fd sets" >&5
+$as_echo_n "checking how big to make fd sets... " >&6; }
 
 php_enable_fd_setsize=no
 
 
 # Check whether --enable-fd-setsize was given.
-if test ${enable_fd_setsize+y}
-then :
+if test "${enable_fd_setsize+set}" = set; then :
   enableval=$enable_fd_setsize; PHP_FD_SETSIZE=$enableval
-else case e in #(
-  e)
+else
+
   PHP_FD_SETSIZE=no
 
- ;;
-esac
+
 fi
 
 
@@ -22318,14 +19170,14 @@
 if test "$PHP_FD_SETSIZE" != "no"; then
   if test "0$PHP_FD_SETSIZE" -gt 0 2>/dev/null; then
     CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=$PHP_FD_SETSIZE"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using $PHP_FD_SETSIZE" >&5
-printf "%s\n" "using $PHP_FD_SETSIZE" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $PHP_FD_SETSIZE" >&5
+$as_echo "using $PHP_FD_SETSIZE" >&6; }
   else
     as_fn_error $? "Invalid value passed to --enable-fd-setsize!" "$LINENO" 5
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using system default" >&5
-printf "%s\n" "using system default" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: using system default" >&5
+$as_echo "using system default" >&6; }
 fi
 
 
@@ -22333,15 +19185,13 @@
 
 
 # Check whether --enable-werror was given.
-if test ${enable_werror+y}
-then :
+if test "${enable_werror+set}" = set; then :
   enableval=$enable_werror; PHP_WERROR=$enableval
-else case e in #(
-  e)
+else
+
   PHP_WERROR=no
 
- ;;
-esac
+
 fi
 
 
@@ -22355,15 +19205,13 @@
 
 
 # Check whether --enable-memory-sanitizer was given.
-if test ${enable_memory_sanitizer+y}
-then :
+if test "${enable_memory_sanitizer+set}" = set; then :
   enableval=$enable_memory_sanitizer; PHP_MEMORY_SANITIZER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_MEMORY_SANITIZER=no
 
- ;;
-esac
+
 fi
 
 
@@ -22377,15 +19225,13 @@
 
 
 # Check whether --enable-address-sanitizer was given.
-if test ${enable_address_sanitizer+y}
-then :
+if test "${enable_address_sanitizer+set}" = set; then :
   enableval=$enable_address_sanitizer; PHP_ADDRESS_SANITIZER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_ADDRESS_SANITIZER=no
 
- ;;
-esac
+
 fi
 
 
@@ -22399,15 +19245,13 @@
 
 
 # Check whether --enable-undefined-sanitizer was given.
-if test ${enable_undefined_sanitizer+y}
-then :
+if test "${enable_undefined_sanitizer+set}" = set; then :
   enableval=$enable_undefined_sanitizer; PHP_UNDEFINED_SANITIZER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_UNDEFINED_SANITIZER=no
 
- ;;
-esac
+
 fi
 
 
@@ -22420,23 +19264,21 @@
 
 
 # Check whether --enable- was given.
-if test ${enable_+y}
-then :
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring extensions${T_ME}" >&5
-printf "%s\n" "${T_MD}Configuring extensions${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring extensions${T_ME}" >&5
+$as_echo "${T_MD}Configuring extensions${T_ME}" >&6; }
 
 
 # Check whether --enable-all was given.
-if test ${enable_all+y}
-then :
+if test "${enable_all+set}" = set; then :
   enableval=$enable_all; PHP_ENABLE_ALL=$enableval
 fi
 
@@ -22444,67 +19286,65 @@
 
 
 
-ac_fn_c_check_header_compile "$LINENO" "io.h" "ac_cv_header_io_h" "$ac_includes_default"
-if test "x$ac_cv_header_io_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_IO_H 1" >>confdefs.h
+for ac_header in io.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "io.h" "ac_cv_header_io_h" "$ac_includes_default"
+if test "x$ac_cv_header_io_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_IO_H 1
+_ACEOF
 
 fi
 
+done
 
-ac_fn_c_check_func "$LINENO" "strtoll" "ac_cv_func_strtoll"
-if test "x$ac_cv_func_strtoll" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRTOLL 1" >>confdefs.h
 
-fi
-ac_fn_c_check_func "$LINENO" "atoll" "ac_cv_func_atoll"
-if test "x$ac_cv_func_atoll" = xyes
-then :
-  printf "%s\n" "#define HAVE_ATOLL 1" >>confdefs.h
+for ac_func in strtoll atoll
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
-printf %s "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
+$as_echo_n "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wno-implicit-fallthrough"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes; then :
   PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
@@ -22646,7 +19486,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_DATE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_DATE 1
+_ACEOF
 
     fi
   fi
@@ -22857,7 +19699,7 @@
 
 
 
-printf "%s\n" "#define HAVE_TIMELIB_CONFIG_H 1" >>confdefs.h
+$as_echo "#define HAVE_TIMELIB_CONFIG_H 1" >>confdefs.h
 
 
 cat > $ext_builddir/lib/timelib_config.h <<EOF
@@ -22885,19 +19727,17 @@
 
 php_with_libxml=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with LIBXML support" >&5
-printf %s "checking whether to build with LIBXML support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with LIBXML support" >&5
+$as_echo_n "checking whether to build with LIBXML support... " >&6; }
 
 # Check whether --with-libxml was given.
-if test ${with_libxml+y}
-then :
+if test "${with_libxml+set}" = set; then :
   withval=$with_libxml; PHP_LIBXML=$withval
-else case e in #(
-  e)
+else
+
   PHP_LIBXML=yes
   test "$PHP_ENABLE_ALL" && PHP_LIBXML=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -22923,8 +19763,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -22936,17 +19776,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -22960,10 +19800,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -22977,8 +19817,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -23004,10 +19844,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -23017,12 +19857,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -23167,12 +20007,12 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
   ext_builddir=ext/libxml
@@ -23308,7 +20148,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_LIBXML 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_LIBXML 1
+_ACEOF
 
     fi
   fi
@@ -23457,19 +20299,17 @@
 
 php_with_openssl=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL support" >&5
-printf %s "checking for OpenSSL support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL support" >&5
+$as_echo_n "checking for OpenSSL support... " >&6; }
 
 # Check whether --with-openssl was given.
-if test ${with_openssl+y}
-then :
+if test "${with_openssl+set}" = set; then :
   withval=$with_openssl; PHP_OPENSSL=$withval
-else case e in #(
-  e)
+else
+
   PHP_OPENSSL=no
   test "$PHP_ENABLE_ALL" && PHP_OPENSSL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -23495,8 +20335,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -23504,25 +20344,23 @@
 
 php_with_kerberos=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Kerberos support" >&5
-printf %s "checking for Kerberos support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos support" >&5
+$as_echo_n "checking for Kerberos support... " >&6; }
 
 # Check whether --with-kerberos was given.
-if test ${with_kerberos+y}
-then :
+if test "${with_kerberos+set}" = set; then :
   withval=$with_kerberos; PHP_KERBEROS=$withval
-else case e in #(
-  e)
+else
+
   PHP_KERBEROS=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_KERBEROS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -23530,25 +20368,23 @@
 
 php_with_system_ciphers=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use system default cipher list instead of hardcoded value" >&5
-printf %s "checking whether to use system default cipher list instead of hardcoded value... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use system default cipher list instead of hardcoded value" >&5
+$as_echo_n "checking whether to use system default cipher list instead of hardcoded value... " >&6; }
 
 # Check whether --with-system-ciphers was given.
-if test ${with_system_ciphers+y}
-then :
+if test "${with_system_ciphers+set}" = set; then :
   withval=$with_system_ciphers; PHP_SYSTEM_CIPHERS=$withval
-else case e in #(
-  e)
+else
+
   PHP_SYSTEM_CIPHERS=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_SYSTEM_CIPHERS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -23688,7 +20524,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_OPENSSL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_OPENSSL 1
+_ACEOF
 
     fi
   fi
@@ -23816,17 +20654,17 @@
   if test "$PHP_KERBEROS" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for krb5-gssapi krb5" >&5
-printf %s "checking for krb5-gssapi krb5... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5-gssapi krb5" >&5
+$as_echo_n "checking for krb5-gssapi krb5... " >&6; }
 
 if test -n "$KERBEROS_CFLAGS"; then
     pkg_cv_KERBEROS_CFLAGS="$KERBEROS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "krb5-gssapi krb5") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_KERBEROS_CFLAGS=`$PKG_CONFIG --cflags "krb5-gssapi krb5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -23840,10 +20678,10 @@
     pkg_cv_KERBEROS_LIBS="$KERBEROS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "krb5-gssapi krb5") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_KERBEROS_LIBS=`$PKG_CONFIG --libs "krb5-gssapi krb5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -23857,8 +20695,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -23884,10 +20722,10 @@
 and KERBEROS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -23897,12 +20735,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	KERBEROS_CFLAGS=$pkg_cv_KERBEROS_CFLAGS
 	KERBEROS_LIBS=$pkg_cv_KERBEROS_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -24052,17 +20890,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
-printf %s "checking for openssl >= 1.0.2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
+$as_echo_n "checking for openssl >= 1.0.2... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -24076,10 +20914,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -24093,8 +20931,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -24120,10 +20958,10 @@
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -24133,12 +20971,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	found_openssl=yes
 fi
 
@@ -24284,7 +21122,7 @@
 
 
 
-printf "%s\n" "#define HAVE_OPENSSL_EXT 1" >>confdefs.h
+$as_echo "#define HAVE_OPENSSL_EXT 1" >>confdefs.h
 
 
 else
@@ -24293,17 +21131,21 @@
   fi
 
 
+  for ac_func in RAND_egd
+do :
   ac_fn_c_check_func "$LINENO" "RAND_egd" "ac_cv_func_RAND_egd"
-if test "x$ac_cv_func_RAND_egd" = xyes
-then :
-  printf "%s\n" "#define HAVE_RAND_EGD 1" >>confdefs.h
+if test "x$ac_cv_func_RAND_egd" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_RAND_EGD 1
+_ACEOF
 
 fi
+done
 
 
   if test "$PHP_SYSTEM_CIPHERS" != "no"; then
 
-printf "%s\n" "#define USE_OPENSSL_SYSTEM_CIPHERS 1" >>confdefs.h
+$as_echo "#define USE_OPENSSL_SYSTEM_CIPHERS 1" >>confdefs.h
 
   fi
 fi
@@ -24317,15 +21159,13 @@
 
 
 # Check whether --with-external-pcre was given.
-if test ${with_external_pcre+y}
-then :
+if test "${with_external_pcre+set}" = set; then :
   withval=$with_external_pcre; PHP_EXTERNAL_PCRE=$withval
-else case e in #(
-  e)
+else
+
   PHP_EXTERNAL_PCRE=no
 
- ;;
-esac
+
 fi
 
 
@@ -24341,15 +21181,13 @@
 
 
 # Check whether --with-pcre-jit was given.
-if test ${with_pcre_jit+y}
-then :
+if test "${with_pcre_jit+set}" = set; then :
   withval=$with_pcre_jit; PHP_PCRE_JIT=$withval
-else case e in #(
-  e)
+else
+
   PHP_PCRE_JIT=yes
 
- ;;
-esac
+
 fi
 
 
@@ -24363,17 +21201,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpcre2-8 >= 10.30" >&5
-printf %s "checking for libpcre2-8 >= 10.30... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpcre2-8 >= 10.30" >&5
+$as_echo_n "checking for libpcre2-8 >= 10.30... " >&6; }
 
 if test -n "$PCRE2_CFLAGS"; then
     pkg_cv_PCRE2_CFLAGS="$PCRE2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libpcre2-8 >= 10.30") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PCRE2_CFLAGS=`$PKG_CONFIG --cflags "libpcre2-8 >= 10.30" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -24387,10 +21225,10 @@
     pkg_cv_PCRE2_LIBS="$PCRE2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libpcre2-8 >= 10.30") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PCRE2_LIBS=`$PKG_CONFIG --libs "libpcre2-8 >= 10.30" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -24404,8 +21242,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -24431,10 +21269,10 @@
 and PCRE2_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -24444,12 +21282,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	PCRE2_CFLAGS=$pkg_cv_PCRE2_CFLAGS
 	PCRE2_LIBS=$pkg_cv_PCRE2_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -24575,19 +21413,17 @@
   done
 
 
-printf "%s\n" "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h
+$as_echo "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h
 
 
   if test "$PHP_PCRE_JIT" != "no"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for JIT support in PCRE2" >&5
-printf %s "checking for JIT support in PCRE2... " >&6; }
-if test ${ac_cv_have_pcre2_jit+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-      if test "$cross_compiling" = yes
-then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JIT support in PCRE2" >&5
+$as_echo_n "checking for JIT support in PCRE2... " >&6; }
+if ${ac_cv_have_pcre2_jit+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      if test "$cross_compiling" = yes; then :
 
 
           case $host_cpu in
@@ -24599,8 +21435,8 @@
             ;;
           esac
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -24613,29 +21449,25 @@
               }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
           ac_cv_have_pcre2_jit=yes
 
-else case e in #(
-  e)
+else
+
           ac_cv_have_pcre2_jit=no
-         ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-       ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pcre2_jit" >&5
-printf "%s\n" "$ac_cv_have_pcre2_jit" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pcre2_jit" >&5
+$as_echo "$ac_cv_have_pcre2_jit" >&6; }
       if test $ac_cv_have_pcre2_jit = yes; then
-        printf "%s\n" "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h
+        $as_echo "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h
 
       fi
   fi
@@ -24774,7 +21606,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PCRE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PCRE 1
+_ACEOF
 
     fi
   fi
@@ -24916,10 +21750,10 @@
 
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PCRE library to use" >&5
-printf %s "checking for PCRE library to use... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: bundled" >&5
-printf "%s\n" "bundled" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCRE library to use" >&5
+$as_echo_n "checking for PCRE library to use... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: bundled" >&5
+$as_echo "bundled" >&6; }
   pcrelib_sources="pcre2lib/pcre2_auto_possess.c pcre2lib/pcre2_chartables.c pcre2lib/pcre2_compile.c \
       pcre2lib/pcre2_config.c pcre2lib/pcre2_context.c pcre2lib/pcre2_dfa_match.c pcre2lib/pcre2_error.c \
   pcre2lib/pcre2_jit_compile.c pcre2lib/pcre2_maketables.c pcre2lib/pcre2_match.c pcre2lib/pcre2_match_data.c \
@@ -24928,72 +21762,65 @@
   pcre2lib/pcre2_tables.c pcre2lib/pcre2_ucd.c pcre2lib/pcre2_valid_utf.c pcre2lib/pcre2_xclass.c \
   pcre2lib/pcre2_find_bracket.c pcre2lib/pcre2_convert.c pcre2lib/pcre2_extuni.c pcre2lib/pcre2_script_run.c"
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
-printf %s "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
+$as_echo_n "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wno-implicit-fallthrough"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes; then :
   PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -Wno-implicit-fallthrough"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
   PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
 
-printf "%s\n" "#define HAVE_BUNDLED_PCRE 1" >>confdefs.h
+$as_echo "#define HAVE_BUNDLED_PCRE 1" >>confdefs.h
 
 
-printf "%s\n" "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h
+$as_echo "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PCRE JIT functionality" >&5
-printf %s "checking whether to enable PCRE JIT functionality... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PCRE JIT functionality" >&5
+$as_echo_n "checking whether to enable PCRE JIT functionality... " >&6; }
   if test "$PHP_PCRE_JIT" != "no"; then
 
-printf "%s\n" "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h
+$as_echo "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Intel CET is enabled" >&5
+$as_echo_n "checking whether Intel CET is enabled... " >&6; }
+if ${ac_cv_have_pcre2_intel_cet+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Intel CET is enabled" >&5
-printf %s "checking whether Intel CET is enabled... " >&6; }
-if test ${ac_cv_have_pcre2_intel_cet+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -25003,30 +21830,27 @@
           #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
           ac_cv_have_pcre2_intel_cet=yes
 
-else case e in #(
-  e)
+else
+
           ac_cv_have_pcre2_intel_cet=no
-         ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       if test "$ac_cv_have_pcre2_intel_cet" = yes; then
         PHP_PCRE_CFLAGS="-mshstk $PHP_PCRE_CFLAGS"
       fi
-     ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pcre2_intel_cet" >&5
-printf "%s\n" "$ac_cv_have_pcre2_intel_cet" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pcre2_intel_cet" >&5
+$as_echo "$ac_cv_have_pcre2_intel_cet" >&6; }
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
@@ -25163,7 +21987,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PCRE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PCRE 1
+_ACEOF
 
     fi
   fi
@@ -25313,7 +22139,7 @@
   if test "$PHP_VALGRIND" != "no" && test "$have_valgrind" = "yes"; then
             if test "$ZEND_DEBUG" = "yes"; then
 
-printf "%s\n" "#define HAVE_PCRE_VALGRIND_SUPPORT 1" >>confdefs.h
+$as_echo "#define HAVE_PCRE_VALGRIND_SUPPORT 1" >>confdefs.h
 
       fi
   fi
@@ -25325,19 +22151,17 @@
 
 php_with_sqlite3=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable the SQLite3 extension" >&5
-printf %s "checking whether to enable the SQLite3 extension... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the SQLite3 extension" >&5
+$as_echo_n "checking whether to enable the SQLite3 extension... " >&6; }
 
 # Check whether --with-sqlite3 was given.
-if test ${with_sqlite3+y}
-then :
+if test "${with_sqlite3+set}" = set; then :
   withval=$with_sqlite3; PHP_SQLITE3=$withval
-else case e in #(
-  e)
+else
+
   PHP_SQLITE3=yes
   test "$PHP_ENABLE_ALL" && PHP_SQLITE3=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -25363,8 +22187,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -25372,17 +22196,17 @@
 if test $PHP_SQLITE3 != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5
-printf %s "checking for sqlite3 >= 3.7.7... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5
+$as_echo_n "checking for sqlite3 >= 3.7.7... " >&6; }
 
 if test -n "$SQLITE_CFLAGS"; then
     pkg_cv_SQLITE_CFLAGS="$SQLITE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.7.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -25396,10 +22220,10 @@
     pkg_cv_SQLITE_LIBS="$SQLITE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.7.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -25413,8 +22237,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -25440,10 +22264,10 @@
 and SQLITE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -25453,12 +22277,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	SQLITE_CFLAGS=$pkg_cv_SQLITE_CFLAGS
 	SQLITE_LIBS=$pkg_cv_SQLITE_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -25602,7 +22426,7 @@
   done
 
 
-printf "%s\n" "#define HAVE_SQLITE3 1" >>confdefs.h
+$as_echo "#define HAVE_SQLITE3 1" >>confdefs.h
 
 
 
@@ -25710,68 +22534,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_errstr in -lsqlite3" >&5
-printf %s "checking for sqlite3_errstr in -lsqlite3... " >&6; }
-if test ${ac_cv_lib_sqlite3_sqlite3_errstr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_errstr in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_errstr in -lsqlite3... " >&6; }
+if ${ac_cv_lib_sqlite3_sqlite3_errstr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char sqlite3_errstr (void);
+char sqlite3_errstr ();
 int
-main (void)
+main ()
 {
 return sqlite3_errstr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_errstr=yes
-else case e in #(
-  e) ac_cv_lib_sqlite3_sqlite3_errstr=no ;;
-esac
+else
+  ac_cv_lib_sqlite3_sqlite3_errstr=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_errstr" >&5
-printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_errstr" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_errstr" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_errstr" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_errstr" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_errstr" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SQLITE3_ERRSTR 1" >>confdefs.h
+$as_echo "#define HAVE_SQLITE3_ERRSTR 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_errstr
 
-   ;;
-esac
+
 fi
 
 
@@ -25880,68 +22695,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_expanded_sql in -lsqlite3" >&5
-printf %s "checking for sqlite3_expanded_sql in -lsqlite3... " >&6; }
-if test ${ac_cv_lib_sqlite3_sqlite3_expanded_sql+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_expanded_sql in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_expanded_sql in -lsqlite3... " >&6; }
+if ${ac_cv_lib_sqlite3_sqlite3_expanded_sql+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char sqlite3_expanded_sql (void);
+char sqlite3_expanded_sql ();
 int
-main (void)
+main ()
 {
 return sqlite3_expanded_sql ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_expanded_sql=yes
-else case e in #(
-  e) ac_cv_lib_sqlite3_sqlite3_expanded_sql=no ;;
-esac
+else
+  ac_cv_lib_sqlite3_sqlite3_expanded_sql=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&5
-printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_expanded_sql" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_expanded_sql" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SQLITE3_EXPANDED_SQL 1" >>confdefs.h
+$as_echo "#define HAVE_SQLITE3_EXPANDED_SQL 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_expanded_sql
 
-   ;;
-esac
+
 fi
 
 
@@ -26051,66 +22857,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_load_extension in -lsqlite3" >&5
-printf %s "checking for sqlite3_load_extension in -lsqlite3... " >&6; }
-if test ${ac_cv_lib_sqlite3_sqlite3_load_extension+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_load_extension in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_load_extension in -lsqlite3... " >&6; }
+if ${ac_cv_lib_sqlite3_sqlite3_load_extension+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char sqlite3_load_extension (void);
+char sqlite3_load_extension ();
 int
-main (void)
+main ()
 {
 return sqlite3_load_extension ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_load_extension=yes
-else case e in #(
-  e) ac_cv_lib_sqlite3_sqlite3_load_extension=no ;;
-esac
+else
+  ac_cv_lib_sqlite3_sqlite3_load_extension=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5
-printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_load_extension" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_load_extension" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_load_extension
 
-printf "%s\n" "#define SQLITE_OMIT_LOAD_EXTENSION 1" >>confdefs.h
+$as_echo "#define SQLITE_OMIT_LOAD_EXTENSION 1" >>confdefs.h
+
 
-   ;;
-esac
 fi
 
 
@@ -26248,7 +23045,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SQLITE3 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SQLITE3 1
+_ACEOF
 
     fi
   fi
@@ -26380,19 +23179,17 @@
 
 php_with_zlib=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ZLIB support" >&5
-printf %s "checking for ZLIB support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZLIB support" >&5
+$as_echo_n "checking for ZLIB support... " >&6; }
 
 # Check whether --with-zlib was given.
-if test ${with_zlib+y}
-then :
+if test "${with_zlib+set}" = set; then :
   withval=$with_zlib; PHP_ZLIB=$withval
-else case e in #(
-  e)
+else
+
   PHP_ZLIB=no
   test "$PHP_ENABLE_ALL" && PHP_ZLIB=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -26418,8 +23215,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -26427,17 +23224,17 @@
 if test "$PHP_ZLIB" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.2.0.4" >&5
-printf %s "checking for zlib >= 1.2.0.4... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.2.0.4" >&5
+$as_echo_n "checking for zlib >= 1.2.0.4... " >&6; }
 
 if test -n "$ZLIB_CFLAGS"; then
     pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.0.4\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.0.4\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.0.4") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "zlib >= 1.2.0.4" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -26451,10 +23248,10 @@
     pkg_cv_ZLIB_LIBS="$ZLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.0.4\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.0.4\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.0.4") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "zlib >= 1.2.0.4" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -26468,8 +23265,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -26495,10 +23292,10 @@
 and ZLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -26508,12 +23305,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
 	ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -26658,7 +23455,7 @@
 
 
 
-printf "%s\n" "#define HAVE_ZLIB 1" >>confdefs.h
+$as_echo "#define HAVE_ZLIB 1" >>confdefs.h
 
 
 
@@ -26795,7 +23592,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_ZLIB 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_ZLIB 1
+_ACEOF
 
     fi
   fi
@@ -26927,18 +23726,16 @@
 
 php_enable_bcmath=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable bc style precision math functions" >&5
-printf %s "checking whether to enable bc style precision math functions... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable bc style precision math functions" >&5
+$as_echo_n "checking whether to enable bc style precision math functions... " >&6; }
 # Check whether --enable-bcmath was given.
-if test ${enable_bcmath+y}
-then :
+if test "${enable_bcmath+set}" = set; then :
   enableval=$enable_bcmath; PHP_BCMATH=$enableval
-else case e in #(
-  e)
+else
+
   PHP_BCMATH=no
   test "$PHP_ENABLE_ALL" && PHP_BCMATH=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -26964,8 +23761,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -27113,7 +23910,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_BCMATH 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_BCMATH 1
+_ACEOF
 
     fi
   fi
@@ -27248,7 +24047,7 @@
 
 
 
-printf "%s\n" "#define HAVE_BCMATH 1" >>confdefs.h
+$as_echo "#define HAVE_BCMATH 1" >>confdefs.h
 
 fi
 
@@ -27258,19 +24057,17 @@
 
 php_with_bz2=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BZip2 support" >&5
-printf %s "checking for BZip2 support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZip2 support" >&5
+$as_echo_n "checking for BZip2 support... " >&6; }
 
 # Check whether --with-bz2 was given.
-if test ${with_bz2+y}
-then :
+if test "${with_bz2+set}" = set; then :
   withval=$with_bz2; PHP_BZ2=$withval
-else case e in #(
-  e)
+else
+
   PHP_BZ2=no
   test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -27296,8 +24093,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -27306,21 +24103,21 @@
   if test -r $PHP_BZ2/include/bzlib.h; then
     BZIP_DIR=$PHP_BZ2
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BZip2 in default path" >&5
-printf %s "checking for BZip2 in default path... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZip2 in default path" >&5
+$as_echo_n "checking for BZip2 in default path... " >&6; }
     for i in /usr/local /usr; do
       if test -r $i/include/bzlib.h; then
         BZIP_DIR=$i
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5
-printf "%s\n" "found in $i" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5
+$as_echo "found in $i" >&6; }
         break
       fi
     done
   fi
 
   if test -z "$BZIP_DIR"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "not found" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
     as_fn_error $? "Please reinstall the BZip2 distribution" "$LINENO" 5
   fi
 
@@ -27431,51 +24228,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzerror in -lbz2" >&5
-printf %s "checking for BZ2_bzerror in -lbz2... " >&6; }
-if test ${ac_cv_lib_bz2_BZ2_bzerror+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzerror in -lbz2" >&5
+$as_echo_n "checking for BZ2_bzerror in -lbz2... " >&6; }
+if ${ac_cv_lib_bz2_BZ2_bzerror+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbz2  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char BZ2_bzerror (void);
+char BZ2_bzerror ();
 int
-main (void)
+main ()
 {
 return BZ2_bzerror ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bz2_BZ2_bzerror=yes
-else case e in #(
-  e) ac_cv_lib_bz2_BZ2_bzerror=no ;;
-esac
+else
+  ac_cv_lib_bz2_BZ2_bzerror=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzerror" >&5
-printf "%s\n" "$ac_cv_lib_bz2_BZ2_bzerror" >&6; }
-if test "x$ac_cv_lib_bz2_BZ2_bzerror" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzerror" >&5
+$as_echo "$ac_cv_lib_bz2_BZ2_bzerror" >&6; }
+if test "x$ac_cv_lib_bz2_BZ2_bzerror" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -27609,20 +24398,19 @@
 
 
 
-printf "%s\n" "#define HAVE_BZ2 1" >>confdefs.h
+$as_echo "#define HAVE_BZ2 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_bz2_BZ2_bzerror
 
     as_fn_error $? "bz2 module requires libbz2 >= 1.0.0" "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -27760,7 +24548,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_BZ2 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_BZ2 1
+_ACEOF
 
     fi
   fi
@@ -27892,18 +24682,16 @@
 
 php_enable_calendar=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable calendar conversion support" >&5
-printf %s "checking whether to enable calendar conversion support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable calendar conversion support" >&5
+$as_echo_n "checking whether to enable calendar conversion support... " >&6; }
 # Check whether --enable-calendar was given.
-if test ${enable_calendar+y}
-then :
+if test "${enable_calendar+set}" = set; then :
   enableval=$enable_calendar; PHP_CALENDAR=$enableval
-else case e in #(
-  e)
+else
+
   PHP_CALENDAR=no
   test "$PHP_ENABLE_ALL" && PHP_CALENDAR=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -27929,15 +24717,15 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_CALENDAR" = "yes"; then
 
-printf "%s\n" "#define HAVE_CALENDAR 1" >>confdefs.h
+$as_echo "#define HAVE_CALENDAR 1" >>confdefs.h
 
 
   ext_builddir=ext/calendar
@@ -28073,7 +24861,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_CALENDAR 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_CALENDAR 1
+_ACEOF
 
     fi
   fi
@@ -28202,18 +24992,16 @@
 
 php_enable_ctype=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable ctype functions" >&5
-printf %s "checking whether to enable ctype functions... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable ctype functions" >&5
+$as_echo_n "checking whether to enable ctype functions... " >&6; }
 # Check whether --enable-ctype was given.
-if test ${enable_ctype+y}
-then :
+if test "${enable_ctype+set}" = set; then :
   enableval=$enable_ctype; PHP_CTYPE=$enableval
-else case e in #(
-  e)
+else
+
   PHP_CTYPE=yes
   test "$PHP_ENABLE_ALL" && PHP_CTYPE=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -28239,15 +25027,15 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_CTYPE" != "no"; then
 
-printf "%s\n" "#define HAVE_CTYPE 1" >>confdefs.h
+$as_echo "#define HAVE_CTYPE 1" >>confdefs.h
 
 
   ext_builddir=ext/ctype
@@ -28383,7 +25171,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_CTYPE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_CTYPE 1
+_ACEOF
 
     fi
   fi
@@ -28512,19 +25302,17 @@
 
 php_with_curl=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cURL support" >&5
-printf %s "checking for cURL support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cURL support" >&5
+$as_echo_n "checking for cURL support... " >&6; }
 
 # Check whether --with-curl was given.
-if test ${with_curl+y}
-then :
+if test "${with_curl+set}" = set; then :
   withval=$with_curl; PHP_CURL=$withval
-else case e in #(
-  e)
+else
+
   PHP_CURL=no
   test "$PHP_ENABLE_ALL" && PHP_CURL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -28550,8 +25338,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -28559,17 +25347,17 @@
 if test "$PHP_CURL" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl >= 7.29.0" >&5
-printf %s "checking for libcurl >= 7.29.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl >= 7.29.0" >&5
+$as_echo_n "checking for libcurl >= 7.29.0... " >&6; }
 
 if test -n "$CURL_CFLAGS"; then
     pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.29.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.29.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libcurl >= 7.29.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.29.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -28583,10 +25371,10 @@
     pkg_cv_CURL_LIBS="$CURL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.29.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.29.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libcurl >= 7.29.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.29.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -28600,8 +25388,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -28627,10 +25415,10 @@
 and CURL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -28640,12 +25428,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	CURL_CFLAGS=$pkg_cv_CURL_CFLAGS
 	CURL_LIBS=$pkg_cv_CURL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -28653,10 +25441,10 @@
     pkg_cv_CURL_FEATURES="$CURL_FEATURES"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CURL_FEATURES=`$PKG_CONFIG --variable="supported_features" "libcurl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -28668,8 +25456,7 @@
 fi
 CURL_FEATURES=$pkg_cv_CURL_FEATURES
 
-if test "x$CURL_FEATURES" = x""
-then :
+if test "x$CURL_FEATURES" = x""; then :
 
 fi
 
@@ -28813,18 +25600,18 @@
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SSL support in libcurl" >&5
-printf %s "checking for SSL support in libcurl... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL support in libcurl" >&5
+$as_echo_n "checking for SSL support in libcurl... " >&6; }
   case "$CURL_FEATURES" in
     *SSL*)
       CURL_SSL=yes
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       ;;
     *)
       CURL_SSL=no
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       ;;
   esac
 
@@ -28832,16 +25619,15 @@
     save_LDFLAGS="$LDFLAGS"
     LDFLAGS="$LDFLAGS $CURL_LIBS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl linked against old openssl" >&5
-printf %s "checking for libcurl linked against old openssl... " >&6; }
-    if test "$cross_compiling" = yes
-then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl linked against old openssl" >&5
+$as_echo_n "checking for libcurl linked against old openssl... " >&6; }
+    if test "$cross_compiling" = yes; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <strings.h>
@@ -28871,27 +25657,26 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_CURL_OLD_OPENSSL 1" >>confdefs.h
+$as_echo "#define HAVE_CURL_OLD_OPENSSL 1" >>confdefs.h
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5
-printf %s "checking for openssl... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5
+$as_echo_n "checking for openssl... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -28905,10 +25690,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -28922,8 +25707,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -28949,10 +25734,10 @@
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -28962,12 +25747,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
   for ac_i in $OPENSSL_LIBS; do
@@ -29108,33 +25893,36 @@
     esac
   done
 
-        ac_fn_c_check_header_compile "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_crypto_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_OPENSSL_CRYPTO_H 1" >>confdefs.h
+        for ac_header in openssl/crypto.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_crypto_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OPENSSL_CRYPTO_H 1
+_ACEOF
 
 fi
 
+done
+
 
 fi
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
     LDFLAGS="$save_LDFLAGS"
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
@@ -29244,70 +26032,61 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curl_easy_perform in -lcurl" >&5
-printf %s "checking for curl_easy_perform in -lcurl... " >&6; }
-if test ${ac_cv_lib_curl_curl_easy_perform+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_perform in -lcurl" >&5
+$as_echo_n "checking for curl_easy_perform in -lcurl... " >&6; }
+if ${ac_cv_lib_curl_curl_easy_perform+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char curl_easy_perform (void);
+char curl_easy_perform ();
 int
-main (void)
+main ()
 {
 return curl_easy_perform ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_curl_curl_easy_perform=yes
-else case e in #(
-  e) ac_cv_lib_curl_curl_easy_perform=no ;;
-esac
+else
+  ac_cv_lib_curl_curl_easy_perform=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_perform" >&5
-printf "%s\n" "$ac_cv_lib_curl_curl_easy_perform" >&6; }
-if test "x$ac_cv_lib_curl_curl_easy_perform" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_perform" >&5
+$as_echo "$ac_cv_lib_curl_curl_easy_perform" >&6; }
+if test "x$ac_cv_lib_curl_curl_easy_perform" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_CURL 1" >>confdefs.h
+$as_echo "#define HAVE_CURL 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_curl_curl_easy_perform
 
     as_fn_error $? "There is something wrong. Please check config.log for more information." "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -29445,7 +26224,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_CURL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_CURL 1
+_ACEOF
 
     fi
   fi
@@ -29612,15 +26393,13 @@
 
 
 # Check whether --enable-dba was given.
-if test ${enable_dba+y}
-then :
+if test "${enable_dba+set}" = set; then :
   enableval=$enable_dba; PHP_DBA=$enableval
-else case e in #(
-  e)
+else
+
   PHP_DBA=no
   test "$PHP_ENABLE_ALL" && PHP_DBA=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -29657,15 +26436,13 @@
 
 
 # Check whether --with-qdbm was given.
-if test ${with_qdbm+y}
-then :
+if test "${with_qdbm+set}" = set; then :
   withval=$with_qdbm; PHP_QDBM=$withval
-else case e in #(
-  e)
+else
+
   PHP_QDBM=no
 
- ;;
-esac
+
 fi
 
 
@@ -29681,15 +26458,13 @@
 
 
 # Check whether --with-gdbm was given.
-if test ${with_gdbm+y}
-then :
+if test "${with_gdbm+set}" = set; then :
   withval=$with_gdbm; PHP_GDBM=$withval
-else case e in #(
-  e)
+else
+
   PHP_GDBM=no
 
- ;;
-esac
+
 fi
 
 
@@ -29705,15 +26480,13 @@
 
 
 # Check whether --with-ndbm was given.
-if test ${with_ndbm+y}
-then :
+if test "${with_ndbm+set}" = set; then :
   withval=$with_ndbm; PHP_NDBM=$withval
-else case e in #(
-  e)
+else
+
   PHP_NDBM=no
 
- ;;
-esac
+
 fi
 
 
@@ -29729,15 +26502,13 @@
 
 
 # Check whether --with-db4 was given.
-if test ${with_db4+y}
-then :
+if test "${with_db4+set}" = set; then :
   withval=$with_db4; PHP_DB4=$withval
-else case e in #(
-  e)
+else
+
   PHP_DB4=no
 
- ;;
-esac
+
 fi
 
 
@@ -29753,15 +26524,13 @@
 
 
 # Check whether --with-db3 was given.
-if test ${with_db3+y}
-then :
+if test "${with_db3+set}" = set; then :
   withval=$with_db3; PHP_DB3=$withval
-else case e in #(
-  e)
+else
+
   PHP_DB3=no
 
- ;;
-esac
+
 fi
 
 
@@ -29777,15 +26546,13 @@
 
 
 # Check whether --with-db2 was given.
-if test ${with_db2+y}
-then :
+if test "${with_db2+set}" = set; then :
   withval=$with_db2; PHP_DB2=$withval
-else case e in #(
-  e)
+else
+
   PHP_DB2=no
 
- ;;
-esac
+
 fi
 
 
@@ -29801,15 +26568,13 @@
 
 
 # Check whether --with-db1 was given.
-if test ${with_db1+y}
-then :
+if test "${with_db1+set}" = set; then :
   withval=$with_db1; PHP_DB1=$withval
-else case e in #(
-  e)
+else
+
   PHP_DB1=no
 
- ;;
-esac
+
 fi
 
 
@@ -29825,15 +26590,13 @@
 
 
 # Check whether --with-dbm was given.
-if test ${with_dbm+y}
-then :
+if test "${with_dbm+set}" = set; then :
   withval=$with_dbm; PHP_DBM=$withval
-else case e in #(
-  e)
+else
+
   PHP_DBM=no
 
- ;;
-esac
+
 fi
 
 
@@ -29849,15 +26612,13 @@
 
 
 # Check whether --with-tcadb was given.
-if test ${with_tcadb+y}
-then :
+if test "${with_tcadb+set}" = set; then :
   withval=$with_tcadb; PHP_TCADB=$withval
-else case e in #(
-  e)
+else
+
   PHP_TCADB=no
 
- ;;
-esac
+
 fi
 
 
@@ -29873,15 +26634,13 @@
 
 
 # Check whether --with-lmdb was given.
-if test ${with_lmdb+y}
-then :
+if test "${with_lmdb+set}" = set; then :
   withval=$with_lmdb; PHP_LMDB=$withval
-else case e in #(
-  e)
+else
+
   PHP_LMDB=no
 
- ;;
-esac
+
 fi
 
 
@@ -30015,74 +26774,67 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_dpopen" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dpopen in -l$LIB" >&5
-printf %s "checking for dpopen in -l$LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_dpopen" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dpopen in -l$LIB" >&5
+$as_echo_n "checking for dpopen in -l$LIB... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dpopen (void);
+char dpopen ();
 int
-main (void)
+main ()
 {
 return dpopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define QDBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define QDBM_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
 
-printf "%s\n" "#define DBA_QDBM 1" >>confdefs.h
+$as_echo "#define DBA_QDBM 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_dpopen
 
-   ;;
-esac
+
 fi
 
       if test -n "$THIS_LIBS"; then
@@ -30213,19 +26965,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -30242,19 +26994,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n "You cannot combine --with-gdbm with --with-qdbm"; then
     as_fn_error $? "You cannot combine --with-gdbm with --with-qdbm" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -30373,72 +27125,65 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdbm_open in -lgdbm" >&5
-printf %s "checking for gdbm_open in -lgdbm... " >&6; }
-if test ${ac_cv_lib_gdbm_gdbm_open+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdbm_open in -lgdbm" >&5
+$as_echo_n "checking for gdbm_open in -lgdbm... " >&6; }
+if ${ac_cv_lib_gdbm_gdbm_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgdbm  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gdbm_open (void);
+char gdbm_open ();
 int
-main (void)
+main ()
 {
 return gdbm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gdbm_gdbm_open=yes
-else case e in #(
-  e) ac_cv_lib_gdbm_gdbm_open=no ;;
-esac
+else
+  ac_cv_lib_gdbm_gdbm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_gdbm_open" >&5
-printf "%s\n" "$ac_cv_lib_gdbm_gdbm_open" >&6; }
-if test "x$ac_cv_lib_gdbm_gdbm_open" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_gdbm_open" >&5
+$as_echo "$ac_cv_lib_gdbm_gdbm_open" >&6; }
+if test "x$ac_cv_lib_gdbm_gdbm_open" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define GDBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define GDBM_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
 
-printf "%s\n" "#define DBA_GDBM 1" >>confdefs.h
+$as_echo "#define DBA_GDBM 1" >>confdefs.h
 
       THIS_LIBS=gdbm
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gdbm_gdbm_open
 
-   ;;
-esac
+
 fi
 
   fi
@@ -30565,19 +27310,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -30705,74 +27450,67 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_dbm_open" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -l$LIB" >&5
-printf %s "checking for dbm_open in -l$LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_dbm_open" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -l$LIB" >&5
+$as_echo_n "checking for dbm_open in -l$LIB... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dbm_open (void);
+char dbm_open ();
 int
-main (void)
+main ()
 {
 return dbm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define NDBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define NDBM_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
 
-printf "%s\n" "#define DBA_NDBM 1" >>confdefs.h
+$as_echo "#define DBA_NDBM 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_dbm_open
 
-   ;;
-esac
+
 fi
 
       if test -n "$THIS_LIBS"; then
@@ -30903,19 +27641,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -31070,74 +27808,67 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_tcadbopen" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tcadbopen in -l$LIB" >&5
-printf %s "checking for tcadbopen in -l$LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_tcadbopen" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcadbopen in -l$LIB" >&5
+$as_echo_n "checking for tcadbopen in -l$LIB... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tcadbopen (void);
+char tcadbopen ();
 int
-main (void)
+main ()
 {
 return tcadbopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define TCADB_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define TCADB_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
 
-printf "%s\n" "#define DBA_TCADB 1" >>confdefs.h
+$as_echo "#define DBA_TCADB 1" >>confdefs.h
 
 		THIS_LIBS=$LIB
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_tcadbopen
 
-   ;;
-esac
+
 fi
 
 	  if test -n "$THIS_LIBS"; then
@@ -31268,19 +27999,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -31435,74 +28166,67 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_mdb_env_open" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mdb_env_open in -l$LIB" >&5
-printf %s "checking for mdb_env_open in -l$LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_mdb_env_open" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mdb_env_open in -l$LIB" >&5
+$as_echo_n "checking for mdb_env_open in -l$LIB... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char mdb_env_open (void);
+char mdb_env_open ();
 int
-main (void)
+main ()
 {
 return mdb_env_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define LMDB_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define LMDB_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
 
-printf "%s\n" "#define DBA_LMDB 1" >>confdefs.h
+$as_echo "#define DBA_LMDB 1" >>confdefs.h
 
 		THIS_LIBS=$LIB
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_mdb_env_open
 
-   ;;
-esac
+
 fi
 
 	  if test -n "$THIS_LIBS"; then
@@ -31633,19 +28357,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -31732,7 +28456,7 @@
 #include "$THIS_INCLUDE"
 
 int
-main (void)
+main ()
 {
 
           (void)db_create((DB**)0, (DB_ENV*)0, 0);
@@ -31741,8 +28465,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -31754,18 +28477,17 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
             THIS_LIBS=$LIB
             lib_found=1
 
 fi
-rm -rf conftest*
+rm -f conftest*
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
@@ -31778,13 +28500,13 @@
     fi
   done
   if test -z "$THIS_LIBS"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB4 major version" >&5
-printf %s "checking for DB4 major version... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 major version" >&5
+$as_echo_n "checking for DB4 major version... " >&6; }
     as_fn_error $? "Header contains different version" "$LINENO" 5
   fi
   if test "4" = "4"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
-printf %s "checking for DB4 minor version and patch level... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
+$as_echo_n "checking for DB4 minor version and patch level... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -31795,24 +28517,22 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+
+else
 
-else case e in #(
-  e)
       as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5
-     ;;
-esac
+
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
   if test "$ext_shared" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
-printf %s "checking if dba can be used as shared extension... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
+$as_echo_n "checking if dba can be used as shared extension... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -31823,28 +28543,28 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
       as_fn_error $? "At least version 3.3 is required" "$LINENO" 5
-     ;;
-esac
+
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
   if test -n "$THIS_LIBS"; then
 
-printf "%s\n" "#define DBA_DB4 1" >>confdefs.h
+$as_echo "#define DBA_DB4 1" >>confdefs.h
 
     if test -n "$THIS_INCLUDE"; then
 
-printf "%s\n" "#define DB4_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DB4_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
     fi
   else
@@ -31968,19 +28688,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -31997,19 +28717,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n "You cannot combine --with-db3 with --with-db4"; then
     as_fn_error $? "You cannot combine --with-db3 with --with-db4" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -32056,7 +28776,7 @@
 #include "$THIS_INCLUDE"
 
 int
-main (void)
+main ()
 {
 
           (void)db_create((DB**)0, (DB_ENV*)0, 0);
@@ -32065,8 +28785,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -32078,18 +28797,17 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
             THIS_LIBS=$LIB
             lib_found=1
 
 fi
-rm -rf conftest*
+rm -f conftest*
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
@@ -32102,13 +28820,13 @@
     fi
   done
   if test -z "$THIS_LIBS"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB3 major version" >&5
-printf %s "checking for DB3 major version... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB3 major version" >&5
+$as_echo_n "checking for DB3 major version... " >&6; }
     as_fn_error $? "Header contains different version" "$LINENO" 5
   fi
   if test "3" = "4"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
-printf %s "checking for DB4 minor version and patch level... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
+$as_echo_n "checking for DB4 minor version and patch level... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -32119,24 +28837,22 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+else
 
-else case e in #(
-  e)
       as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5
-     ;;
-esac
+
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
   if test "$ext_shared" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
-printf %s "checking if dba can be used as shared extension... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
+$as_echo_n "checking if dba can be used as shared extension... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -32147,28 +28863,28 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
 
-else case e in #(
-  e)
       as_fn_error $? "At least version 3.3 is required" "$LINENO" 5
-     ;;
-esac
+
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
   if test -n "$THIS_LIBS"; then
 
-printf "%s\n" "#define DBA_DB3 1" >>confdefs.h
+$as_echo "#define DBA_DB3 1" >>confdefs.h
 
     if test -n "$THIS_INCLUDE"; then
 
-printf "%s\n" "#define DB3_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DB3_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
     fi
   else
@@ -32292,19 +29008,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -32321,19 +29037,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then
     as_fn_error $? "You cannot combine --with-db2 with --with-db3 or --with-db4" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -32380,7 +29096,7 @@
 #include "$THIS_INCLUDE"
 
 int
-main (void)
+main ()
 {
 
           (void)db_appinit("", NULL, (DB_ENV*)0, 0);
@@ -32389,8 +29105,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -32402,18 +29117,17 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
             THIS_LIBS=$LIB
             lib_found=1
 
 fi
-rm -rf conftest*
+rm -f conftest*
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
@@ -32426,13 +29140,13 @@
     fi
   done
   if test -z "$THIS_LIBS"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB2 major version" >&5
-printf %s "checking for DB2 major version... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB2 major version" >&5
+$as_echo_n "checking for DB2 major version... " >&6; }
     as_fn_error $? "Header contains different version" "$LINENO" 5
   fi
   if test "2" = "4"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
-printf %s "checking for DB4 minor version and patch level... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
+$as_echo_n "checking for DB4 minor version and patch level... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -32443,24 +29157,22 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+
+else
 
-else case e in #(
-  e)
       as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5
-     ;;
-esac
+
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
   if test "$ext_shared" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
-printf %s "checking if dba can be used as shared extension... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
+$as_echo_n "checking if dba can be used as shared extension... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -32471,28 +29183,28 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
       as_fn_error $? "At least version 3.3 is required" "$LINENO" 5
-     ;;
-esac
+
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
   if test -n "$THIS_LIBS"; then
 
-printf "%s\n" "#define DBA_DB2 1" >>confdefs.h
+$as_echo "#define DBA_DB2 1" >>confdefs.h
 
     if test -n "$THIS_INCLUDE"; then
 
-printf "%s\n" "#define DB2_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DB2_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
     fi
   else
@@ -32616,19 +29328,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -32637,8 +29349,8 @@
 
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB1 in library" >&5
-printf %s "checking for DB1 in library... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB1 in library" >&5
+$as_echo_n "checking for DB1 in library... " >&6; }
   if test "$HAVE_DB4" = "1"; then
     THIS_VERSION=4
     THIS_LIBS=$DB4_LIBS
@@ -32653,7 +29365,9 @@
   fi
   if test "$HAVE_DB4" = "1" || test "$HAVE_DB3" = "1" || test "$HAVE_DB2" = "1"; then
 
-printf "%s\n" "#define DB1_VERSION \"Berkeley DB 1.85 emulation in DB$THIS_VERSION\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DB1_VERSION "Berkeley DB 1.85 emulation in DB$THIS_VERSION"
+_ACEOF
 
     for i in db$THIS_VERSION/db_185.h include/db$THIS_VERSION/db_185.h include/db/db_185.h; do
       if test -f "$THIS_PREFIX/$i"; then
@@ -32663,7 +29377,9 @@
     done
   else
 
-printf "%s\n" "#define DB1_VERSION \"Unknown DB1\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DB1_VERSION "Unknown DB1"
+_ACEOF
 
     for i in $PHP_DB1 /usr/local /usr; do
       if test -f "$i/db1/db.h"; then
@@ -32682,12 +29398,12 @@
     done
     THIS_LIBS=db
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_LIBS" >&5
-printf "%s\n" "$THIS_LIBS" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB1 in header" >&5
-printf %s "checking for DB1 in header... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_INCLUDE" >&5
-printf "%s\n" "$THIS_INCLUDE" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_LIBS" >&5
+$as_echo "$THIS_LIBS" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB1 in header" >&5
+$as_echo_n "checking for DB1 in header... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_INCLUDE" >&5
+$as_echo "$THIS_INCLUDE" >&6; }
   if test -n "$THIS_INCLUDE"; then
 
   old_LDFLAGS=$LDFLAGS
@@ -32701,7 +29417,7 @@
 #include "$THIS_INCLUDE"
 
 int
-main (void)
+main ()
 {
 
         DB * dbp = dbopen("", 0, 0, DB_HASH, 0);
@@ -32710,24 +29426,24 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
 
-printf "%s\n" "#define DB1_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DB1_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
 
-printf "%s\n" "#define DBA_DB1 1" >>confdefs.h
+$as_echo "#define DBA_DB1 1" >>confdefs.h
 
         THIS_RESULT=yes
 
-else case e in #(
-  e)
+else
+
         THIS_RESULT=no
-       ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
@@ -32856,19 +29572,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -32885,19 +29601,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n "You cannot combine --with-dbm with --with-qdbm"; then
     as_fn_error $? "You cannot combine --with-dbm with --with-qdbm" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -33021,89 +29737,86 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_dbminit" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbminit in -l$LIB" >&5
-printf %s "checking for dbminit in -l$LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_dbminit" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbminit in -l$LIB" >&5
+$as_echo_n "checking for dbminit in -l$LIB... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dbminit (void);
+char dbminit ();
 int
-main (void)
+main ()
 {
 return dbminit ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DBM using GDBM" >&5
-printf %s "checking for DBM using GDBM... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBM using GDBM" >&5
+$as_echo_n "checking for DBM using GDBM... " >&6; }
 
-printf "%s\n" "#define DBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DBM_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
         if test "$LIB" = "gdbm"; then
 
-printf "%s\n" "#define DBM_VERSION \"GDBM\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DBM_VERSION "GDBM"
+_ACEOF
 
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         else
 
-printf "%s\n" "#define DBM_VERSION \"DBM\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DBM_VERSION "DBM"
+_ACEOF
 
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         fi
 
-printf "%s\n" "#define DBA_DBM 1" >>confdefs.h
+$as_echo "#define DBA_DBM 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_dbminit
 
-   ;;
-esac
+
 fi
 
       if test -n "$THIS_LIBS"; then
@@ -33234,19 +29947,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -33263,15 +29976,13 @@
 
 
 # Check whether --with-cdb was given.
-if test ${with_cdb+y}
-then :
+if test "${with_cdb+set}" = set; then :
   withval=$with_cdb; PHP_CDB=$withval
-else case e in #(
-  e)
+else
+
   PHP_CDB=$php_dba_enable
 
- ;;
-esac
+
 fi
 
 
@@ -33286,15 +29997,13 @@
 
 
 # Check whether --enable-inifile was given.
-if test ${enable_inifile+y}
-then :
+if test "${enable_inifile+set}" = set; then :
   enableval=$enable_inifile; PHP_INIFILE=$enableval
-else case e in #(
-  e)
+else
+
   PHP_INIFILE=$php_dba_enable
 
- ;;
-esac
+
 fi
 
 
@@ -33309,15 +30018,13 @@
 
 
 # Check whether --enable-flatfile was given.
-if test ${enable_flatfile+y}
-then :
+if test "${enable_flatfile+set}" = set; then :
   enableval=$enable_flatfile; PHP_FLATFILE=$enableval
-else case e in #(
-  e)
+else
+
   PHP_FLATFILE=$php_dba_enable
 
- ;;
-esac
+
 fi
 
 
@@ -33329,13 +30036,13 @@
 
 if test "$PHP_CDB" = "yes"; then
 
-printf "%s\n" "#define DBA_CDB_BUILTIN 1" >>confdefs.h
+$as_echo "#define DBA_CDB_BUILTIN 1" >>confdefs.h
 
 
-printf "%s\n" "#define DBA_CDB_MAKE 1" >>confdefs.h
+$as_echo "#define DBA_CDB_MAKE 1" >>confdefs.h
 
 
-printf "%s\n" "#define DBA_CDB 1" >>confdefs.h
+$as_echo "#define DBA_CDB 1" >>confdefs.h
 
   cdb_sources="libcdb/cdb.c libcdb/cdb_make.c libcdb/uint32.c"
   THIS_RESULT="builtin"
@@ -33458,74 +30165,67 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_cdb_read" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cdb_read in -l$LIB" >&5
-printf %s "checking for cdb_read in -l$LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_cdb_read" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cdb_read in -l$LIB" >&5
+$as_echo_n "checking for cdb_read in -l$LIB... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char cdb_read (void);
+char cdb_read ();
 int
-main (void)
+main ()
 {
 return cdb_read ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define CDB_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define CDB_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
 
-printf "%s\n" "#define DBA_CDB 1" >>confdefs.h
+$as_echo "#define DBA_CDB 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_cdb_read
 
-   ;;
-esac
+
 fi
 
       if test -n "$THIS_LIBS"; then
@@ -33656,26 +30356,26 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
 if test "$PHP_INIFILE" != "no"; then
 
-printf "%s\n" "#define DBA_INIFILE 1" >>confdefs.h
+$as_echo "#define DBA_INIFILE 1" >>confdefs.h
 
   ini_sources="libinifile/inifile.c"
   THIS_RESULT="builtin"
@@ -33687,26 +30387,26 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
 if test "$PHP_FLATFILE" != "no"; then
 
-printf "%s\n" "#define DBA_FLATFILE 1" >>confdefs.h
+$as_echo "#define DBA_FLATFILE 1" >>confdefs.h
 
   flat_sources="libflatfile/flatfile.c"
   THIS_RESULT="builtin"
@@ -33718,35 +30418,35 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable DBA interface" >&5
-printf %s "checking whether to enable DBA interface... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DBA interface" >&5
+$as_echo_n "checking whether to enable DBA interface... " >&6; }
 if test "$HAVE_DBA" = "1"; then
   if test "$ext_shared" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, shared" >&5
-printf "%s\n" "yes, shared" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, shared" >&5
+$as_echo "yes, shared" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   fi
 
-printf "%s\n" "#define HAVE_DBA 1" >>confdefs.h
+$as_echo "#define HAVE_DBA 1" >>confdefs.h
 
 
   ext_builddir=ext/dba
@@ -33882,7 +30582,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_DBA 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_DBA 1
+_ACEOF
 
     fi
   fi
@@ -34022,8 +30724,8 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST DBA_SHARED_LIBADD"
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -34032,18 +30734,16 @@
 
 php_enable_dl_test=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable dl-test extension" >&5
-printf %s "checking whether to enable dl-test extension... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dl-test extension" >&5
+$as_echo_n "checking whether to enable dl-test extension... " >&6; }
 # Check whether --enable-dl-test was given.
-if test ${enable_dl_test+y}
-then :
+if test "${enable_dl_test+set}" = set; then :
   enableval=$enable_dl_test; PHP_DL_TEST=$enableval
-else case e in #(
-  e)
+else
+
   PHP_DL_TEST=no
   test "$PHP_ENABLE_ALL" && PHP_DL_TEST=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -34069,8 +30769,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -34210,7 +30910,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_DL_TEST 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_DL_TEST 1
+_ACEOF
 
     fi
   fi
@@ -34339,18 +31041,16 @@
 
 php_enable_dom=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable DOM support" >&5
-printf %s "checking whether to enable DOM support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DOM support" >&5
+$as_echo_n "checking whether to enable DOM support... " >&6; }
 # Check whether --enable-dom was given.
-if test ${enable_dom+y}
-then :
+if test "${enable_dom+set}" = set; then :
   enableval=$enable_dom; PHP_DOM=$enableval
-else case e in #(
-  e)
+else
+
   PHP_DOM=yes
   test "$PHP_ENABLE_ALL" && PHP_DOM=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -34376,8 +31076,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -34391,17 +31091,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -34415,10 +31115,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -34432,8 +31132,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -34459,10 +31159,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -34472,12 +31172,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -34622,12 +31322,12 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define HAVE_DOM 1" >>confdefs.h
+$as_echo "#define HAVE_DOM 1" >>confdefs.h
 
 
   ext_builddir=ext/dom
@@ -34781,7 +31481,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_DOM 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_DOM 1
+_ACEOF
 
     fi
   fi
@@ -34970,19 +31672,17 @@
 
 php_with_enchant=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with Enchant support" >&5
-printf %s "checking whether to build with Enchant support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with Enchant support" >&5
+$as_echo_n "checking whether to build with Enchant support... " >&6; }
 
 # Check whether --with-enchant was given.
-if test ${with_enchant+y}
-then :
+if test "${with_enchant+set}" = set; then :
   withval=$with_enchant; PHP_ENCHANT=$withval
-else case e in #(
-  e)
+else
+
   PHP_ENCHANT=no
   test "$PHP_ENABLE_ALL" && PHP_ENCHANT=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -35008,8 +31708,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -35017,17 +31717,17 @@
 if test "$PHP_ENCHANT" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant-2" >&5
-printf %s "checking for enchant-2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant-2" >&5
+$as_echo_n "checking for enchant-2... " >&6; }
 
 if test -n "$ENCHANT2_CFLAGS"; then
     pkg_cv_ENCHANT2_CFLAGS="$ENCHANT2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ENCHANT2_CFLAGS=`$PKG_CONFIG --cflags "enchant-2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -35041,10 +31741,10 @@
     pkg_cv_ENCHANT2_LIBS="$ENCHANT2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ENCHANT2_LIBS=`$PKG_CONFIG --libs "enchant-2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -35058,8 +31758,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -35076,14 +31776,14 @@
 
 	found_enchant_2=no
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	found_enchant_2=no
 else
 	ENCHANT2_CFLAGS=$pkg_cv_ENCHANT2_CFLAGS
 	ENCHANT2_LIBS=$pkg_cv_ENCHANT2_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	found_enchant_2=yes
 fi
 
@@ -35230,25 +31930,25 @@
 
 
 
-printf "%s\n" "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h
+$as_echo "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h
 
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libenchant-2 not found trying with old libenchant" >&5
-printf "%s\n" "$as_me: WARNING: libenchant-2 not found trying with old libenchant" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libenchant-2 not found trying with old libenchant" >&5
+$as_echo "$as_me: WARNING: libenchant-2 not found trying with old libenchant" >&2;}
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant >= 1.4.2" >&5
-printf %s "checking for enchant >= 1.4.2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant >= 1.4.2" >&5
+$as_echo_n "checking for enchant >= 1.4.2... " >&6; }
 
 if test -n "$ENCHANT_CFLAGS"; then
     pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "enchant >= 1.4.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant >= 1.4.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -35262,10 +31962,10 @@
     pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "enchant >= 1.4.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant >= 1.4.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -35279,8 +31979,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -35306,10 +32006,10 @@
 and ENCHANT_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -35319,12 +32019,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ENCHANT_CFLAGS=$pkg_cv_ENCHANT_CFLAGS
 	ENCHANT_LIBS=$pkg_cv_ENCHANT_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -35575,68 +32275,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant_get_version in -lenchant" >&5
-printf %s "checking for enchant_get_version in -lenchant... " >&6; }
-if test ${ac_cv_lib_enchant_enchant_get_version+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant_get_version in -lenchant" >&5
+$as_echo_n "checking for enchant_get_version in -lenchant... " >&6; }
+if ${ac_cv_lib_enchant_enchant_get_version+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lenchant  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char enchant_get_version (void);
+char enchant_get_version ();
 int
-main (void)
+main ()
 {
 return enchant_get_version ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_enchant_enchant_get_version=yes
-else case e in #(
-  e) ac_cv_lib_enchant_enchant_get_version=no ;;
-esac
+else
+  ac_cv_lib_enchant_enchant_get_version=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_get_version" >&5
-printf "%s\n" "$ac_cv_lib_enchant_enchant_get_version" >&6; }
-if test "x$ac_cv_lib_enchant_enchant_get_version" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_get_version" >&5
+$as_echo "$ac_cv_lib_enchant_enchant_get_version" >&6; }
+if test "x$ac_cv_lib_enchant_enchant_get_version" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h
+$as_echo "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_enchant_enchant_get_version
 
-   ;;
-esac
+
 fi
 
 
@@ -35747,74 +32438,65 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant_broker_set_param in -lenchant" >&5
-printf %s "checking for enchant_broker_set_param in -lenchant... " >&6; }
-if test ${ac_cv_lib_enchant_enchant_broker_set_param+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant_broker_set_param in -lenchant" >&5
+$as_echo_n "checking for enchant_broker_set_param in -lenchant... " >&6; }
+if ${ac_cv_lib_enchant_enchant_broker_set_param+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lenchant  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char enchant_broker_set_param (void);
+char enchant_broker_set_param ();
 int
-main (void)
+main ()
 {
 return enchant_broker_set_param ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_enchant_enchant_broker_set_param=yes
-else case e in #(
-  e) ac_cv_lib_enchant_enchant_broker_set_param=no ;;
-esac
+else
+  ac_cv_lib_enchant_enchant_broker_set_param=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_broker_set_param" >&5
-printf "%s\n" "$ac_cv_lib_enchant_enchant_broker_set_param" >&6; }
-if test "x$ac_cv_lib_enchant_enchant_broker_set_param" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_broker_set_param" >&5
+$as_echo "$ac_cv_lib_enchant_enchant_broker_set_param" >&6; }
+if test "x$ac_cv_lib_enchant_enchant_broker_set_param" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_ENCHANT_BROKER_SET_PARAM 1" >>confdefs.h
+$as_echo "#define HAVE_ENCHANT_BROKER_SET_PARAM 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_enchant_enchant_broker_set_param
 
-   ;;
-esac
+
 fi
 
   fi
 
 
-printf "%s\n" "#define HAVE_ENCHANT 1" >>confdefs.h
+$as_echo "#define HAVE_ENCHANT 1" >>confdefs.h
 
 
 
@@ -35951,7 +32633,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_ENCHANT 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_ENCHANT 1
+_ACEOF
 
     fi
   fi
@@ -36083,18 +32767,16 @@
 
 php_enable_exif=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable EXIF (metadata from images) support" >&5
-printf %s "checking whether to enable EXIF (metadata from images) support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable EXIF (metadata from images) support" >&5
+$as_echo_n "checking whether to enable EXIF (metadata from images) support... " >&6; }
 # Check whether --enable-exif was given.
-if test ${enable_exif+y}
-then :
+if test "${enable_exif+set}" = set; then :
   enableval=$enable_exif; PHP_EXIF=$enableval
-else case e in #(
-  e)
+else
+
   PHP_EXIF=no
   test "$PHP_ENABLE_ALL" && PHP_EXIF=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -36120,15 +32802,15 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_EXIF" != "no"; then
 
-printf "%s\n" "#define HAVE_EXIF 1" >>confdefs.h
+$as_echo "#define HAVE_EXIF 1" >>confdefs.h
 
 
   ext_builddir=ext/exif
@@ -36264,7 +32946,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_EXIF 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_EXIF 1
+_ACEOF
 
     fi
   fi
@@ -36393,19 +33077,17 @@
 
 php_with_ffi=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FFI support" >&5
-printf %s "checking for FFI support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFI support" >&5
+$as_echo_n "checking for FFI support... " >&6; }
 
 # Check whether --with-ffi was given.
-if test ${with_ffi+y}
-then :
+if test "${with_ffi+set}" = set; then :
   withval=$with_ffi; PHP_FFI=$withval
-else case e in #(
-  e)
+else
+
   PHP_FFI=no
   test "$PHP_ENABLE_ALL" && PHP_FFI=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -36431,8 +33113,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -36440,17 +33122,17 @@
 if test "$PHP_FFI" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libffi >= 3.0.11" >&5
-printf %s "checking for libffi >= 3.0.11... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libffi >= 3.0.11" >&5
+$as_echo_n "checking for libffi >= 3.0.11... " >&6; }
 
 if test -n "$FFI_CFLAGS"; then
     pkg_cv_FFI_CFLAGS="$FFI_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libffi >= 3.0.11") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi >= 3.0.11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -36464,10 +33146,10 @@
     pkg_cv_FFI_LIBS="$FFI_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libffi >= 3.0.11") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_FFI_LIBS=`$PKG_CONFIG --libs "libffi >= 3.0.11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -36481,8 +33163,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -36508,10 +33190,10 @@
 and FFI_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -36521,12 +33203,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	FFI_CFLAGS=$pkg_cv_FFI_CFLAGS
 	FFI_LIBS=$pkg_cv_FFI_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -36671,31 +33353,31 @@
 
 
 
-printf "%s\n" "#define HAVE_FFI 1" >>confdefs.h
+$as_echo "#define HAVE_FFI 1" >>confdefs.h
 
 
   ac_fn_c_check_type "$LINENO" "long double" "ac_cv_type_long_double" "$ac_includes_default"
-if test "x$ac_cv_type_long_double" = xyes
-then :
+if test "x$ac_cv_type_long_double" = xyes; then :
 
-printf "%s\n" "#define HAVE_LONG_DOUBLE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LONG_DOUBLE 1
+_ACEOF
 
 
 fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fastcall calling convention" >&5
-printf %s "checking for fastcall calling convention... " >&6; }
-if test ${ac_cv_ffi_fastcall+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fastcall calling convention" >&5
+$as_echo_n "checking for fastcall calling convention... " >&6; }
+if ${ac_cv_ffi_fastcall+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main (void)
+main ()
 {
 return FFI_FASTCALL
   ;
@@ -36703,38 +33385,34 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ffi_fastcall=yes
-else case e in #(
-  e) ac_cv_ffi_fastcall=no ;;
-esac
+else
+  ac_cv_ffi_fastcall=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_fastcall" >&5
-printf "%s\n" "$ac_cv_ffi_fastcall" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_fastcall" >&5
+$as_echo "$ac_cv_ffi_fastcall" >&6; }
 
   if test "$ac_cv_ffi_fastcall" = yes; then
 
-printf "%s\n" "#define HAVE_FFI_FASTCALL 1" >>confdefs.h
+$as_echo "#define HAVE_FFI_FASTCALL 1" >>confdefs.h
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for thiscall calling convention" >&5
-printf %s "checking for thiscall calling convention... " >&6; }
-if test ${ac_cv_ffi_thiscall+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thiscall calling convention" >&5
+$as_echo_n "checking for thiscall calling convention... " >&6; }
+if ${ac_cv_ffi_thiscall+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main (void)
+main ()
 {
 return FFI_THISCALL
   ;
@@ -36742,38 +33420,34 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ffi_thiscall=yes
-else case e in #(
-  e) ac_cv_ffi_thiscall=no ;;
-esac
+else
+  ac_cv_ffi_thiscall=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_thiscall" >&5
-printf "%s\n" "$ac_cv_ffi_thiscall" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_thiscall" >&5
+$as_echo "$ac_cv_ffi_thiscall" >&6; }
 
   if test "$ac_cv_ffi_thiscall" = yes; then
 
-printf "%s\n" "#define HAVE_FFI_THISCALL 1" >>confdefs.h
+$as_echo "#define HAVE_FFI_THISCALL 1" >>confdefs.h
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdcall calling convention" >&5
-printf %s "checking for stdcall calling convention... " >&6; }
-if test ${ac_cv_ffi_stdcall+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdcall calling convention" >&5
+$as_echo_n "checking for stdcall calling convention... " >&6; }
+if ${ac_cv_ffi_stdcall+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main (void)
+main ()
 {
 return FFI_STDCALL
   ;
@@ -36781,38 +33455,34 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ffi_stdcall=yes
-else case e in #(
-  e) ac_cv_ffi_stdcall=no ;;
-esac
+else
+  ac_cv_ffi_stdcall=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_stdcall" >&5
-printf "%s\n" "$ac_cv_ffi_stdcall" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_stdcall" >&5
+$as_echo "$ac_cv_ffi_stdcall" >&6; }
 
   if test "$ac_cv_ffi_stdcall" = yes; then
 
-printf "%s\n" "#define HAVE_FFI_STDCALL 1" >>confdefs.h
+$as_echo "#define HAVE_FFI_STDCALL 1" >>confdefs.h
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pascal calling convention" >&5
-printf %s "checking for pascal calling convention... " >&6; }
-if test ${ac_cv_ffi_pascal+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pascal calling convention" >&5
+$as_echo_n "checking for pascal calling convention... " >&6; }
+if ${ac_cv_ffi_pascal+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main (void)
+main ()
 {
 return FFI_PASCAL
   ;
@@ -36820,38 +33490,34 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ffi_pascal=yes
-else case e in #(
-  e) ac_cv_ffi_pascal=no ;;
-esac
+else
+  ac_cv_ffi_pascal=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_pascal" >&5
-printf "%s\n" "$ac_cv_ffi_pascal" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_pascal" >&5
+$as_echo "$ac_cv_ffi_pascal" >&6; }
 
   if test "$ac_cv_ffi_pascal" = yes; then
 
-printf "%s\n" "#define HAVE_FFI_PASCAL 1" >>confdefs.h
+$as_echo "#define HAVE_FFI_PASCAL 1" >>confdefs.h
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for register calling convention" >&5
-printf %s "checking for register calling convention... " >&6; }
-if test ${ac_cv_ffi_register+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for register calling convention" >&5
+$as_echo_n "checking for register calling convention... " >&6; }
+if ${ac_cv_ffi_register+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main (void)
+main ()
 {
 return FFI_REGISTER
   ;
@@ -36859,38 +33525,34 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ffi_register=yes
-else case e in #(
-  e) ac_cv_ffi_register=no ;;
-esac
+else
+  ac_cv_ffi_register=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_register" >&5
-printf "%s\n" "$ac_cv_ffi_register" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_register" >&5
+$as_echo "$ac_cv_ffi_register" >&6; }
 
   if test "$ac_cv_ffi_register" = yes; then
 
-printf "%s\n" "#define HAVE_FFI_REGISTER 1" >>confdefs.h
+$as_echo "#define HAVE_FFI_REGISTER 1" >>confdefs.h
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ms_cdecl calling convention" >&5
-printf %s "checking for ms_cdecl calling convention... " >&6; }
-if test ${ac_cv_ffi_ms_cdecl+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ms_cdecl calling convention" >&5
+$as_echo_n "checking for ms_cdecl calling convention... " >&6; }
+if ${ac_cv_ffi_ms_cdecl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main (void)
+main ()
 {
 return FFI_MS_CDECL
   ;
@@ -36898,38 +33560,34 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ffi_ms_cdecl=yes
-else case e in #(
-  e) ac_cv_ffi_ms_cdecl=no ;;
-esac
+else
+  ac_cv_ffi_ms_cdecl=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_ms_cdecl" >&5
-printf "%s\n" "$ac_cv_ffi_ms_cdecl" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_ms_cdecl" >&5
+$as_echo "$ac_cv_ffi_ms_cdecl" >&6; }
 
   if test "$ac_cv_ffi_ms_cdecl" = yes; then
 
-printf "%s\n" "#define HAVE_FFI_MS_CDECL 1" >>confdefs.h
+$as_echo "#define HAVE_FFI_MS_CDECL 1" >>confdefs.h
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysv calling convention" >&5
-printf %s "checking for sysv calling convention... " >&6; }
-if test ${ac_cv_ffi_sysv+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysv calling convention" >&5
+$as_echo_n "checking for sysv calling convention... " >&6; }
+if ${ac_cv_ffi_sysv+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main (void)
+main ()
 {
 return FFI_SYSV
   ;
@@ -36937,23 +33595,20 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ffi_sysv=yes
-else case e in #(
-  e) ac_cv_ffi_sysv=no ;;
-esac
+else
+  ac_cv_ffi_sysv=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_sysv" >&5
-printf "%s\n" "$ac_cv_ffi_sysv" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_sysv" >&5
+$as_echo "$ac_cv_ffi_sysv" >&6; }
 
   if test "$ac_cv_ffi_sysv" = yes; then
 
-printf "%s\n" "#define HAVE_FFI_SYSV 1" >>confdefs.h
+$as_echo "#define HAVE_FFI_SYSV 1" >>confdefs.h
 
   fi
 
@@ -37091,7 +33746,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_FFI 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_FFI 1
+_ACEOF
 
     fi
   fi
@@ -37223,18 +33880,16 @@
 
 php_enable_fileinfo=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fileinfo support" >&5
-printf %s "checking for fileinfo support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fileinfo support" >&5
+$as_echo_n "checking for fileinfo support... " >&6; }
 # Check whether --enable-fileinfo was given.
-if test ${enable_fileinfo+y}
-then :
+if test "${enable_fileinfo+set}" = set; then :
   enableval=$enable_fileinfo; PHP_FILEINFO=$enableval
-else case e in #(
-  e)
+else
+
   PHP_FILEINFO=yes
   test "$PHP_ENABLE_ALL" && PHP_FILEINFO=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -37260,8 +33915,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -37276,14 +33931,13 @@
     libmagic/readcdf.c libmagic/softmagic.c libmagic/der.c \
     libmagic/buffer.c libmagic/is_csv.c"
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strcasestr" >&5
-printf %s "checking for strcasestr... " >&6; }
-  if test "$cross_compiling" = yes
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: skipped, cross-compiling" >&5
-printf "%s\n" "skipped, cross-compiling" >&6; }
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasestr" >&5
+$as_echo_n "checking for strcasestr... " >&6; }
+  if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped, cross-compiling" >&5
+$as_echo "skipped, cross-compiling" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -37312,25 +33966,22 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using libmagic strcasestr implementation" >&5
-printf "%s\n" "$as_me: using libmagic strcasestr implementation" >&6;}
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: using libmagic strcasestr implementation" >&5
+$as_echo "$as_me: using libmagic strcasestr implementation" >&6;}
     libmagic_sources="$libmagic_sources libmagic/strcasestr.c"
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
@@ -37468,7 +34119,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_FILEINFO 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_FILEINFO 1
+_ACEOF
 
     fi
   fi
@@ -37595,18 +34248,17 @@
 
 
 
-  ac_fn_c_check_func "$LINENO" "utimes" "ac_cv_func_utimes"
-if test "x$ac_cv_func_utimes" = xyes
-then :
-  printf "%s\n" "#define HAVE_UTIMES 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup"
-if test "x$ac_cv_func_strndup" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRNDUP 1" >>confdefs.h
+  for ac_func in utimes strndup
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
 
@@ -37623,18 +34275,16 @@
 
 php_enable_filter=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable input filter support" >&5
-printf %s "checking whether to enable input filter support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable input filter support" >&5
+$as_echo_n "checking whether to enable input filter support... " >&6; }
 # Check whether --enable-filter was given.
-if test ${enable_filter+y}
-then :
+if test "${enable_filter+set}" = set; then :
   enableval=$enable_filter; PHP_FILTER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_FILTER=yes
   test "$PHP_ENABLE_ALL" && PHP_FILTER=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -37660,8 +34310,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -37801,7 +34451,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_FILTER 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_FILTER 1
+_ACEOF
 
     fi
   fi
@@ -37971,18 +34623,16 @@
 
 php_enable_ftp=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable FTP support" >&5
-printf %s "checking whether to enable FTP support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable FTP support" >&5
+$as_echo_n "checking whether to enable FTP support... " >&6; }
 # Check whether --enable-ftp was given.
-if test ${enable_ftp+y}
-then :
+if test "${enable_ftp+set}" = set; then :
   enableval=$enable_ftp; PHP_FTP=$enableval
-else case e in #(
-  e)
+else
+
   PHP_FTP=no
   test "$PHP_ENABLE_ALL" && PHP_FTP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -38008,8 +34658,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38017,32 +34667,30 @@
 
 php_with_openssl_dir=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to explicitly enable FTP SSL support" >&5
-printf %s "checking whether to explicitly enable FTP SSL support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to explicitly enable FTP SSL support" >&5
+$as_echo_n "checking whether to explicitly enable FTP SSL support... " >&6; }
 
 # Check whether --with-openssl-dir was given.
-if test ${with_openssl_dir+y}
-then :
+if test "${with_openssl_dir+set}" = set; then :
   withval=$with_openssl_dir; PHP_OPENSSL_DIR=$withval
-else case e in #(
-  e)
+else
+
   PHP_OPENSSL_DIR=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_OPENSSL_DIR
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_FTP" = "yes"; then
 
-printf "%s\n" "#define HAVE_FTP 1" >>confdefs.h
+$as_echo "#define HAVE_FTP 1" >>confdefs.h
 
 
   ext_builddir=ext/ftp
@@ -38178,7 +34826,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_FTP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_FTP 1
+_ACEOF
 
     fi
   fi
@@ -38308,17 +34958,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
-printf %s "checking for openssl >= 1.0.2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
+$as_echo_n "checking for openssl >= 1.0.2... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -38332,10 +34982,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -38349,8 +34999,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -38376,10 +35026,10 @@
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -38389,12 +35039,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	found_openssl=yes
 fi
 
@@ -38546,7 +35196,7 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST FTP_SHARED_LIBADD"
 
 
-printf "%s\n" "#define HAVE_FTP_SSL 1" >>confdefs.h
+$as_echo "#define HAVE_FTP_SSL 1" >>confdefs.h
 
   fi
 fi
@@ -38557,18 +35207,16 @@
 
 php_enable_gd=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GD support" >&5
-printf %s "checking for GD support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GD support" >&5
+$as_echo_n "checking for GD support... " >&6; }
 # Check whether --enable-gd was given.
-if test ${enable_gd+y}
-then :
+if test "${enable_gd+set}" = set; then :
   enableval=$enable_gd; PHP_GD=$enableval
-else case e in #(
-  e)
+else
+
   PHP_GD=no
   test "$PHP_ENABLE_ALL" && PHP_GD=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -38594,8 +35242,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38603,25 +35251,23 @@
 
 php_with_external_gd=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for external libgd" >&5
-printf %s "checking for external libgd... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for external libgd" >&5
+$as_echo_n "checking for external libgd... " >&6; }
 
 # Check whether --with-external-gd was given.
-if test ${with_external_gd+y}
-then :
+if test "${with_external_gd+set}" = set; then :
   withval=$with_external_gd; PHP_EXTERNAL_GD=$withval
-else case e in #(
-  e)
+else
+
   PHP_EXTERNAL_GD=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_EXTERNAL_GD
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38630,25 +35276,23 @@
 
 php_with_avif=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libavif" >&5
-printf %s "checking for libavif... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libavif" >&5
+$as_echo_n "checking for libavif... " >&6; }
 
 # Check whether --with-avif was given.
-if test ${with_avif+y}
-then :
+if test "${with_avif+set}" = set; then :
   withval=$with_avif; PHP_AVIF=$withval
-else case e in #(
-  e)
+else
+
   PHP_AVIF=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_AVIF
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38658,25 +35302,23 @@
 
 php_with_webp=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libwebp" >&5
-printf %s "checking for libwebp... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwebp" >&5
+$as_echo_n "checking for libwebp... " >&6; }
 
 # Check whether --with-webp was given.
-if test ${with_webp+y}
-then :
+if test "${with_webp+set}" = set; then :
   withval=$with_webp; PHP_WEBP=$withval
-else case e in #(
-  e)
+else
+
   PHP_WEBP=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_WEBP
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38686,25 +35328,23 @@
 
 php_with_jpeg=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
-printf %s "checking for libjpeg... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
+$as_echo_n "checking for libjpeg... " >&6; }
 
 # Check whether --with-jpeg was given.
-if test ${with_jpeg+y}
-then :
+if test "${with_jpeg+set}" = set; then :
   withval=$with_jpeg; PHP_JPEG=$withval
-else case e in #(
-  e)
+else
+
   PHP_JPEG=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_JPEG
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38713,25 +35353,23 @@
 
 php_with_xpm=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libXpm" >&5
-printf %s "checking for libXpm... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libXpm" >&5
+$as_echo_n "checking for libXpm... " >&6; }
 
 # Check whether --with-xpm was given.
-if test ${with_xpm+y}
-then :
+if test "${with_xpm+set}" = set; then :
   withval=$with_xpm; PHP_XPM=$withval
-else case e in #(
-  e)
+else
+
   PHP_XPM=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_XPM
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38739,25 +35377,23 @@
 
 php_with_freetype=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FreeType 2" >&5
-printf %s "checking for FreeType 2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeType 2" >&5
+$as_echo_n "checking for FreeType 2... " >&6; }
 
 # Check whether --with-freetype was given.
-if test ${with_freetype+y}
-then :
+if test "${with_freetype+set}" = set; then :
   withval=$with_freetype; PHP_FREETYPE=$withval
-else case e in #(
-  e)
+else
+
   PHP_FREETYPE=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_FREETYPE
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38765,24 +35401,22 @@
 
 php_enable_gd_jis_conv=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable JIS-mapped Japanese font support in GD" >&5
-printf %s "checking whether to enable JIS-mapped Japanese font support in GD... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable JIS-mapped Japanese font support in GD" >&5
+$as_echo_n "checking whether to enable JIS-mapped Japanese font support in GD... " >&6; }
 # Check whether --enable-gd-jis-conv was given.
-if test ${enable_gd_jis_conv+y}
-then :
+if test "${enable_gd_jis_conv+set}" = set; then :
   enableval=$enable_gd_jis_conv; PHP_GD_JIS_CONV=$enableval
-else case e in #(
-  e)
+else
+
   PHP_GD_JIS_CONV=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_GD_JIS_CONV
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38822,47 +35456,46 @@
                   libgd/gd_transform.c libgd/gd_crop.c libgd/gd_interpolation.c libgd/gd_matrix.c \
                   libgd/gd_bmp.c libgd/gd_tga.c"
 
-    ac_fn_c_check_func "$LINENO" "fabsf" "ac_cv_func_fabsf"
-if test "x$ac_cv_func_fabsf" = xyes
-then :
-  printf "%s\n" "#define HAVE_FABSF 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "floorf" "ac_cv_func_floorf"
-if test "x$ac_cv_func_floorf" = xyes
-then :
-  printf "%s\n" "#define HAVE_FLOORF 1" >>confdefs.h
+    for ac_func in fabsf floorf
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
 
-printf "%s\n" "#define HAVE_GD_BUNDLED 1" >>confdefs.h
+$as_echo "#define HAVE_GD_BUNDLED 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_PNG 1" >>confdefs.h
+$as_echo "#define HAVE_GD_PNG 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_BMP 1" >>confdefs.h
+$as_echo "#define HAVE_GD_BMP 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_TGA 1" >>confdefs.h
+$as_echo "#define HAVE_GD_TGA 1" >>confdefs.h
 
 
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
-printf %s "checking for zlib... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
+$as_echo_n "checking for zlib... " >&6; }
 
 if test -n "$ZLIB_CFLAGS"; then
     pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "zlib" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -38876,10 +35509,10 @@
     pkg_cv_ZLIB_LIBS="$ZLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "zlib" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -38893,8 +35526,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -38920,10 +35553,10 @@
 and ZLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -38933,12 +35566,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
 	ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -39084,17 +35717,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5
-printf %s "checking for libpng... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5
+$as_echo_n "checking for libpng... " >&6; }
 
 if test -n "$PNG_CFLAGS"; then
     pkg_cv_PNG_CFLAGS="$PNG_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39108,10 +35741,10 @@
     pkg_cv_PNG_LIBS="$PNG_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39125,8 +35758,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -39152,10 +35785,10 @@
 and PNG_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -39165,12 +35798,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	PNG_CFLAGS=$pkg_cv_PNG_CFLAGS
 	PNG_LIBS=$pkg_cv_PNG_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -39313,24 +35946,24 @@
   done
 
 
-printf "%s\n" "#define HAVE_LIBPNG 1" >>confdefs.h
+$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
 
 
 
   if test "$PHP_AVIF" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libavif >= 0.8.2" >&5
-printf %s "checking for libavif >= 0.8.2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libavif >= 0.8.2" >&5
+$as_echo_n "checking for libavif >= 0.8.2... " >&6; }
 
 if test -n "$AVIF_CFLAGS"; then
     pkg_cv_AVIF_CFLAGS="$AVIF_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libavif >= 0.8.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_AVIF_CFLAGS=`$PKG_CONFIG --cflags "libavif >= 0.8.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39344,10 +35977,10 @@
     pkg_cv_AVIF_LIBS="$AVIF_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libavif >= 0.8.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_AVIF_LIBS=`$PKG_CONFIG --libs "libavif >= 0.8.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39361,8 +35994,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -39388,10 +36021,10 @@
 and AVIF_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -39401,12 +36034,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	AVIF_CFLAGS=$pkg_cv_AVIF_CFLAGS
 	AVIF_LIBS=$pkg_cv_AVIF_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -39549,10 +36182,10 @@
   done
 
 
-printf "%s\n" "#define HAVE_LIBAVIF 1" >>confdefs.h
+$as_echo "#define HAVE_LIBAVIF 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_AVIF 1" >>confdefs.h
+$as_echo "#define HAVE_GD_AVIF 1" >>confdefs.h
 
   fi
 
@@ -39560,17 +36193,17 @@
   if test "$PHP_WEBP" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libwebp >= 0.2.0" >&5
-printf %s "checking for libwebp >= 0.2.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwebp >= 0.2.0" >&5
+$as_echo_n "checking for libwebp >= 0.2.0... " >&6; }
 
 if test -n "$WEBP_CFLAGS"; then
     pkg_cv_WEBP_CFLAGS="$WEBP_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libwebp >= 0.2.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_WEBP_CFLAGS=`$PKG_CONFIG --cflags "libwebp >= 0.2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39584,10 +36217,10 @@
     pkg_cv_WEBP_LIBS="$WEBP_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libwebp >= 0.2.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_WEBP_LIBS=`$PKG_CONFIG --libs "libwebp >= 0.2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39601,8 +36234,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -39628,10 +36261,10 @@
 and WEBP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -39641,12 +36274,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	WEBP_CFLAGS=$pkg_cv_WEBP_CFLAGS
 	WEBP_LIBS=$pkg_cv_WEBP_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -39789,10 +36422,10 @@
   done
 
 
-printf "%s\n" "#define HAVE_LIBWEBP 1" >>confdefs.h
+$as_echo "#define HAVE_LIBWEBP 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_WEBP 1" >>confdefs.h
+$as_echo "#define HAVE_GD_WEBP 1" >>confdefs.h
 
   fi
 
@@ -39800,17 +36433,17 @@
   if test "$PHP_JPEG" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
-printf %s "checking for libjpeg... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
+$as_echo_n "checking for libjpeg... " >&6; }
 
 if test -n "$JPEG_CFLAGS"; then
     pkg_cv_JPEG_CFLAGS="$JPEG_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libjpeg") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_JPEG_CFLAGS=`$PKG_CONFIG --cflags "libjpeg" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39824,10 +36457,10 @@
     pkg_cv_JPEG_LIBS="$JPEG_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libjpeg") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_JPEG_LIBS=`$PKG_CONFIG --libs "libjpeg" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39841,8 +36474,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -39868,10 +36501,10 @@
 and JPEG_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -39881,12 +36514,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	JPEG_CFLAGS=$pkg_cv_JPEG_CFLAGS
 	JPEG_LIBS=$pkg_cv_JPEG_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -40029,10 +36662,10 @@
   done
 
 
-printf "%s\n" "#define HAVE_LIBJPEG 1" >>confdefs.h
+$as_echo "#define HAVE_LIBJPEG 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_JPG 1" >>confdefs.h
+$as_echo "#define HAVE_GD_JPG 1" >>confdefs.h
 
   fi
 
@@ -40040,17 +36673,17 @@
   if test "$PHP_XPM" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xpm" >&5
-printf %s "checking for xpm... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xpm" >&5
+$as_echo_n "checking for xpm... " >&6; }
 
 if test -n "$XPM_CFLAGS"; then
     pkg_cv_XPM_CFLAGS="$XPM_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xpm") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XPM_CFLAGS=`$PKG_CONFIG --cflags "xpm" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -40064,10 +36697,10 @@
     pkg_cv_XPM_LIBS="$XPM_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xpm") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XPM_LIBS=`$PKG_CONFIG --libs "xpm" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -40081,8 +36714,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -40108,10 +36741,10 @@
 and XPM_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -40121,12 +36754,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	XPM_CFLAGS=$pkg_cv_XPM_CFLAGS
 	XPM_LIBS=$pkg_cv_XPM_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -40269,10 +36902,10 @@
   done
 
 
-printf "%s\n" "#define HAVE_XPM 1" >>confdefs.h
+$as_echo "#define HAVE_XPM 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_XPM 1" >>confdefs.h
+$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h
 
   fi
 
@@ -40280,17 +36913,17 @@
   if test "$PHP_FREETYPE" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
-printf %s "checking for freetype2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
+$as_echo_n "checking for freetype2... " >&6; }
 
 if test -n "$FREETYPE2_CFLAGS"; then
     pkg_cv_FREETYPE2_CFLAGS="$FREETYPE2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -40304,10 +36937,10 @@
     pkg_cv_FREETYPE2_LIBS="$FREETYPE2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_FREETYPE2_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -40321,8 +36954,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -40348,10 +36981,10 @@
 and FREETYPE2_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -40361,12 +36994,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	FREETYPE2_CFLAGS=$pkg_cv_FREETYPE2_CFLAGS
 	FREETYPE2_LIBS=$pkg_cv_FREETYPE2_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	FREETYPE2_FOUND=true
 fi
 
@@ -40510,20 +37143,20 @@
   done
 
 
-printf "%s\n" "#define HAVE_LIBFREETYPE 1" >>confdefs.h
+$as_echo "#define HAVE_LIBFREETYPE 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_FREETYPE 1" >>confdefs.h
+$as_echo "#define HAVE_GD_FREETYPE 1" >>confdefs.h
 
   fi
 
 
   if test "$PHP_GD_JIS_CONV" = "yes"; then
 
-printf "%s\n" "#define USE_GD_JISX0208 1" >>confdefs.h
+$as_echo "#define USE_GD_JISX0208 1" >>confdefs.h
 
 
-printf "%s\n" "#define JISX0208 1" >>confdefs.h
+$as_echo "#define JISX0208 1" >>confdefs.h
 
   fi
 
@@ -40662,7 +37295,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_GD 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_GD 1
+_ACEOF
 
     fi
   fi
@@ -40805,22 +37440,20 @@
     }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     LIBS=$old_LIBS
 
 
-else case e in #(
-  e)
+else
+
     LIBS=$old_LIBS
 
       as_fn_error $? "GD build test failed. Please check the config.log for details." "$LINENO" 5
 
-   ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
@@ -40828,17 +37461,17 @@
     extra_sources="gd_compat.c"
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdlib >= 2.1.0" >&5
-printf %s "checking for gdlib >= 2.1.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdlib >= 2.1.0" >&5
+$as_echo_n "checking for gdlib >= 2.1.0... " >&6; }
 
 if test -n "$GDLIB_CFLAGS"; then
     pkg_cv_GDLIB_CFLAGS="$GDLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gdlib >= 2.1.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GDLIB_CFLAGS=`$PKG_CONFIG --cflags "gdlib >= 2.1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -40852,10 +37485,10 @@
     pkg_cv_GDLIB_LIBS="$GDLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gdlib >= 2.1.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GDLIB_LIBS=`$PKG_CONFIG --libs "gdlib >= 2.1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -40869,8 +37502,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -40896,10 +37529,10 @@
 and GDLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -40909,12 +37542,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	GDLIB_CFLAGS=$pkg_cv_GDLIB_CFLAGS
 	GDLIB_LIBS=$pkg_cv_GDLIB_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -41057,7 +37690,7 @@
   done
 
 
-printf "%s\n" "#define HAVE_LIBGD 1" >>confdefs.h
+$as_echo "#define HAVE_LIBGD 1" >>confdefs.h
 
 
 
@@ -41065,22 +37698,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromPng in libgd" >&5
-printf %s "checking for working gdImageCreateFromPng in libgd... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromPng in libgd" >&5
+$as_echo_n "checking for working gdImageCreateFromPng in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -41101,25 +37733,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_GD_PNG 1" >>confdefs.h
+$as_echo "#define HAVE_GD_PNG 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   ac_ext=c
@@ -41136,22 +37765,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromAvif in libgd" >&5
-printf %s "checking for working gdImageCreateFromAvif in libgd... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromAvif in libgd" >&5
+$as_echo_n "checking for working gdImageCreateFromAvif in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -41172,25 +37800,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_GD_AVIF 1" >>confdefs.h
+$as_echo "#define HAVE_GD_AVIF 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   ac_ext=c
@@ -41207,22 +37832,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromWebp in libgd" >&5
-printf %s "checking for working gdImageCreateFromWebp in libgd... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromWebp in libgd" >&5
+$as_echo_n "checking for working gdImageCreateFromWebp in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -41243,25 +37867,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_GD_WEBP 1" >>confdefs.h
+$as_echo "#define HAVE_GD_WEBP 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   ac_ext=c
@@ -41278,22 +37899,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromJpeg in libgd" >&5
-printf %s "checking for working gdImageCreateFromJpeg in libgd... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromJpeg in libgd" >&5
+$as_echo_n "checking for working gdImageCreateFromJpeg in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -41314,25 +37934,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_GD_JPG 1" >>confdefs.h
+$as_echo "#define HAVE_GD_JPG 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   ac_ext=c
@@ -41349,22 +37966,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromXpm in libgd" >&5
-printf %s "checking for working gdImageCreateFromXpm in libgd... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromXpm in libgd" >&5
+$as_echo_n "checking for working gdImageCreateFromXpm in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -41385,25 +38001,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_GD_XPM 1" >>confdefs.h
+$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   ac_ext=c
@@ -41420,22 +38033,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromBmp in libgd" >&5
-printf %s "checking for working gdImageCreateFromBmp in libgd... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromBmp in libgd" >&5
+$as_echo_n "checking for working gdImageCreateFromBmp in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -41456,25 +38068,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_GD_BMP 1" >>confdefs.h
+$as_echo "#define HAVE_GD_BMP 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   ac_ext=c
@@ -41491,22 +38100,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromTga in libgd" >&5
-printf %s "checking for working gdImageCreateFromTga in libgd... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromTga in libgd" >&5
+$as_echo_n "checking for working gdImageCreateFromTga in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -41527,25 +38135,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_GD_TGA 1" >>confdefs.h
+$as_echo "#define HAVE_GD_TGA 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   ac_ext=c
@@ -41662,66 +38267,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdFontCacheShutdown in -lgd" >&5
-printf %s "checking for gdFontCacheShutdown in -lgd... " >&6; }
-if test ${ac_cv_lib_gd_gdFontCacheShutdown+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdFontCacheShutdown in -lgd" >&5
+$as_echo_n "checking for gdFontCacheShutdown in -lgd... " >&6; }
+if ${ac_cv_lib_gd_gdFontCacheShutdown+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gdFontCacheShutdown (void);
+char gdFontCacheShutdown ();
 int
-main (void)
+main ()
 {
 return gdFontCacheShutdown ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdFontCacheShutdown=yes
-else case e in #(
-  e) ac_cv_lib_gd_gdFontCacheShutdown=no ;;
-esac
+else
+  ac_cv_lib_gd_gdFontCacheShutdown=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdFontCacheShutdown" >&5
-printf "%s\n" "$ac_cv_lib_gd_gdFontCacheShutdown" >&6; }
-if test "x$ac_cv_lib_gd_gdFontCacheShutdown" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdFontCacheShutdown" >&5
+$as_echo "$ac_cv_lib_gd_gdFontCacheShutdown" >&6; }
+if test "x$ac_cv_lib_gd_gdFontCacheShutdown" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-printf "%s\n" "#define HAVE_GD_FREETYPE 1" >>confdefs.h
+$as_echo "#define HAVE_GD_FREETYPE 1" >>confdefs.h
+
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdFontCacheShutdown
 
-   ;;
-esac
+
 fi
 
 
@@ -41829,66 +38425,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdVersionString in -lgd" >&5
-printf %s "checking for gdVersionString in -lgd... " >&6; }
-if test ${ac_cv_lib_gd_gdVersionString+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdVersionString in -lgd" >&5
+$as_echo_n "checking for gdVersionString in -lgd... " >&6; }
+if ${ac_cv_lib_gd_gdVersionString+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gdVersionString (void);
+char gdVersionString ();
 int
-main (void)
+main ()
 {
 return gdVersionString ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdVersionString=yes
-else case e in #(
-  e) ac_cv_lib_gd_gdVersionString=no ;;
-esac
+else
+  ac_cv_lib_gd_gdVersionString=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdVersionString" >&5
-printf "%s\n" "$ac_cv_lib_gd_gdVersionString" >&6; }
-if test "x$ac_cv_lib_gd_gdVersionString" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdVersionString" >&5
+$as_echo "$ac_cv_lib_gd_gdVersionString" >&6; }
+if test "x$ac_cv_lib_gd_gdVersionString" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-printf "%s\n" "#define HAVE_GD_LIBVERSION 1" >>confdefs.h
+$as_echo "#define HAVE_GD_LIBVERSION 1" >>confdefs.h
+
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdVersionString
 
-   ;;
-esac
+
 fi
 
 
@@ -41996,66 +38583,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdImageGetInterpolationMethod in -lgd" >&5
-printf %s "checking for gdImageGetInterpolationMethod in -lgd... " >&6; }
-if test ${ac_cv_lib_gd_gdImageGetInterpolationMethod+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageGetInterpolationMethod in -lgd" >&5
+$as_echo_n "checking for gdImageGetInterpolationMethod in -lgd... " >&6; }
+if ${ac_cv_lib_gd_gdImageGetInterpolationMethod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gdImageGetInterpolationMethod (void);
+char gdImageGetInterpolationMethod ();
 int
-main (void)
+main ()
 {
 return gdImageGetInterpolationMethod ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageGetInterpolationMethod=yes
-else case e in #(
-  e) ac_cv_lib_gd_gdImageGetInterpolationMethod=no ;;
-esac
+else
+  ac_cv_lib_gd_gdImageGetInterpolationMethod=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageGetInterpolationMethod" >&5
-printf "%s\n" "$ac_cv_lib_gd_gdImageGetInterpolationMethod" >&6; }
-if test "x$ac_cv_lib_gd_gdImageGetInterpolationMethod" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageGetInterpolationMethod" >&5
+$as_echo "$ac_cv_lib_gd_gdImageGetInterpolationMethod" >&6; }
+if test "x$ac_cv_lib_gd_gdImageGetInterpolationMethod" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-printf "%s\n" "#define HAVE_GD_GET_INTERPOLATION 1" >>confdefs.h
+$as_echo "#define HAVE_GD_GET_INTERPOLATION 1" >>confdefs.h
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageGetInterpolationMethod
 
-   ;;
-esac
+
 fi
 
 
@@ -42194,7 +38772,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_GD 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_GD 1
+_ACEOF
 
     fi
   fi
@@ -42421,66 +39001,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdImageCreate in -lgd" >&5
-printf %s "checking for gdImageCreate in -lgd... " >&6; }
-if test ${ac_cv_lib_gd_gdImageCreate+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreate in -lgd" >&5
+$as_echo_n "checking for gdImageCreate in -lgd... " >&6; }
+if ${ac_cv_lib_gd_gdImageCreate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gdImageCreate (void);
+char gdImageCreate ();
 int
-main (void)
+main ()
 {
 return gdImageCreate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageCreate=yes
-else case e in #(
-  e) ac_cv_lib_gd_gdImageCreate=no ;;
-esac
+else
+  ac_cv_lib_gd_gdImageCreate=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreate" >&5
-printf "%s\n" "$ac_cv_lib_gd_gdImageCreate" >&6; }
-if test "x$ac_cv_lib_gd_gdImageCreate" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreate" >&5
+$as_echo "$ac_cv_lib_gd_gdImageCreate" >&6; }
+if test "x$ac_cv_lib_gd_gdImageCreate" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageCreate
 
       as_fn_error $? "GD build test failed. Please check the config.log for details." "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
   fi
@@ -42523,19 +39094,17 @@
 
 php_with_gettext=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext support" >&5
-printf %s "checking for GNU gettext support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext support" >&5
+$as_echo_n "checking for GNU gettext support... " >&6; }
 
 # Check whether --with-gettext was given.
-if test ${with_gettext+y}
-then :
+if test "${with_gettext+set}" = set; then :
   withval=$with_gettext; PHP_GETTEXT=$withval
-else case e in #(
-  e)
+else
+
   PHP_GETTEXT=no
   test "$PHP_ENABLE_ALL" && PHP_GETTEXT=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -42561,8 +39130,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -42581,119 +39150,101 @@
 
   O_LDFLAGS=$LDFLAGS
   LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
-printf %s "checking for bindtextdomain in -lintl... " >&6; }
-if test ${ac_cv_lib_intl_bindtextdomain+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
+$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
+if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char bindtextdomain (void);
+char bindtextdomain ();
 int
-main (void)
+main ()
 {
 return bindtextdomain ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_intl_bindtextdomain=yes
-else case e in #(
-  e) ac_cv_lib_intl_bindtextdomain=no ;;
-esac
+else
+  ac_cv_lib_intl_bindtextdomain=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
-printf "%s\n" "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
+$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
+if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
 
 	GETTEXT_LIBS=intl
 	GETTEXT_CHECK_IN_LIB=intl
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lc" >&5
-printf %s "checking for bindtextdomain in -lc... " >&6; }
-if test ${ac_cv_lib_c_bindtextdomain+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lc" >&5
+$as_echo_n "checking for bindtextdomain in -lc... " >&6; }
+if ${ac_cv_lib_c_bindtextdomain+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char bindtextdomain (void);
+char bindtextdomain ();
 int
-main (void)
+main ()
 {
 return bindtextdomain ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_c_bindtextdomain=yes
-else case e in #(
-  e) ac_cv_lib_c_bindtextdomain=no ;;
-esac
+else
+  ac_cv_lib_c_bindtextdomain=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_bindtextdomain" >&5
-printf "%s\n" "$ac_cv_lib_c_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_c_bindtextdomain" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_bindtextdomain" >&5
+$as_echo "$ac_cv_lib_c_bindtextdomain" >&6; }
+if test "x$ac_cv_lib_c_bindtextdomain" = xyes; then :
 
 		GETTEXT_LIBS=
 		GETTEXT_CHECK_IN_LIB=c
 
-else case e in #(
-  e)
+else
+
 		as_fn_error $? "Unable to find required gettext library" "$LINENO" 5
-	 ;;
-esac
+
 fi
 
-   ;;
-esac
+
 fi
 
 
 
-printf "%s\n" "#define HAVE_LIBINTL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBINTL 1" >>confdefs.h
 
 
   ext_builddir=ext/gettext
@@ -42829,7 +39380,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_GETTEXT 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_GETTEXT 1
+_ACEOF
 
     fi
   fi
@@ -42986,211 +39539,179 @@
   fi
 
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_ngettext" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-printf %s "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_ngettext" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+$as_echo_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char ngettext (void);
+char ngettext ();
 int
-main (void)
+main ()
 {
 return ngettext ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-
-printf "%s\n" "#define HAVE_NGETTEXT 1" >>confdefs.h
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+
+$as_echo "#define HAVE_NGETTEXT 1" >>confdefs.h
 
 fi
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_dngettext" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-printf %s "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_dngettext" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+$as_echo_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dngettext (void);
+char dngettext ();
 int
-main (void)
+main ()
 {
 return dngettext ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-
-printf "%s\n" "#define HAVE_DNGETTEXT 1" >>confdefs.h
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+
+$as_echo "#define HAVE_DNGETTEXT 1" >>confdefs.h
 
 fi
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_dcngettext" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-printf %s "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_dcngettext" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+$as_echo_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dcngettext (void);
+char dcngettext ();
 int
-main (void)
+main ()
 {
 return dcngettext ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-
-printf "%s\n" "#define HAVE_DCNGETTEXT 1" >>confdefs.h
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+
+$as_echo "#define HAVE_DCNGETTEXT 1" >>confdefs.h
 
 fi
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_bind_textdomain_codeset" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
-printf %s "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_bind_textdomain_codeset" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
+$as_echo_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char bind_textdomain_codeset (void);
+char bind_textdomain_codeset ();
 int
-main (void)
+main ()
 {
 return bind_textdomain_codeset ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
-printf "%s\n" "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h
+$as_echo "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h
 
 fi
 
@@ -43303,19 +39824,17 @@
 
 php_with_gmp=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU MP support" >&5
-printf %s "checking for GNU MP support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU MP support" >&5
+$as_echo_n "checking for GNU MP support... " >&6; }
 
 # Check whether --with-gmp was given.
-if test ${with_gmp+y}
-then :
+if test "${with_gmp+set}" = set; then :
   withval=$with_gmp; PHP_GMP=$withval
-else case e in #(
-  e)
+else
+
   PHP_GMP=no
   test "$PHP_ENABLE_ALL" && PHP_GMP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -43341,8 +39860,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -43454,66 +39973,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gmpz_rootrem in -lgmp" >&5
-printf %s "checking for __gmpz_rootrem in -lgmp... " >&6; }
-if test ${ac_cv_lib_gmp___gmpz_rootrem+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_rootrem in -lgmp" >&5
+$as_echo_n "checking for __gmpz_rootrem in -lgmp... " >&6; }
+if ${ac_cv_lib_gmp___gmpz_rootrem+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgmp  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __gmpz_rootrem (void);
+char __gmpz_rootrem ();
 int
-main (void)
+main ()
 {
 return __gmpz_rootrem ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gmp___gmpz_rootrem=yes
-else case e in #(
-  e) ac_cv_lib_gmp___gmpz_rootrem=no ;;
-esac
+else
+  ac_cv_lib_gmp___gmpz_rootrem=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_rootrem" >&5
-printf "%s\n" "$ac_cv_lib_gmp___gmpz_rootrem" >&6; }
-if test "x$ac_cv_lib_gmp___gmpz_rootrem" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_rootrem" >&5
+$as_echo "$ac_cv_lib_gmp___gmpz_rootrem" >&6; }
+if test "x$ac_cv_lib_gmp___gmpz_rootrem" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gmp___gmpz_rootrem
 
       as_fn_error $? "GNU MP Library version 4.2 or greater required." "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -43652,66 +40162,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gmpz_rootrem in -lgmp" >&5
-printf %s "checking for __gmpz_rootrem in -lgmp... " >&6; }
-if test ${ac_cv_lib_gmp___gmpz_rootrem+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_rootrem in -lgmp" >&5
+$as_echo_n "checking for __gmpz_rootrem in -lgmp... " >&6; }
+if ${ac_cv_lib_gmp___gmpz_rootrem+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgmp  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __gmpz_rootrem (void);
+char __gmpz_rootrem ();
 int
-main (void)
+main ()
 {
 return __gmpz_rootrem ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gmp___gmpz_rootrem=yes
-else case e in #(
-  e) ac_cv_lib_gmp___gmpz_rootrem=no ;;
-esac
+else
+  ac_cv_lib_gmp___gmpz_rootrem=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_rootrem" >&5
-printf "%s\n" "$ac_cv_lib_gmp___gmpz_rootrem" >&6; }
-if test "x$ac_cv_lib_gmp___gmpz_rootrem" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_rootrem" >&5
+$as_echo "$ac_cv_lib_gmp___gmpz_rootrem" >&6; }
+if test "x$ac_cv_lib_gmp___gmpz_rootrem" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gmp___gmpz_rootrem
 
       as_fn_error $? "GNU MP Library version 4.2 or greater required." "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -43998,7 +40499,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_GMP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_GMP 1
+_ACEOF
 
     fi
   fi
@@ -44123,7 +40626,7 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST GMP_SHARED_LIBADD"
 
 
-printf "%s\n" "#define HAVE_GMP 1" >>confdefs.h
+$as_echo "#define HAVE_GMP 1" >>confdefs.h
 
 fi
 
@@ -44133,19 +40636,17 @@
 
 php_with_mhash=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mhash support" >&5
-printf %s "checking for mhash support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mhash support" >&5
+$as_echo_n "checking for mhash support... " >&6; }
 
 # Check whether --with-mhash was given.
-if test ${with_mhash+y}
-then :
+if test "${with_mhash+set}" = set; then :
   withval=$with_mhash; PHP_MHASH=$withval
-else case e in #(
-  e)
+else
+
   PHP_MHASH=no
   test "$PHP_ENABLE_ALL" && PHP_MHASH=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -44171,8 +40672,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -44183,113 +40684,103 @@
   fi
 
 
-printf "%s\n" "#define PHP_MHASH_BC 1" >>confdefs.h
+$as_echo "#define PHP_MHASH_BC 1" >>confdefs.h
 
 fi
 
 if test $ac_cv_c_bigendian_php = yes; then
   EXT_HASH_SHA3_SOURCES="hash_sha3.c"
 
-printf "%s\n" "#define HAVE_SLOW_HASH3 1" >>confdefs.h
+$as_echo "#define HAVE_SLOW_HASH3 1" >>confdefs.h
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"Use SHA3 slow implementation on bigendian\"" >&5
-printf "%s\n" "$as_me: WARNING: \"Use SHA3 slow implementation on bigendian\"" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Use SHA3 slow implementation on bigendian\"" >&5
+$as_echo "$as_me: WARNING: \"Use SHA3 slow implementation on bigendian\"" >&2;}
 else
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3(sizeof (unsigned char)) >= 0;'.
+# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-printf %s "checking size of long... " >&6; }
-if test ${ac_cv_sizeof_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-printf %s "checking if we're at 64-bit platform... " >&6; }
-  if test "$ac_cv_sizeof_long" -eq 4
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+$as_echo_n "checking if we're at 64-bit platform... " >&6; }
+  if test "$ac_cv_sizeof_long" -eq 4; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     SHA3_DIR="sha3/generic32lc"
     SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-inplace32BI.c"
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     SHA3_DIR="sha3/generic64lc"
     SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-opt64.c"
-   ;;
-esac
+
 fi
   EXT_HASH_SHA3_SOURCES="$SHA3_OPT_SRC $SHA3_DIR/KeccakHash.c $SHA3_DIR/KeccakSponge.c hash_sha3.c"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
-printf %s "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
+$as_echo_n "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wno-implicit-fallthrough"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes; then :
   PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -Wno-implicit-fallthrough"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
@@ -44453,7 +40944,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_HASH 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_HASH 1
+_ACEOF
 
     fi
   fi
@@ -44601,19 +41094,17 @@
 
 php_with_iconv=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv support" >&5
-printf %s "checking for iconv support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv support" >&5
+$as_echo_n "checking for iconv support... " >&6; }
 
 # Check whether --with-iconv was given.
-if test ${with_iconv+y}
-then :
+if test "${with_iconv+set}" = set; then :
   withval=$with_iconv; PHP_ICONV=$withval
-else case e in #(
-  e)
+else
+
   PHP_ICONV=yes
   test "$PHP_ENABLE_ALL" && PHP_ICONV=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -44639,8 +41130,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -44655,26 +41146,23 @@
         LIBS_save="$LIBS"
     LIBS=
     ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv"
-if test "x$ac_cv_func_iconv" = xyes
-then :
+if test "x$ac_cv_func_iconv" = xyes; then :
 
       found_iconv=yes
 
-else case e in #(
-  e)
+else
+
       ac_fn_c_check_func "$LINENO" "libiconv" "ac_cv_func_libiconv"
-if test "x$ac_cv_func_libiconv" = xyes
-then :
+if test "x$ac_cv_func_libiconv" = xyes; then :
 
 
-printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h
 
         found_iconv=yes
 
 fi
 
-     ;;
-esac
+
 fi
 
     LIBS="$LIBS_save"
@@ -44811,68 +41299,60 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$iconv_lib_name""_libiconv" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiconv in -l$iconv_lib_name" >&5
-printf %s "checking for libiconv in -l$iconv_lib_name... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$iconv_lib_name''_libiconv" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv in -l$iconv_lib_name" >&5
+$as_echo_n "checking for libiconv in -l$iconv_lib_name... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$iconv_lib_name  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char libiconv (void);
+char libiconv ();
 int
-main (void)
+main ()
 {
 return libiconv ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
         found_iconv=yes
 
-printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h
 
 
-printf "%s\n" "#define ICONV_ALIASED_LIBICONV 1" >>confdefs.h
+$as_echo "#define ICONV_ALIASED_LIBICONV 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$iconv_lib_name_libiconv
@@ -44984,53 +41464,45 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$iconv_lib_name""_iconv" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv in -l$iconv_lib_name" >&5
-printf %s "checking for iconv in -l$iconv_lib_name... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$iconv_lib_name''_iconv" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv in -l$iconv_lib_name" >&5
+$as_echo_n "checking for iconv in -l$iconv_lib_name... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$iconv_lib_name  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char iconv (void);
+char iconv ();
 int
-main (void)
+main ()
 {
 return iconv ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -45038,19 +41510,17 @@
           found_iconv=yes
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$iconv_lib_name_iconv
 
-   ;;
-esac
+
 fi
 
 
-   ;;
-esac
+
 fi
 
     fi
@@ -45058,7 +41528,7 @@
 
   if test "$found_iconv" = "yes"; then
 
-printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
 
     if test -n "$ICONV_DIR"; then
 
@@ -45205,47 +41675,44 @@
     LDFLAGS="$ICONV_SHARED_LIBADD $LDFLAGS"
     CFLAGS="$INCLUDES $CFLAGS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv is glibc's" >&5
-printf %s "checking if iconv is glibc's... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv is glibc's" >&5
+$as_echo_n "checking if iconv is glibc's... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <gnu/libc-version.h>
 int
-main (void)
+main ()
 {
 gnu_get_libc_version();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       iconv_impl_name="glibc"
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
     if test -z "$iconv_impl_name"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if using GNU libiconv" >&5
-printf %s "checking if using GNU libiconv... " >&6; }
-      if test "$cross_compiling" = yes
-then :
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if using GNU libiconv" >&5
+$as_echo_n "checking if using GNU libiconv... " >&6; }
+      if test "$cross_compiling" = yes; then :
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, cross-compiling" >&5
-printf "%s\n" "no, cross-compiling" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, cross-compiling" >&5
+$as_echo "no, cross-compiling" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <iconv.h>
@@ -45255,138 +41722,130 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         iconv_impl_name="gnu_libiconv"
 
-else case e in #(
-  e)
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-       ;;
-esac
+else
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     fi
 
     if test -z "$iconv_impl_name"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv is Konstantin Chuguev's" >&5
-printf %s "checking if iconv is Konstantin Chuguev's... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv is Konstantin Chuguev's" >&5
+$as_echo_n "checking if iconv is Konstantin Chuguev's... " >&6; }
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iconv.h>
 int
-main (void)
+main ()
 {
 iconv_ccs_init(NULL, NULL);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         iconv_impl_name="bsd"
 
-else case e in #(
-  e)
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-       ;;
-esac
+else
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     fi
 
     if test -z "$iconv_impl_name"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if using IBM iconv" >&5
-printf %s "checking if using IBM iconv... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if using IBM iconv" >&5
+$as_echo_n "checking if using IBM iconv... " >&6; }
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iconv.h>
 int
-main (void)
+main ()
 {
 cstoccsid("");
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         iconv_impl_name="ibm"
 
-else case e in #(
-  e)
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-       ;;
-esac
+else
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     fi
 
     case "$iconv_impl_name" in
       gnu_libiconv )
 
-printf "%s\n" "#define PHP_ICONV_IMPL \"libiconv\"" >>confdefs.h
+$as_echo "#define PHP_ICONV_IMPL \"libiconv\"" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h
 
         ;;
 
       bsd )
 
-printf "%s\n" "#define HAVE_BSD_ICONV 1" >>confdefs.h
+$as_echo "#define HAVE_BSD_ICONV 1" >>confdefs.h
 
 
-printf "%s\n" "#define PHP_ICONV_IMPL \"BSD iconv\"" >>confdefs.h
+$as_echo "#define PHP_ICONV_IMPL \"BSD iconv\"" >>confdefs.h
 
         ;;
 
       glibc )
 
-printf "%s\n" "#define HAVE_GLIBC_ICONV 1" >>confdefs.h
+$as_echo "#define HAVE_GLIBC_ICONV 1" >>confdefs.h
 
 
-printf "%s\n" "#define PHP_ICONV_IMPL \"glibc\"" >>confdefs.h
+$as_echo "#define PHP_ICONV_IMPL \"glibc\"" >>confdefs.h
 
         ;;
       ibm )
 
-printf "%s\n" "#define HAVE_IBM_ICONV 1" >>confdefs.h
+$as_echo "#define HAVE_IBM_ICONV 1" >>confdefs.h
 
 
-printf "%s\n" "#define PHP_ICONV_IMPL \"IBM iconv\"" >>confdefs.h
+$as_echo "#define PHP_ICONV_IMPL \"IBM iconv\"" >>confdefs.h
 
         ;;
     esac
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv supports errno" >&5
-printf %s "checking if iconv supports errno... " >&6; }
-    if test "$cross_compiling" = yes
-then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv supports errno" >&5
+$as_echo_n "checking if iconv supports errno... " >&6; }
+    if test "$cross_compiling" = yes; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <iconv.h>
@@ -45407,39 +41866,35 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       as_fn_error $? "iconv does not support errno" "$LINENO" 5
-     ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv supports //IGNORE" >&5
-printf %s "checking if iconv supports //IGNORE... " >&6; }
-    if test "$cross_compiling" = yes
-then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv supports //IGNORE" >&5
+$as_echo_n "checking if iconv supports //IGNORE... " >&6; }
+    if test "$cross_compiling" = yes; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-printf "%s\n" "#define ICONV_BROKEN_IGNORE 0" >>confdefs.h
+$as_echo "#define ICONV_BROKEN_IGNORE 0" >>confdefs.h
 
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <iconv.h>
@@ -45462,28 +41917,25 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define ICONV_BROKEN_IGNORE 0" >>confdefs.h
+$as_echo "#define ICONV_BROKEN_IGNORE 0" >>confdefs.h
 
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define ICONV_BROKEN_IGNORE 1" >>confdefs.h
 
-printf "%s\n" "#define ICONV_BROKEN_IGNORE 1" >>confdefs.h
 
-     ;;
-esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
@@ -45624,7 +42076,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_ICONV 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_ICONV 1
+_ACEOF
 
     fi
   fi
@@ -45787,19 +42241,17 @@
 
 php_with_imap=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IMAP support" >&5
-printf %s "checking for IMAP support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAP support" >&5
+$as_echo_n "checking for IMAP support... " >&6; }
 
 # Check whether --with-imap was given.
-if test ${with_imap+y}
-then :
+if test "${with_imap+set}" = set; then :
   withval=$with_imap; PHP_IMAP=$withval
-else case e in #(
-  e)
+else
+
   PHP_IMAP=no
   test "$PHP_ENABLE_ALL" && PHP_IMAP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -45825,8 +42277,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -45834,25 +42286,23 @@
 
 php_with_kerberos=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IMAP Kerberos support" >&5
-printf %s "checking for IMAP Kerberos support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAP Kerberos support" >&5
+$as_echo_n "checking for IMAP Kerberos support... " >&6; }
 
 # Check whether --with-kerberos was given.
-if test ${with_kerberos+y}
-then :
+if test "${with_kerberos+set}" = set; then :
   withval=$with_kerberos; PHP_KERBEROS=$withval
-else case e in #(
-  e)
+else
+
   PHP_KERBEROS=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_KERBEROS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -45860,25 +42310,23 @@
 
 php_with_imap_ssl=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IMAP SSL support" >&5
-printf %s "checking for IMAP SSL support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAP SSL support" >&5
+$as_echo_n "checking for IMAP SSL support... " >&6; }
 
 # Check whether --with-imap-ssl was given.
-if test ${with_imap_ssl+y}
-then :
+if test "${with_imap_ssl+set}" = set; then :
   withval=$with_imap_ssl; PHP_IMAP_SSL=$withval
-else case e in #(
-  e)
+else
+
   PHP_IMAP_SSL=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_IMAP_SSL
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -46021,7 +42469,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_IMAP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_IMAP 1
+_ACEOF
 
     fi
   fi
@@ -46143,13 +42593,13 @@
   fi
 
 
-printf "%s\n" "#define HAVE_IMAP 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP 1" >>confdefs.h
 
 
     for i in $PHP_IMAP /usr/local /usr; do
       if test -r "$i/c-client.h"; then
 
-printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i
@@ -46161,7 +42611,7 @@
 
       elif test -r "$i/include/c-client/c-client.h"; then
 
-printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/include/c-client
@@ -46173,7 +42623,7 @@
 
       elif test -r "$i/include/imap/c-client.h"; then
 
-printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/include/imap
@@ -46185,7 +42635,7 @@
 
       elif test -r "$i/include/c-client.h"; then
 
-printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/include
@@ -46197,7 +42647,7 @@
 
       elif test -r "$i/imap/c-client.h"; then
 
-printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/imap
@@ -46209,7 +42659,7 @@
 
       elif test -r "$i/c-client/c-client.h"; then
 
-printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/c-client
@@ -46228,33 +42678,31 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "mail_fetch_overview_sequence" >/dev/null 2>&1
-then :
+  $EGREP "mail_fetch_overview_sequence" >/dev/null 2>&1; then :
 
 
-printf "%s\n" "#define HAVE_IMAP2004 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2004 1" >>confdefs.h
 
 
 fi
-rm -rf conftest*
+rm -f conftest*
 
 
         old_CFLAGS=$CFLAGS
     CFLAGS="-I$IMAP_INC_DIR"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for utf8_mime2text signature" >&5
-printf %s "checking for utf8_mime2text signature... " >&6; }
-if test ${ac_cv_utf8_mime2text+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8_mime2text signature" >&5
+$as_echo_n "checking for utf8_mime2text signature... " >&6; }
+if ${ac_cv_utf8_mime2text+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
 #include <c-client.h>
 
 int
-main (void)
+main ()
 {
 
         SIZEDTEXT *src, *dst;
@@ -46264,45 +42712,41 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
         ac_cv_utf8_mime2text=old
 
-else case e in #(
-  e)
+else
+
         ac_cv_utf8_mime2text=new
-       ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-     ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_utf8_mime2text" >&5
-printf "%s\n" "$ac_cv_utf8_mime2text" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_utf8_mime2text" >&5
+$as_echo "$ac_cv_utf8_mime2text" >&6; }
     if test "$ac_cv_utf8_mime2text" = "new"; then
 
-printf "%s\n" "#define HAVE_NEW_MIME2TEXT 1" >>confdefs.h
+$as_echo "#define HAVE_NEW_MIME2TEXT 1" >>confdefs.h
 
     fi
     CFLAGS=$old_CFLAGS
 
     old_CFLAGS=$CFLAGS
     CFLAGS="-I$IMAP_INC_DIR"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for U8T_DECOMPOSE" >&5
-printf %s "checking for U8T_DECOMPOSE... " >&6; }
-if test ${ac_cv_u8t_decompose+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for U8T_DECOMPOSE" >&5
+$as_echo_n "checking for U8T_DECOMPOSE... " >&6; }
+if ${ac_cv_u8t_decompose+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <c-client.h>
 
 int
-main (void)
+main ()
 {
 
          int i = U8T_CANONICAL;
@@ -46311,23 +42755,20 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
          ac_cv_u8t_decompose=yes
 
-else case e in #(
-  e)
+else
+
          ac_cv_u8t_decompose=no
-       ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-     ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_u8t_decompose" >&5
-printf "%s\n" "$ac_cv_u8t_decompose" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_u8t_decompose" >&5
+$as_echo "$ac_cv_u8t_decompose" >&6; }
     CFLAGS=$old_CFLAGS
 
     if test "$ac_cv_u8t_decompose" = "no" && test "$ac_cv_utf8_mime2text" = "new"; then
@@ -46349,15 +42790,14 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "this_is_true" >/dev/null 2>&1
-then :
+  $EGREP "this_is_true" >/dev/null 2>&1; then :
 
 
-printf "%s\n" "#define HAVE_IMAP2001 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2001 1" >>confdefs.h
 
 
 fi
-rm -rf conftest*
+rm -f conftest*
 
     CPPFLAGS=$old_CPPFLAGS
 
@@ -46466,51 +42906,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
-printf %s "checking for pam_start in -lpam... " >&6; }
-if test ${ac_cv_lib_pam_pam_start+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
+$as_echo_n "checking for pam_start in -lpam... " >&6; }
+if ${ac_cv_lib_pam_pam_start+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpam  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char pam_start (void);
+char pam_start ();
 int
-main (void)
+main ()
 {
 return pam_start ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pam_pam_start=yes
-else case e in #(
-  e) ac_cv_lib_pam_pam_start=no ;;
-esac
+else
+  ac_cv_lib_pam_pam_start=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5
-printf "%s\n" "$ac_cv_lib_pam_pam_start" >&6; }
-if test "x$ac_cv_lib_pam_pam_start" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5
+$as_echo "$ac_cv_lib_pam_pam_start" >&6; }
+if test "x$ac_cv_lib_pam_pam_start" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -46539,18 +42971,17 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBPAM 1" >>confdefs.h
+$as_echo "#define HAVE_LIBPAM 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_pam_pam_start
 
-   ;;
-esac
+
 fi
 
 
@@ -46659,51 +43090,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
-printf %s "checking for crypt in -lcrypt... " >&6; }
-if test ${ac_cv_lib_crypt_crypt+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+$as_echo_n "checking for crypt in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt_crypt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char crypt (void);
+char crypt ();
 int
-main (void)
+main ()
 {
 return crypt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypt_crypt=yes
-else case e in #(
-  e) ac_cv_lib_crypt_crypt=no ;;
-esac
+else
+  ac_cv_lib_crypt_crypt=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
-printf "%s\n" "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -46732,18 +43155,17 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBCRYPT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBCRYPT 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_crypt_crypt
 
-   ;;
-esac
+
 fi
 
 
@@ -46885,17 +43307,17 @@
   if test "$PHP_KERBEROS" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for krb5-gssapi krb5" >&5
-printf %s "checking for krb5-gssapi krb5... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5-gssapi krb5" >&5
+$as_echo_n "checking for krb5-gssapi krb5... " >&6; }
 
 if test -n "$KERBEROS_CFLAGS"; then
     pkg_cv_KERBEROS_CFLAGS="$KERBEROS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "krb5-gssapi krb5") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_KERBEROS_CFLAGS=`$PKG_CONFIG --cflags "krb5-gssapi krb5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -46909,10 +43331,10 @@
     pkg_cv_KERBEROS_LIBS="$KERBEROS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "krb5-gssapi krb5") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_KERBEROS_LIBS=`$PKG_CONFIG --libs "krb5-gssapi krb5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -46926,8 +43348,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -46953,10 +43375,10 @@
 and KERBEROS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -46966,12 +43388,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	KERBEROS_CFLAGS=$pkg_cv_KERBEROS_CFLAGS
 	KERBEROS_LIBS=$pkg_cv_KERBEROS_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -47116,7 +43538,7 @@
 
 
 
-printf "%s\n" "#define HAVE_IMAP_KRB 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP_KRB 1" >>confdefs.h
 
   else
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -47125,8 +43547,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "auth_gss" >/dev/null 2>&1
-then :
+  $EGREP "auth_gss" >/dev/null 2>&1; then :
 
       as_fn_error $? "This c-client library is built with Kerberos support.
 
@@ -47134,7 +43555,7 @@
       " "$LINENO" 5
 
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
 
@@ -47148,17 +43569,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
-printf %s "checking for openssl >= 1.0.2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
+$as_echo_n "checking for openssl >= 1.0.2... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -47172,10 +43593,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -47189,8 +43610,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -47216,10 +43637,10 @@
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -47229,12 +43650,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	found_openssl=yes
 fi
 
@@ -47380,7 +43801,7 @@
 
 
 
-printf "%s\n" "#define HAVE_IMAP_SSL 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP_SSL 1" >>confdefs.h
 
 
 else
@@ -47398,8 +43819,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "ssl_onceonlyinit" >/dev/null 2>&1
-then :
+  $EGREP "ssl_onceonlyinit" >/dev/null 2>&1; then :
 
       as_fn_error $? "This c-client library is built with SSL support.
 
@@ -47407,7 +43827,7 @@
       " "$LINENO" 5
 
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
 
@@ -47452,24 +43872,22 @@
     }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     LIBS=$old_LIBS
 
 
-printf "%s\n" "#define HAVE_IMAP_AUTH_GSS 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP_AUTH_GSS 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LIBS=$old_LIBS
 
-   ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
@@ -47482,17 +43900,16 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for utf8_to_mutf7" >&5
-printf %s "checking for utf8_to_mutf7... " >&6; }
-if test ${ac_cv_utf8_to_mutf7+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8_to_mutf7" >&5
+$as_echo_n "checking for utf8_to_mutf7... " >&6; }
+if ${ac_cv_utf8_to_mutf7+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <c-client.h>
 int
-main (void)
+main ()
 {
 
         unsigned char c = '\0';
@@ -47502,26 +43919,23 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_IMAP_MUTF7 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP_MUTF7 1" >>confdefs.h
 
         ac_cv_utf8_to_mutf7=yes
 
-else case e in #(
-  e)
+else
+
         ac_cv_utf8_to_mutf7=no
-       ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-     ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_utf8_to_mutf7" >&5
-printf "%s\n" "$ac_cv_utf8_to_mutf7" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_utf8_to_mutf7" >&5
+$as_echo "$ac_cv_utf8_to_mutf7" >&6; }
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -47530,8 +43944,8 @@
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether rfc822_output_address_list function present" >&5
-printf %s "checking whether rfc822_output_address_list function present... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether rfc822_output_address_list function present" >&5
+$as_echo_n "checking whether rfc822_output_address_list function present... " >&6; }
 
   old_LIBS=$LIBS
   LIBS="
@@ -47573,34 +43987,32 @@
     }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     LIBS=$old_LIBS
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_RFC822_OUTPUT_ADDRESS_LIST 1" >>confdefs.h
+$as_echo "#define HAVE_RFC822_OUTPUT_ADDRESS_LIST 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LIBS=$old_LIBS
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build with IMAP works" >&5
-printf %s "checking whether build with IMAP works... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build with IMAP works" >&5
+$as_echo_n "checking whether build with IMAP works... " >&6; }
 
 
   old_LIBS=$LIBS
@@ -47639,27 +44051,25 @@
     }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     LIBS=$old_LIBS
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
-else case e in #(
-  e)
+else
+
     LIBS=$old_LIBS
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       as_fn_error $? "build test failed. Please check the config.log for details." "$LINENO" 5
 
-   ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
@@ -47671,18 +44081,16 @@
 
 php_enable_intl=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable internationalization support" >&5
-printf %s "checking whether to enable internationalization support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable internationalization support" >&5
+$as_echo_n "checking whether to enable internationalization support... " >&6; }
 # Check whether --enable-intl was given.
-if test ${enable_intl+y}
-then :
+if test "${enable_intl+set}" = set; then :
   enableval=$enable_intl; PHP_INTL=$enableval
-else case e in #(
-  e)
+else
+
   PHP_INTL=no
   test "$PHP_ENABLE_ALL" && PHP_INTL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -47708,8 +44116,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -47718,17 +44126,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for icu-uc >= 50.1 icu-io icu-i18n" >&5
-printf %s "checking for icu-uc >= 50.1 icu-io icu-i18n... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for icu-uc >= 50.1 icu-io icu-i18n" >&5
+$as_echo_n "checking for icu-uc >= 50.1 icu-io icu-i18n... " >&6; }
 
 if test -n "$ICU_CFLAGS"; then
     pkg_cv_ICU_CFLAGS="$ICU_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5
   ($PKG_CONFIG --exists --print-errors "icu-uc >= 50.1 icu-io icu-i18n") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-uc >= 50.1 icu-io icu-i18n" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -47742,10 +44150,10 @@
     pkg_cv_ICU_LIBS="$ICU_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5
   ($PKG_CONFIG --exists --print-errors "icu-uc >= 50.1 icu-io icu-i18n") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-uc >= 50.1 icu-io icu-i18n" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -47759,8 +44167,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -47786,10 +44194,10 @@
 and ICU_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -47799,12 +44207,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ICU_CFLAGS=$pkg_cv_ICU_CFLAGS
 	ICU_LIBS=$pkg_cv_ICU_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -47951,8 +44359,7 @@
   ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
   ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit"
 
-  if $PKG_CONFIG icu-io --atleast-version=60
-then :
+  if $PKG_CONFIG icu-io --atleast-version=60; then :
   ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
 fi
 
@@ -48190,7 +44597,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_INTL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_INTL 1
+_ACEOF
 
     fi
   fi
@@ -48442,48 +44851,42 @@
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CXX"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-printf "%s\n" "$CXX" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -48492,48 +44895,42 @@
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_CXX"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-printf "%s\n" "$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -48545,8 +44942,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -48556,7 +44953,7 @@
   fi
 fi
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -48566,7 +44963,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -48576,21 +44973,20 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
-printf %s "checking whether the compiler supports GNU C++... " >&6; }
-if test ${ac_cv_cxx_compiler_gnu+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 #ifndef __GNUC__
        choke me
@@ -48600,36 +44996,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
-else case e in #(
-  e) ac_compiler_gnu=no ;;
-esac
+else
+  ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GXX=yes
 else
   GXX=
 fi
-ac_test_CXXFLAGS=${CXXFLAGS+y}
+ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-printf %s "checking whether $CXX accepts -g... " >&6; }
-if test ${ac_cv_prog_cxx_g+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
    CXXFLAGS="-g"
@@ -48637,63 +45027,57 @@
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
-else case e in #(
-  e) CXXFLAGS=""
+else
+  CXXFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
-else case e in #(
-  e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
-if test $ac_test_CXXFLAGS; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
@@ -48708,106 +45092,6 @@
     CXXFLAGS=
   fi
 fi
-ac_prog_cxx_stdcxx=no
-if test x$ac_prog_cxx_stdcxx = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
-printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx11+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cxx_cxx11=no
-ac_save_CXX=$CXX
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_cxx_conftest_cxx11_program
-_ACEOF
-for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
-do
-  CXX="$ac_save_CXX $ac_arg"
-  if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ac_cv_prog_cxx_cxx11=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CXX=$ac_save_CXX ;;
-esac
-fi
-
-if test "x$ac_cv_prog_cxx_cxx11" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cxx_cxx11" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx11" ;;
-esac
-fi
-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
-  ac_prog_cxx_stdcxx=cxx11 ;;
-esac
-fi
-fi
-if test x$ac_prog_cxx_stdcxx = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
-printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx98+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cxx_cxx98=no
-ac_save_CXX=$CXX
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_cxx_conftest_cxx98_program
-_ACEOF
-for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
-do
-  CXX="$ac_save_CXX $ac_arg"
-  if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ac_cv_prog_cxx_cxx98=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CXX=$ac_save_CXX ;;
-esac
-fi
-
-if test "x$ac_cv_prog_cxx_cxx98" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cxx_cxx98" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx98" ;;
-esac
-fi
-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
-  ac_prog_cxx_stdcxx=cxx98 ;;
-esac
-fi
-fi
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -48819,35 +45103,38 @@
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-printf %s "checking how to run the C++ preprocessor... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if test ${ac_cv_prog_CXXCPP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)     # Double quotes because $CXX needs to be expanded
-    for CXXCPP in "$CXX -E" cpp /lib/cpp
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
     do
       ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -48857,56 +45144,56 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
   break
 fi
 
     done
     ac_cv_prog_CXXCPP=$CXXCPP
-   ;;
-esac
+
 fi
   CXXCPP=$ac_cv_prog_CXXCPP
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-printf "%s\n" "$CXXCPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -48916,30 +45203,26 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
 
-else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -48962,14 +45245,13 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if intl requires -std=gnu++17" >&5
-printf %s "checking if intl requires -std=gnu++17... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if intl requires -std=gnu++17" >&5
+$as_echo_n "checking if intl requires -std=gnu++17... " >&6; }
 
-if $PKG_CONFIG icu-uc --atleast-version=74
-then :
+if $PKG_CONFIG icu-uc --atleast-version=74; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       ax_cxx_compile_alternatives="17 1z"  ax_cxx_compile_cxx17_required=true  ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -48979,14 +45261,13 @@
 
         for alternative in ${ax_cxx_compile_alternatives}; do
     for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-      cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx17_$switch" | sed "$as_sed_sh"`
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5
-printf %s "checking whether $CXX supports C++17 features with $switch... " >&6; }
-if eval test \${$cachevar+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_CXX="$CXX"
+      cachevar=`$as_echo "ax_cv_cxx_compile_cxx17_$switch" | $as_tr_sh`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5
+$as_echo_n "checking whether $CXX supports C++17 features with $switch... " >&6; }
+if eval \${$cachevar+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_CXX="$CXX"
            CXX="$CXX $switch"
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -49777,20 +46058,17 @@
 
 
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   eval $cachevar=yes
-else case e in #(
-  e) eval $cachevar=no ;;
-esac
+else
+  eval $cachevar=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           CXX="$ac_save_CXX" ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+           CXX="$ac_save_CXX"
 fi
 eval ac_res=\$$cachevar
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
       if eval test x\$$cachevar = xyes; then
         eval PHP_INTL_STDCXX="$switch"
         ac_success=yes
@@ -49814,16 +46092,16 @@
     fi
   fi
   if test x$ac_success = xno; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++17 support was found" >&5
-printf "%s\n" "$as_me: No compiler with C++17 support was found" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++17 support was found" >&5
+$as_echo "$as_me: No compiler with C++17 support was found" >&6;}
   fi
 
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       ax_cxx_compile_alternatives="11 0x"  ax_cxx_compile_cxx11_required=true  ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -49833,14 +46111,13 @@
 
         for alternative in ${ax_cxx_compile_alternatives}; do
     for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-      cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx11_$switch" | sed "$as_sed_sh"`
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
-printf %s "checking whether $CXX supports C++11 features with $switch... " >&6; }
-if eval test \${$cachevar+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_CXX="$CXX"
+      cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
+$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; }
+if eval \${$cachevar+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_CXX="$CXX"
            CXX="$CXX $switch"
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -50133,20 +46410,17 @@
 
 
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   eval $cachevar=yes
-else case e in #(
-  e) eval $cachevar=no ;;
-esac
+else
+  eval $cachevar=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           CXX="$ac_save_CXX" ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+           CXX="$ac_save_CXX"
 fi
 eval ac_res=\$$cachevar
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
       if eval test x\$$cachevar = xyes; then
         eval PHP_INTL_STDCXX="$switch"
         ac_success=yes
@@ -50170,13 +46444,12 @@
     fi
   fi
   if test x$ac_success = xno; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5
-printf "%s\n" "$as_me: No compiler with C++11 support was found" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5
+$as_echo "$as_me: No compiler with C++11 support was found" >&6;}
   fi
 
 
-   ;;
-esac
+
 fi
 
   PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS"
@@ -50368,7 +46641,7 @@
 
 
 
-printf "%s\n" "#define HAVE_JSON 1 " >>confdefs.h
+$as_echo "#define HAVE_JSON 1 " >>confdefs.h
 
 
   ext_builddir=ext/json
@@ -50510,7 +46783,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_JSON 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_JSON 1
+_ACEOF
 
     fi
   fi
@@ -50672,19 +46947,17 @@
 
 php_with_ldap=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LDAP support" >&5
-printf %s "checking for LDAP support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LDAP support" >&5
+$as_echo_n "checking for LDAP support... " >&6; }
 
 # Check whether --with-ldap was given.
-if test ${with_ldap+y}
-then :
+if test "${with_ldap+set}" = set; then :
   withval=$with_ldap; PHP_LDAP=$withval
-else case e in #(
-  e)
+else
+
   PHP_LDAP=no
   test "$PHP_ENABLE_ALL" && PHP_LDAP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -50710,8 +46983,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -50719,25 +46992,23 @@
 
 php_with_ldap_sasl=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with LDAP Cyrus SASL support" >&5
-printf %s "checking whether to build with LDAP Cyrus SASL support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with LDAP Cyrus SASL support" >&5
+$as_echo_n "checking whether to build with LDAP Cyrus SASL support... " >&6; }
 
 # Check whether --with-ldap-sasl was given.
-if test ${with_ldap_sasl+y}
-then :
+if test "${with_ldap_sasl+set}" = set; then :
   withval=$with_ldap_sasl; PHP_LDAP_SASL=$withval
-else case e in #(
-  e)
+else
+
   PHP_LDAP_SASL=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_LDAP_SASL
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -50878,7 +47149,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_LDAP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_LDAP 1
+_ACEOF
 
     fi
   fi
@@ -51015,55 +47288,51 @@
 
             # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3(sizeof (unsigned char)) >= 0;'.
+# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-printf %s "checking size of long... " >&6; }
-if test ${ac_cv_sizeof_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-printf %s "checking if we're at 64-bit platform... " >&6; }
-    if test "$ac_cv_sizeof_long" -eq 4
-then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+$as_echo_n "checking if we're at 64-bit platform... " >&6; }
+    if test "$ac_cv_sizeof_long" -eq 4; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       PHP_OCI8_IC_LIBDIR_SUFFIX=""
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       PHP_OCI8_IC_LIBDIR_SUFFIX=64
-     ;;
-esac
+
 fi
 
     OCISDKRPMINC=`echo "$i" | $SED -e 's!^/usr/lib/oracle/$.*$/client$'${PHP_OCI8_IC_LIBDIR_SUFFIX}'$*/lib/*$!/usr/include/oracle/\1/client\2!'`
@@ -51094,55 +47363,51 @@
 
             # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3(sizeof (unsigned char)) >= 0;'.
+# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-printf %s "checking size of long... " >&6; }
-if test ${ac_cv_sizeof_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-printf %s "checking if we're at 64-bit platform... " >&6; }
-    if test "$ac_cv_sizeof_long" -eq 4
-then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+$as_echo_n "checking if we're at 64-bit platform... " >&6; }
+    if test "$ac_cv_sizeof_long" -eq 4; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       PHP_OCI8_IC_LIBDIR_SUFFIX=""
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       PHP_OCI8_IC_LIBDIR_SUFFIX=64
-     ;;
-esac
+
 fi
 
     OCISDKRPMINC=`echo "$PHP_LDAP" | $SED -e 's!^/usr/lib/oracle/$.*$/client$'${PHP_OCI8_IC_LIBDIR_SUFFIX}'$*/lib/*$!/usr/include/oracle/\1/client\2!'`
@@ -51560,7 +47825,7 @@
 
 
 
-printf "%s\n" "#define HAVE_ORALDAP 1" >>confdefs.h
+$as_echo "#define HAVE_ORALDAP 1" >>confdefs.h
 
 
   elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
@@ -51662,7 +47927,7 @@
 
 
 
-printf "%s\n" "#define HAVE_ORALDAP 1" >>confdefs.h
+$as_echo "#define HAVE_ORALDAP 1" >>confdefs.h
 
 
   elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME; then
@@ -51764,7 +48029,7 @@
 
 
 
-printf "%s\n" "#define HAVE_ORALDAP 1" >>confdefs.h
+$as_echo "#define HAVE_ORALDAP 1" >>confdefs.h
 
 
   else
@@ -51806,7 +48071,7 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST LDAP_SHARED_LIBADD"
 
 
-printf "%s\n" "#define HAVE_LDAP 1" >>confdefs.h
+$as_echo "#define HAVE_LDAP 1" >>confdefs.h
 
 
     _SAVE_CPPFLAGS=$CPPFLAGS
@@ -51814,117 +48079,64 @@
   CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
   LIBS="$LIBS $LDAP_SHARED_LIBADD"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 3 arg ldap_set_rebind_proc" >&5
-printf %s "checking for 3 arg ldap_set_rebind_proc... " >&6; }
-if test ${ac_cv_3arg_setrebindproc+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 3 arg ldap_set_rebind_proc" >&5
+$as_echo_n "checking for 3 arg ldap_set_rebind_proc... " >&6; }
+if ${ac_cv_3arg_setrebindproc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ldap.h>
 int
-main (void)
+main ()
 {
 ldap_set_rebind_proc(0,0,0)
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_3arg_setrebindproc=yes
-else case e in #(
-  e) ac_cv_3arg_setrebindproc=no ;;
-esac
+else
+  ac_cv_3arg_setrebindproc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_3arg_setrebindproc" >&5
-printf "%s\n" "$ac_cv_3arg_setrebindproc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_3arg_setrebindproc" >&5
+$as_echo "$ac_cv_3arg_setrebindproc" >&6; }
   if test "$ac_cv_3arg_setrebindproc" = yes; then
 
-printf "%s\n" "#define HAVE_3ARG_SETREBINDPROC 1" >>confdefs.h
+$as_echo "#define HAVE_3ARG_SETREBINDPROC 1" >>confdefs.h
 
   fi
 
-      ac_fn_c_check_func "$LINENO" "ldap_parse_result" "ac_cv_func_ldap_parse_result"
-if test "x$ac_cv_func_ldap_parse_result" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_PARSE_RESULT 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_parse_reference" "ac_cv_func_ldap_parse_reference"
-if test "x$ac_cv_func_ldap_parse_reference" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_PARSE_REFERENCE 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_start_tls_s" "ac_cv_func_ldap_start_tls_s"
-if test "x$ac_cv_func_ldap_start_tls_s" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_START_TLS_S 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_control_find" "ac_cv_func_ldap_control_find"
-if test "x$ac_cv_func_ldap_control_find" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_CONTROL_FIND 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_parse_extended_result" "ac_cv_func_ldap_parse_extended_result"
-if test "x$ac_cv_func_ldap_parse_extended_result" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_PARSE_EXTENDED_RESULT 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_extended_operation" "ac_cv_func_ldap_extended_operation"
-if test "x$ac_cv_func_ldap_extended_operation" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_EXTENDED_OPERATION 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_extended_operation_s" "ac_cv_func_ldap_extended_operation_s"
-if test "x$ac_cv_func_ldap_extended_operation_s" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_EXTENDED_OPERATION_S 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_passwd" "ac_cv_func_ldap_passwd"
-if test "x$ac_cv_func_ldap_passwd" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_PASSWD 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_whoami_s" "ac_cv_func_ldap_whoami_s"
-if test "x$ac_cv_func_ldap_whoami_s" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_WHOAMI_S 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_refresh_s" "ac_cv_func_ldap_refresh_s"
-if test "x$ac_cv_func_ldap_refresh_s" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_REFRESH_S 1" >>confdefs.h
+      for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s ldap_control_find ldap_parse_extended_result ldap_extended_operation ldap_extended_operation_s ldap_passwd ldap_whoami_s ldap_refresh_s
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
     if test "$PHP_LDAP_SASL" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsasl2" >&5
-printf %s "checking for libsasl2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsasl2" >&5
+$as_echo_n "checking for libsasl2... " >&6; }
 
 if test -n "$SASL_CFLAGS"; then
     pkg_cv_SASL_CFLAGS="$SASL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsasl2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SASL_CFLAGS=`$PKG_CONFIG --cflags "libsasl2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -51938,10 +48150,10 @@
     pkg_cv_SASL_LIBS="$SASL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsasl2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SASL_LIBS=`$PKG_CONFIG --libs "libsasl2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -51955,8 +48167,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -51982,10 +48194,10 @@
 and SASL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -51995,12 +48207,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	SASL_CFLAGS=$pkg_cv_SASL_CFLAGS
 	SASL_LIBS=$pkg_cv_SASL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -52145,19 +48357,17 @@
 
 
 
-printf "%s\n" "#define HAVE_LDAP_SASL 1" >>confdefs.h
+$as_echo "#define HAVE_LDAP_SASL 1" >>confdefs.h
 
   fi
 
     ac_fn_c_check_func "$LINENO" "ldap_bind_s" "ac_cv_func_ldap_bind_s"
-if test "x$ac_cv_func_ldap_bind_s" = xyes
-then :
+if test "x$ac_cv_func_ldap_bind_s" = xyes; then :
+
+else
 
-else case e in #(
-  e)
     as_fn_error $? "LDAP build check failed. Please check config.log for more information." "$LINENO" 5
-   ;;
-esac
+
 fi
 
 
@@ -52190,18 +48400,16 @@
 
 php_enable_mbstring=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte string support" >&5
-printf %s "checking whether to enable multibyte string support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte string support" >&5
+$as_echo_n "checking whether to enable multibyte string support... " >&6; }
 # Check whether --enable-mbstring was given.
-if test ${enable_mbstring+y}
-then :
+if test "${enable_mbstring+set}" = set; then :
   enableval=$enable_mbstring; PHP_MBSTRING=$enableval
-else case e in #(
-  e)
+else
+
   PHP_MBSTRING=no
   test "$PHP_ENABLE_ALL" && PHP_MBSTRING=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -52227,8 +48435,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -52236,31 +48444,29 @@
 
 php_enable_mbregex=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte regex support (requires oniguruma)" >&5
-printf %s "checking whether to enable multibyte regex support (requires oniguruma)... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte regex support (requires oniguruma)" >&5
+$as_echo_n "checking whether to enable multibyte regex support (requires oniguruma)... " >&6; }
 # Check whether --enable-mbregex was given.
-if test ${enable_mbregex+y}
-then :
+if test "${enable_mbregex+set}" = set; then :
   enableval=$enable_mbregex; PHP_MBREGEX=$enableval
-else case e in #(
-  e)
+else
+
   PHP_MBREGEX=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_MBREGEX
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_MBSTRING" != "no"; then
 
-printf "%s\n" "#define HAVE_MBSTRING 1" >>confdefs.h
+$as_echo "#define HAVE_MBSTRING 1" >>confdefs.h
 
 
 
@@ -52272,17 +48478,17 @@
   if test "$PHP_MBREGEX" = "yes"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for oniguruma" >&5
-printf %s "checking for oniguruma... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for oniguruma" >&5
+$as_echo_n "checking for oniguruma... " >&6; }
 
 if test -n "$ONIG_CFLAGS"; then
     pkg_cv_ONIG_CFLAGS="$ONIG_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5
   ($PKG_CONFIG --exists --print-errors "oniguruma") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ONIG_CFLAGS=`$PKG_CONFIG --cflags "oniguruma" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -52296,10 +48502,10 @@
     pkg_cv_ONIG_LIBS="$ONIG_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5
   ($PKG_CONFIG --exists --print-errors "oniguruma") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ONIG_LIBS=`$PKG_CONFIG --libs "oniguruma" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -52313,8 +48519,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -52340,10 +48546,10 @@
 and ONIG_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -52353,12 +48559,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ONIG_CFLAGS=$pkg_cv_ONIG_CFLAGS
 	ONIG_LIBS=$pkg_cv_ONIG_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -52601,15 +48807,15 @@
     esac
   done
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
-printf %s "checking if oniguruma has an invalid entry for KOI8 encoding... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
+$as_echo_n "checking if oniguruma has an invalid entry for KOI8 encoding... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <oniguruma.h>
 
 int
-main (void)
+main ()
 {
 
 return (int)(ONIG_ENCODING_KOI8 + 1);
@@ -52618,23 +48824,21 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define PHP_ONIG_BAD_KOI8_ENTRY 1" >>confdefs.h
 
-printf "%s\n" "#define PHP_ONIG_BAD_KOI8_ENTRY 1" >>confdefs.h
 
-     ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     LDFLAGS=$save_old_LDFLAGS
 
@@ -52646,7 +48850,7 @@
 
 
 
-printf "%s\n" "#define HAVE_MBREGEX 1" >>confdefs.h
+$as_echo "#define HAVE_MBREGEX 1" >>confdefs.h
 
 
 
@@ -52879,7 +49083,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_MBSTRING 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_MBSTRING 1
+_ACEOF
 
     fi
   fi
@@ -53121,19 +49327,17 @@
 
 php_with_mysqli=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQLi support" >&5
-printf %s "checking for MySQLi support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQLi support" >&5
+$as_echo_n "checking for MySQLi support... " >&6; }
 
 # Check whether --with-mysqli was given.
-if test ${with_mysqli+y}
-then :
+if test "${with_mysqli+set}" = set; then :
   withval=$with_mysqli; PHP_MYSQLI=$withval
-else case e in #(
-  e)
+else
+
   PHP_MYSQLI=no
   test "$PHP_ENABLE_ALL" && PHP_MYSQLI=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -53159,8 +49363,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -53168,25 +49372,23 @@
 
 php_with_mysql_sock=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for specified location of the MySQL UNIX socket" >&5
-printf %s "checking for specified location of the MySQL UNIX socket... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for specified location of the MySQL UNIX socket" >&5
+$as_echo_n "checking for specified location of the MySQL UNIX socket... " >&6; }
 
 # Check whether --with-mysql-sock was given.
-if test ${with_mysql_sock+y}
-then :
+if test "${with_mysql_sock+set}" = set; then :
   withval=$with_mysql_sock; PHP_MYSQL_SOCK=$withval
-else case e in #(
-  e)
+else
+
   PHP_MYSQL_SOCK=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_MYSQL_SOCK
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -53199,15 +49401,17 @@
 fi
 
 if test "$PHP_MYSQLI" != "no"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQL UNIX socket location" >&5
-printf %s "checking for MySQL UNIX socket location... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL UNIX socket location" >&5
+$as_echo_n "checking for MySQL UNIX socket location... " >&6; }
   if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
     MYSQL_SOCK=$PHP_MYSQL_SOCK
 
-printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
+_ACEOF
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
-printf "%s\n" "$MYSQL_SOCK" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
+$as_echo "$MYSQL_SOCK" >&6; }
   elif test "$PHP_MYSQL_SOCK" = "yes"; then
 
   for i in  \
@@ -53229,18 +49433,20 @@
 
   if test -n "$MYSQL_SOCK"; then
 
-printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
+_ACEOF
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
-printf "%s\n" "$MYSQL_SOCK" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
+$as_echo "$MYSQL_SOCK" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
   mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \
@@ -53380,7 +49586,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_MYSQLI 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_MYSQLI 1
+_ACEOF
 
     fi
   fi
@@ -53591,19 +49799,17 @@
 
 php_with_oci8=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Oracle Database OCI8 support" >&5
-printf %s "checking for Oracle Database OCI8 support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Oracle Database OCI8 support" >&5
+$as_echo_n "checking for Oracle Database OCI8 support... " >&6; }
 
 # Check whether --with-oci8 was given.
-if test ${with_oci8+y}
-then :
+if test "${with_oci8+set}" = set; then :
   withval=$with_oci8; PHP_OCI8=$withval
-else case e in #(
-  e)
+else
+
   PHP_OCI8=no
   test "$PHP_ENABLE_ALL" && PHP_OCI8=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -53629,8 +49835,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -53641,8 +49847,8 @@
             as_fn_error $? "Empty parameter value passed to --with-oci8" "$LINENO" 5
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking PHP version" >&5
-printf %s "checking PHP version... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking PHP version" >&5
+$as_echo_n "checking PHP version... " >&6; }
 
   tmp_version=$PHP_VERSION
   if test -z "$tmp_version"; then
@@ -53673,25 +49879,26 @@
   elif test "$oci8_php_version" -lt "8001000"; then
     as_fn_error $? "You need at least PHP 8.1.0 to be able to use this version of OCI8. Use OCI8 3.0 for PHP $php_version" "$LINENO" 5
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_version, ok" >&5
-printf "%s\n" "$php_version, ok" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_version, ok" >&5
+$as_echo "$php_version, ok" >&6; }
   fi
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking OCI8 DTrace support" >&5
-printf %s "checking OCI8 DTrace support... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking OCI8 DTrace support" >&5
+$as_echo_n "checking OCI8 DTrace support... " >&6; }
   oci8_do_dtrace="`echo $PHP_OCI8 | cut -d, -f3`"
   if test "$PHP_DTRACE" = "yes" -o "$oci8_do_dtrace" = "dtrace" ; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     if test "$ext_shared" = "no"; then
       as_fn_error $? "For DTrace support OCI8 must be configured as a shared extension" "$LINENO" 5
     else
-             for ac_header in sys/sdt.h
+      for ac_header in sys/sdt.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sdt_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_SDT_H 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sdt_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_SDT_H 1
+_ACEOF
 
 
   ac_srcdir=$abs_srcdir/ext/oci8/
@@ -53754,8 +49961,8 @@
 EOF
     ;;
   *)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: OCI8 extension: OCI8 DTrace support is not confirmed on this platform" >&5
-printf "%s\n" "$as_me: WARNING: OCI8 extension: OCI8 DTrace support is not confirmed on this platform" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OCI8 extension: OCI8 DTrace support is not confirmed on this platform" >&5
+$as_echo "$as_me: WARNING: OCI8 extension: OCI8 DTrace support is not confirmed on this platform" >&2;}
 cat>>Makefile.objects<<EOF
 $ac_bdir$ac_provsrc.o: \$(OCI8_DTRACE_OBJS)
 	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$@ -s $ac_srcdir$ac_provsrc $dtrace_oci8_objs
@@ -53766,88 +49973,84 @@
 
 
 
-else case e in #(
-  e)
+else
+
 	 as_fn_error $? "Cannot find sys/sdt.h which is required for DTrace support" "$LINENO" 5
-        ;;
-esac
+
 fi
 
 done
 
+
   PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DTRACE_OBJS"
 
 
-printf "%s\n" "#define HAVE_OCI8_DTRACE 1" >>confdefs.h
+$as_echo "#define HAVE_OCI8_DTRACE 1" >>confdefs.h
 
                   shared_objects_oci8="$shared_objects_oci8 ext/oci8/oci8_dtrace.d.lo"
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
     # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3(sizeof (unsigned char)) >= 0;'.
+# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-printf %s "checking size of long... " >&6; }
-if test ${ac_cv_sizeof_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-printf %s "checking if we're at 64-bit platform... " >&6; }
-  if test "$ac_cv_sizeof_long" -eq 4
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+$as_echo_n "checking if we're at 64-bit platform... " >&6; }
+  if test "$ac_cv_sizeof_long" -eq 4; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     PHP_OCI8_OH_LIBDIR=lib32
     PHP_OCI8_IC_LIBDIR_SUFFIX=""
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     PHP_OCI8_OH_LIBDIR=lib
     PHP_OCI8_IC_LIBDIR_SUFFIX=64
-   ;;
-esac
+
 fi
 
 
   PHP_OCI8_INSTANT_CLIENT="no"
 
             if test "$PHP_OCI8" = "yes" && test -z "$ORACLE_HOME"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&5
-printf "%s\n" "$as_me: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&5
+$as_echo "$as_me: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&2;}
     PHP_OCI8=instantclient
   fi
 
@@ -53875,20 +50078,20 @@
 
   if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle ORACLE_HOME install directory" >&5
-printf %s "checking Oracle ORACLE_HOME install directory... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle ORACLE_HOME install directory" >&5
+$as_echo_n "checking Oracle ORACLE_HOME install directory... " >&6; }
 
     if test "$PHP_OCI8" = "yes"; then
       OCI8_DIR=$ORACLE_HOME
     else
       OCI8_DIR=$PHP_OCI8
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCI8_DIR" >&5
-printf "%s\n" "$OCI8_DIR" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_DIR" >&5
+$as_echo "$OCI8_DIR" >&6; }
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ORACLE_HOME library validity" >&5
-printf %s "checking ORACLE_HOME library validity... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking ORACLE_HOME library validity" >&5
+$as_echo_n "checking ORACLE_HOME library validity... " >&6; }
   if test ! -d "$OCI8_DIR"; then
     as_fn_error $? "${OCI8_DIR} is not a directory" "$LINENO" 5
   fi
@@ -53905,8 +50108,8 @@
       as_fn_error $? "Oracle library directory not found in ${OCI8_DIR}" "$LINENO" 5
     fi
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCI8_LIB_DIR" >&5
-printf "%s\n" "$OCI8_LIB_DIR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_LIB_DIR" >&5
+$as_echo "$OCI8_LIB_DIR" >&6; }
 
 
     if test -d "$OCI8_DIR/rdbms/public"; then
@@ -54249,8 +50452,8 @@
     fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle library version compatibility" >&5
-printf %s "checking Oracle library version compatibility... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle library version compatibility" >&5
+$as_echo_n "checking Oracle library version compatibility... " >&6; }
   OCI8_LCS_BASE=$OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
     OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1`
   if test -s "$OCI8_DIR/orainst/unix.rgs"; then
@@ -54273,8 +50476,8 @@
   else
     as_fn_error $? "Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found" "$LINENO" 5
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5
-printf "%s\n" "$OCI8_ORACLE_VERSION" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5
+$as_echo "$OCI8_ORACLE_VERSION" >&6; }
 
 
     case $OCI8_ORACLE_VERSION in
@@ -54478,7 +50681,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_OCI8 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_OCI8 1
+_ACEOF
 
     fi
   fi
@@ -54600,7 +50805,7 @@
   fi
 
 
-printf "%s\n" "#define HAVE_OCI8 1" >>confdefs.h
+$as_echo "#define HAVE_OCI8 1" >>confdefs.h
 
 
 
@@ -54623,16 +50828,20 @@
 
 
 
-printf "%s\n" "#define PHP_OCI8_DEF_DIR \"$OCI8_DIR\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_OCI8_DEF_DIR "$OCI8_DIR"
+_ACEOF
 
 
-printf "%s\n" "#define PHP_OCI8_DEF_SHARED_LIBADD \"$OCI8_SHARED_LIBADD\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_OCI8_DEF_SHARED_LIBADD "$OCI8_SHARED_LIBADD"
+_ACEOF
 
 
   else
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client directory" >&5
-printf %s "checking Oracle Instant Client directory... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client directory" >&5
+$as_echo_n "checking Oracle Instant Client directory... " >&6; }
 
     if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
                                     PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | $PHP_OCI8_TAIL1 | $PHP_OCI8_SED -e 's#/libclntsh^/*##'`
@@ -54640,13 +50849,13 @@
 	as_fn_error $? "Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" "$LINENO" 5
       fi
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_OCI8_INSTANT_CLIENT" >&5
-printf "%s\n" "$PHP_OCI8_INSTANT_CLIENT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_OCI8_INSTANT_CLIENT" >&5
+$as_echo "$PHP_OCI8_INSTANT_CLIENT" >&6; }
 
     OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client SDK header directory" >&5
-printf %s "checking Oracle Instant Client SDK header directory... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client SDK header directory" >&5
+$as_echo_n "checking Oracle Instant Client SDK header directory... " >&6; }
 
         OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/$.*$/client$'${PHP_OCI8_IC_LIBDIR_SUFFIX}'$*/lib/*$!/usr/include/oracle/\1/client\2!'`
 
@@ -54655,8 +50864,8 @@
         OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!$.*$/lib/*$!\1/include!'`
 
     if test -f "$OCISDKRPMINC/oci.h"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKRPMINC" >&5
-printf "%s\n" "$OCISDKRPMINC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKRPMINC" >&5
+$as_echo "$OCISDKRPMINC" >&6; }
 
   if test "$OCISDKRPMINC" != "/usr/include"; then
 
@@ -54690,8 +50899,8 @@
 
       OCI8INCDIR=$OCISDKRPMINC
     elif test -f "$OCISDKZIPINC/oci.h"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKZIPINC" >&5
-printf "%s\n" "$OCISDKZIPINC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKZIPINC" >&5
+$as_echo "$OCISDKZIPINC" >&6; }
 
   if test "$OCISDKZIPINC" != "/usr/include"; then
 
@@ -54725,8 +50934,8 @@
 
       OCI8INCDIR=$OCISDKZIPINC
     elif test -f "$OCISDKMANINC/oci.h"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKMANINC" >&5
-printf "%s\n" "$OCISDKMANINC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKMANINC" >&5
+$as_echo "$OCISDKMANINC" >&6; }
 
   if test "$OCISDKMANINC" != "/usr/include"; then
 
@@ -54867,8 +51076,8 @@
     fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client library version compatibility" >&5
-printf %s "checking Oracle Instant Client library version compatibility... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client library version compatibility" >&5
+$as_echo_n "checking Oracle Instant Client library version compatibility... " >&6; }
   OCI8_LCS_BASE=$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME
     OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1`
   OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2> /dev/null | $PHP_OCI8_TAIL1`
@@ -54880,8 +51089,8 @@
   else
     as_fn_error $? "Oracle Instant Client libraries libnnz.$SHLIB_SUFFIX_NAME and libclntsh.$SHLIB_SUFFIX_NAME not found" "$LINENO" 5
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5
-printf "%s\n" "$OCI8_ORACLE_VERSION" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5
+$as_echo "$OCI8_ORACLE_VERSION" >&6; }
 
     case $OCI8_ORACLE_VERSION in
       10.1)
@@ -54951,7 +51160,7 @@
 
 
 
-printf "%s\n" "#define HAVE_OCI_INSTANT_CLIENT 1" >>confdefs.h
+$as_echo "#define HAVE_OCI_INSTANT_CLIENT 1" >>confdefs.h
 
 
 
@@ -55088,7 +51297,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_OCI8 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_OCI8 1
+_ACEOF
 
     fi
   fi
@@ -55210,7 +51421,7 @@
   fi
 
 
-printf "%s\n" "#define HAVE_OCI8 1" >>confdefs.h
+$as_echo "#define HAVE_OCI8 1" >>confdefs.h
 
 
 
@@ -55255,15 +51466,13 @@
 
 
 # Check whether --with-odbcver was given.
-if test ${with_odbcver+y}
-then :
+if test "${with_odbcver+set}" = set; then :
   withval=$with_odbcver; PHP_ODBCVER=$withval
-else case e in #(
-  e)
+else
+
   PHP_ODBCVER=0x0350
   test "$PHP_ENABLE_ALL" && PHP_ODBCVER=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -55301,15 +51510,13 @@
 
 
 # Check whether --with-adabas was given.
-if test ${with_adabas+y}
-then :
+if test "${with_adabas+set}" = set; then :
   withval=$with_adabas; PHP_ADABAS=$withval
-else case e in #(
-  e)
+else
+
   PHP_ADABAS=no
   test "$PHP_ENABLE_ALL" && PHP_ADABAS=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -55340,8 +51547,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Adabas support" >&5
-printf %s "checking for Adabas support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Adabas support" >&5
+$as_echo_n "checking for Adabas support... " >&6; }
   if test "$PHP_ADABAS" != "no"; then
     if test "$PHP_ADABAS" = "yes"; then
       PHP_ADABAS=/usr/local
@@ -55492,13 +51699,13 @@
 fi
 
 
-printf "%s\n" "#define HAVE_ADABAS 1" >>confdefs.h
+$as_echo "#define HAVE_ADABAS 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -55509,15 +51716,13 @@
 
 
 # Check whether --with-sapdb was given.
-if test ${with_sapdb+y}
-then :
+if test "${with_sapdb+set}" = set; then :
   withval=$with_sapdb; PHP_SAPDB=$withval
-else case e in #(
-  e)
+else
+
   PHP_SAPDB=no
   test "$PHP_ENABLE_ALL" && PHP_SAPDB=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -55548,8 +51753,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SAP DB support" >&5
-printf %s "checking for SAP DB support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAP DB support" >&5
+$as_echo_n "checking for SAP DB support... " >&6; }
   if test "$PHP_SAPDB" != "no"; then
     if test "$PHP_SAPDB" = "yes"; then
       PHP_SAPDB=/usr/local
@@ -55630,13 +51835,13 @@
 
     ODBC_TYPE=sapdb
 
-printf "%s\n" "#define HAVE_SAPDB 1" >>confdefs.h
+$as_echo "#define HAVE_SAPDB 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -55647,15 +51852,13 @@
 
 
 # Check whether --with-solid was given.
-if test ${with_solid+y}
-then :
+if test "${with_solid+set}" = set; then :
   withval=$with_solid; PHP_SOLID=$withval
-else case e in #(
-  e)
+else
+
   PHP_SOLID=no
   test "$PHP_ENABLE_ALL" && PHP_SOLID=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -55686,8 +51889,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Solid support" >&5
-printf %s "checking for Solid support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solid support" >&5
+$as_echo_n "checking for Solid support... " >&6; }
   if test "$PHP_SOLID" != "no"; then
     if test "$PHP_SOLID" = "yes"; then
       PHP_SOLID=/usr/local/solid
@@ -55698,22 +51901,22 @@
     ODBC_TYPE=solid
     if test -f $ODBC_LIBDIR/soc*35.a; then
 
-printf "%s\n" "#define HAVE_SOLID_35 1" >>confdefs.h
+$as_echo "#define HAVE_SOLID_35 1" >>confdefs.h
 
     elif test -f $ODBC_LIBDIR/scl*30.a; then
 
-printf "%s\n" "#define HAVE_SOLID_30 1" >>confdefs.h
+$as_echo "#define HAVE_SOLID_30 1" >>confdefs.h
 
     elif test -f $ODBC_LIBDIR/scl*23.a; then
 
-printf "%s\n" "#define HAVE_SOLID 1" >>confdefs.h
+$as_echo "#define HAVE_SOLID 1" >>confdefs.h
 
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Solid library file" >&5
-printf %s "checking Solid library file... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Solid library file" >&5
+$as_echo_n "checking Solid library file... " >&6; }
   ac_solid_uname_r=`uname -r 2>/dev/null`
   ac_solid_uname_s=`uname -s 2>/dev/null`
   case $ac_solid_uname_s in
@@ -55723,12 +51926,12 @@
     Linux)
       if ldd -v /bin/sh | grep GLIBC > /dev/null; then
 
-printf "%s\n" "#define SS_LINUX 1" >>confdefs.h
+$as_echo "#define SS_LINUX 1" >>confdefs.h
 
         ac_solid_os=l2x
       else
 
-printf "%s\n" "#define SS_LINUX 1" >>confdefs.h
+$as_echo "#define SS_LINUX 1" >>confdefs.h
 
         ac_solid_os=lux
       fi;;
@@ -55737,12 +51940,12 @@
     FreeBSD)
       if test `expr $ac_solid_uname_r : '$.$'` -gt "2"; then
 
-printf "%s\n" "#define SS_FBX 1" >>confdefs.h
+$as_echo "#define SS_FBX 1" >>confdefs.h
 
         ac_solid_os=fex
       else
 
-printf "%s\n" "#define SS_FBX 1" >>confdefs.h
+$as_echo "#define SS_FBX 1" >>confdefs.h
 
         ac_solid_os=fbx
       fi;;
@@ -55773,12 +51976,12 @@
   ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version}
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
-printf "%s\n" "\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
+$as_echo "\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6; }
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -55789,15 +51992,13 @@
 
 
 # Check whether --with-ibm-db2 was given.
-if test ${with_ibm_db2+y}
-then :
+if test "${with_ibm_db2+set}" = set; then :
   withval=$with_ibm_db2; PHP_IBM_DB2=$withval
-else case e in #(
-  e)
+else
+
   PHP_IBM_DB2=no
   test "$PHP_ENABLE_ALL" && PHP_IBM_DB2=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -55828,8 +52029,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IBM DB2 support" >&5
-printf %s "checking for IBM DB2 support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IBM DB2 support" >&5
+$as_echo_n "checking for IBM DB2 support... " >&6; }
   if test "$PHP_IBM_DB2" != "no"; then
     if test "$PHP_IBM_DB2" = "yes"; then
       ODBC_INCDIR=/home/db2inst1/sqllib/include
@@ -55866,39 +52067,37 @@
     }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     LIBS=$old_LIBS
 
 
-printf "%s\n" "#define HAVE_IBMDB2 1" >>confdefs.h
+$as_echo "#define HAVE_IBMDB2 1" >>confdefs.h
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
-else case e in #(
-  e)
+else
+
     LIBS=$old_LIBS
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       as_fn_error $? "
 build test failed. Please check the config.log for details.
 You need to source your DB2 environment before running PHP configure:
 # . \$IBM_DB2/db2profile
 " "$LINENO" 5
 
-   ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -55909,15 +52108,13 @@
 
 
 # Check whether --with-empress was given.
-if test ${with_empress+y}
-then :
+if test "${with_empress+set}" = set; then :
   withval=$with_empress; PHP_EMPRESS=$withval
-else case e in #(
-  e)
+else
+
   PHP_EMPRESS=no
   test "$PHP_ENABLE_ALL" && PHP_EMPRESS=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -55948,8 +52145,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Empress support" >&5
-printf %s "checking for Empress support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Empress support" >&5
+$as_echo_n "checking for Empress support... " >&6; }
   if test "$PHP_EMPRESS" != "no"; then
     if test "$PHP_EMPRESS" = "yes"; then
       ODBC_INCDIR=$EMPRESSPATH/include/odbc
@@ -55962,23 +52159,23 @@
     ODBC_LFLAGS=-L$ODBC_LIBDIR
     ODBC_TYPE=empress
 
-printf "%s\n" "#define HAVE_EMPRESS 1" >>confdefs.h
+$as_echo "#define HAVE_EMPRESS 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Empress library file" >&5
-printf %s "checking Empress library file... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Empress library file" >&5
+$as_echo_n "checking Empress library file... " >&6; }
   ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
   if test ! -f $ODBC_LIBS; then
     ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
-printf "%s\n" "\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
+$as_echo "\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6; }
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -55989,15 +52186,13 @@
 
 
 # Check whether --with-empress-bcs was given.
-if test ${with_empress_bcs+y}
-then :
+if test "${with_empress_bcs+set}" = set; then :
   withval=$with_empress_bcs; PHP_EMPRESS_BCS=$withval
-else case e in #(
-  e)
+else
+
   PHP_EMPRESS_BCS=no
   test "$PHP_ENABLE_ALL" && PHP_EMPRESS_BCS=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -56028,8 +52223,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Empress local access support" >&5
-printf %s "checking for Empress local access support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Empress local access support" >&5
+$as_echo_n "checking for Empress local access support... " >&6; }
   if test "$PHP_EMPRESS_BCS" != "no"; then
     if test "$PHP_EMPRESS_BCS" = "yes"; then
       ODBC_INCDIR=$EMPRESSPATH/include/odbc
@@ -56058,23 +52253,23 @@
     ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt"
     ODBC_TYPE=empress-bcs
 
-printf "%s\n" "#define HAVE_EMPRESS 1" >>confdefs.h
+$as_echo "#define HAVE_EMPRESS 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Empress local access library file" >&5
-printf %s "checking Empress local access library file... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Empress local access library file" >&5
+$as_echo_n "checking Empress local access library file... " >&6; }
   ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
   if test ! -f $ODBCBCS_LIBS; then
     ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&5
-printf "%s\n" "\`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&5
+$as_echo "\`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&6; }
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -56085,15 +52280,13 @@
 
 
 # Check whether --with-custom-odbc was given.
-if test ${with_custom_odbc+y}
-then :
+if test "${with_custom_odbc+set}" = set; then :
   withval=$with_custom_odbc; PHP_CUSTOM_ODBC=$withval
-else case e in #(
-  e)
+else
+
   PHP_CUSTOM_ODBC=no
   test "$PHP_ENABLE_ALL" && PHP_CUSTOM_ODBC=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -56124,8 +52317,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a custom ODBC support" >&5
-printf %s "checking for a custom ODBC support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a custom ODBC support" >&5
+$as_echo_n "checking for a custom ODBC support... " >&6; }
   if test "$PHP_CUSTOM_ODBC" != "no"; then
     if test "$PHP_CUSTOM_ODBC" = "yes"; then
       PHP_CUSTOM_ODBC=/usr/local
@@ -56137,13 +52330,13 @@
     ODBC_LIBS=$CUSTOM_ODBC_LIBS
     ODBC_TYPE=custom-odbc
 
-printf "%s\n" "#define HAVE_CODBC 1" >>confdefs.h
+$as_echo "#define HAVE_CODBC 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -56154,15 +52347,13 @@
 
 
 # Check whether --with-iodbc was given.
-if test ${with_iodbc+y}
-then :
+if test "${with_iodbc+set}" = set; then :
   withval=$with_iodbc; PHP_IODBC=$withval
-else case e in #(
-  e)
+else
+
   PHP_IODBC=no
   test "$PHP_ENABLE_ALL" && PHP_IODBC=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -56193,24 +52384,24 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with iODBC support" >&5
-printf %s "checking whether to build with iODBC support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with iODBC support" >&5
+$as_echo_n "checking whether to build with iODBC support... " >&6; }
   if test "$PHP_IODBC" != "no"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiodbc" >&5
-printf %s "checking for libiodbc... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiodbc" >&5
+$as_echo_n "checking for libiodbc... " >&6; }
 
 if test -n "$ODBC_CFLAGS"; then
     pkg_cv_ODBC_CFLAGS="$ODBC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libiodbc") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ODBC_CFLAGS=`$PKG_CONFIG --cflags "libiodbc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -56224,10 +52415,10 @@
     pkg_cv_ODBC_LIBS="$ODBC_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libiodbc") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ODBC_LIBS=`$PKG_CONFIG --libs "libiodbc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -56241,8 +52432,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -56268,10 +52459,10 @@
 and ODBC_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -56281,12 +52472,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ODBC_CFLAGS=$pkg_cv_ODBC_CFLAGS
 	ODBC_LIBS=$pkg_cv_ODBC_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -56331,14 +52522,14 @@
 
     ODBC_TYPE=iodbc
 
-printf "%s\n" "#define HAVE_IODBC 1" >>confdefs.h
+$as_echo "#define HAVE_IODBC 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_ODBC2 1" >>confdefs.h
+$as_echo "#define HAVE_ODBC2 1" >>confdefs.h
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -56349,15 +52540,13 @@
 
 
 # Check whether --with-esoob was given.
-if test ${with_esoob+y}
-then :
+if test "${with_esoob+set}" = set; then :
   withval=$with_esoob; PHP_ESOOB=$withval
-else case e in #(
-  e)
+else
+
   PHP_ESOOB=no
   test "$PHP_ENABLE_ALL" && PHP_ESOOB=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -56388,8 +52577,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Easysoft ODBC-ODBC Bridge support" >&5
-printf %s "checking for Easysoft ODBC-ODBC Bridge support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Easysoft ODBC-ODBC Bridge support" >&5
+$as_echo_n "checking for Easysoft ODBC-ODBC Bridge support... " >&6; }
   if test "$PHP_ESOOB" != "no"; then
     if test "$PHP_ESOOB" = "yes"; then
       PHP_ESOOB=/usr/local/easysoft/oob/client
@@ -56401,13 +52590,13 @@
     ODBC_LIBS=-lesoobclient
     ODBC_TYPE=esoob
 
-printf "%s\n" "#define HAVE_ESOOB 1" >>confdefs.h
+$as_echo "#define HAVE_ESOOB 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -56418,15 +52607,13 @@
 
 
 # Check whether --with-unixODBC was given.
-if test ${with_unixODBC+y}
-then :
+if test "${with_unixODBC+set}" = set; then :
   withval=$with_unixODBC; PHP_UNIXODBC=$withval
-else case e in #(
-  e)
+else
+
   PHP_UNIXODBC=no
   test "$PHP_ENABLE_ALL" && PHP_UNIXODBC=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -56457,25 +52644,25 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with unixODBC support" >&5
-printf %s "checking whether to build with unixODBC support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with unixODBC support" >&5
+$as_echo_n "checking whether to build with unixODBC support... " >&6; }
   if test "$PHP_UNIXODBC" != "no"; then
     if test "$PHP_UNIXODBC" = "yes"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes from pkgconfig" >&5
-printf "%s\n" "yes from pkgconfig" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes from pkgconfig" >&5
+$as_echo "yes from pkgconfig" >&6; }
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for odbc" >&5
-printf %s "checking for odbc... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for odbc" >&5
+$as_echo_n "checking for odbc... " >&6; }
 
 if test -n "$ODBC_CFLAGS"; then
     pkg_cv_ODBC_CFLAGS="$ODBC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5
   ($PKG_CONFIG --exists --print-errors "odbc") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ODBC_CFLAGS=`$PKG_CONFIG --cflags "odbc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -56489,10 +52676,10 @@
     pkg_cv_ODBC_LIBS="$ODBC_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5
   ($PKG_CONFIG --exists --print-errors "odbc") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ODBC_LIBS=`$PKG_CONFIG --libs "odbc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -56506,8 +52693,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -56533,10 +52720,10 @@
 and ODBC_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -56546,12 +52733,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ODBC_CFLAGS=$pkg_cv_ODBC_CFLAGS
 	ODBC_LIBS=$pkg_cv_ODBC_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -56605,16 +52792,16 @@
   as_fn_error $? "ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" "$LINENO" 5
 fi
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes in $PHP_UNIXODBC" >&5
-printf "%s\n" "yes in $PHP_UNIXODBC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes in $PHP_UNIXODBC" >&5
+$as_echo "yes in $PHP_UNIXODBC" >&6; }
     fi
     ODBC_TYPE=unixODBC
 
-printf "%s\n" "#define HAVE_UNIXODBC 1" >>confdefs.h
+$as_echo "#define HAVE_UNIXODBC 1" >>confdefs.h
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -56625,15 +52812,13 @@
 
 
 # Check whether --with-dbmaker was given.
-if test ${with_dbmaker+y}
-then :
+if test "${with_dbmaker+set}" = set; then :
   withval=$with_dbmaker; PHP_DBMAKER=$withval
-else case e in #(
-  e)
+else
+
   PHP_DBMAKER=no
   test "$PHP_ENABLE_ALL" && PHP_DBMAKER=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -56664,8 +52849,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DBMaker support" >&5
-printf %s "checking for DBMaker support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBMaker support" >&5
+$as_echo_n "checking for DBMaker support... " >&6; }
   if test "$PHP_DBMAKER" != "no"; then
     if test "$PHP_DBMAKER" = "yes"; then
             DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'`
@@ -56694,17 +52879,17 @@
     ODBC_TYPE=dbmaker
 
 
-printf "%s\n" "#define HAVE_DBMAKER 1" >>confdefs.h
+$as_echo "#define HAVE_DBMAKER 1" >>confdefs.h
 
 
     if test "$ext_shared" = "yes"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (shared)" >&5
-printf "%s\n" "yes (shared)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (shared)" >&5
+$as_echo "yes (shared)" >&6; }
       ODBC_LIBS="-ldmapic -lc -lm"
       ODBC_SHARED="odbc.la"
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (static)" >&5
-printf "%s\n" "yes (static)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (static)" >&5
+$as_echo "yes (static)" >&6; }
 
 
   if test -n "$ODBC_LIBDIR"; then
@@ -56788,20 +52973,22 @@
       ODBC_STATIC="libphpext_odbc.la"
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
 if test "no" != "$PHP_ODBCVER"; then
   if test "$PHP_ODBCVER" != "0"; then
 
-printf "%s\n" "#define ODBCVER $PHP_ODBCVER" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define ODBCVER $PHP_ODBCVER
+_ACEOF
 
   fi
 else
 
-printf "%s\n" "#define ODBCVER 0x0300" >>confdefs.h
+$as_echo "#define ODBCVER 0x0300" >>confdefs.h
 
 fi
 
@@ -56908,13 +53095,13 @@
 
     if test "$ODBC_TYPE" != "solid"; then
 
-printf "%s\n" "#define HAVE_SQLDATASOURCES 1" >>confdefs.h
+$as_echo "#define HAVE_SQLDATASOURCES 1" >>confdefs.h
 
     fi
   fi
 
 
-printf "%s\n" "#define HAVE_UODBC 1" >>confdefs.h
+$as_echo "#define HAVE_UODBC 1" >>confdefs.h
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_SHARED_LIBADD"
@@ -57084,7 +53271,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_ODBC 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_ODBC 1
+_ACEOF
 
     fi
   fi
@@ -57206,10 +53395,10 @@
   fi
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for any ODBC driver support" >&5
-printf %s "checking for any ODBC driver support... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for any ODBC driver support" >&5
+$as_echo_n "checking for any ODBC driver support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -57218,18 +53407,16 @@
 
 php_enable_opcache=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend OPcache support" >&5
-printf %s "checking whether to enable Zend OPcache support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend OPcache support" >&5
+$as_echo_n "checking whether to enable Zend OPcache support... " >&6; }
 # Check whether --enable-opcache was given.
-if test ${enable_opcache+y}
-then :
+if test "${enable_opcache+set}" = set; then :
   enableval=$enable_opcache; PHP_OPCACHE=$enableval
-else case e in #(
-  e)
+else
+
   PHP_OPCACHE=yes
   test "$PHP_ENABLE_ALL" && PHP_OPCACHE=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -57255,8 +53442,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -57264,24 +53451,22 @@
 
 php_enable_huge_code_pages=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable copying PHP CODE pages into HUGE PAGES" >&5
-printf %s "checking whether to enable copying PHP CODE pages into HUGE PAGES... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable copying PHP CODE pages into HUGE PAGES" >&5
+$as_echo_n "checking whether to enable copying PHP CODE pages into HUGE PAGES... " >&6; }
 # Check whether --enable-huge-code-pages was given.
-if test ${enable_huge_code_pages+y}
-then :
+if test "${enable_huge_code_pages+set}" = set; then :
   enableval=$enable_huge_code_pages; PHP_HUGE_CODE_PAGES=$enableval
-else case e in #(
-  e)
+else
+
   PHP_HUGE_CODE_PAGES=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_HUGE_CODE_PAGES
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -57289,24 +53474,22 @@
 
 php_enable_opcache_jit=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable JIT" >&5
-printf %s "checking whether to enable JIT... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable JIT" >&5
+$as_echo_n "checking whether to enable JIT... " >&6; }
 # Check whether --enable-opcache-jit was given.
-if test ${enable_opcache_jit+y}
-then :
+if test "${enable_opcache_jit+set}" = set; then :
   enableval=$enable_opcache_jit; PHP_OPCACHE_JIT=$enableval
-else case e in #(
-  e)
+else
+
   PHP_OPCACHE_JIT=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_OPCACHE_JIT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -57317,7 +53500,7 @@
 
   if test "$PHP_HUGE_CODE_PAGES" = "yes"; then
 
-printf "%s\n" "#define HAVE_HUGE_CODE_PAGES 1" >>confdefs.h
+$as_echo "#define HAVE_HUGE_CODE_PAGES 1" >>confdefs.h
 
   fi
 
@@ -57326,21 +53509,21 @@
       i3456786*|x86*|aarch64|amd64)
         ;;
       *)
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported by host architecture" >&5
-printf "%s\n" "$as_me: WARNING: JIT not supported by host architecture" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported by host architecture" >&5
+$as_echo "$as_me: WARNING: JIT not supported by host architecture" >&2;}
         PHP_OPCACHE_JIT=no
         ;;
     esac
     if test "$host_vendor" = "apple" && test "$host_cpu" = "aarch64" && test "$PHP_THREAD_SAFETY" = "yes"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported on Apple Silicon with ZTS" >&5
-printf "%s\n" "$as_me: WARNING: JIT not supported on Apple Silicon with ZTS" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported on Apple Silicon with ZTS" >&5
+$as_echo "$as_me: WARNING: JIT not supported on Apple Silicon with ZTS" >&2;}
       PHP_OPCACHE_JIT=no
     fi
   fi
 
   if test "$PHP_OPCACHE_JIT" = "yes"; then
 
-printf "%s\n" "#define HAVE_JIT 1" >>confdefs.h
+$as_echo "#define HAVE_JIT 1" >>confdefs.h
 
     ZEND_JIT_SRC="jit/zend_jit.c jit/zend_jit_gdb.c jit/zend_jit_vm_helpers.c"
 
@@ -57372,17 +53555,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for capstone >= 3.0.0" >&5
-printf %s "checking for capstone >= 3.0.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for capstone >= 3.0.0" >&5
+$as_echo_n "checking for capstone >= 3.0.0... " >&6; }
 
 if test -n "$CAPSTONE_CFLAGS"; then
     pkg_cv_CAPSTONE_CFLAGS="$CAPSTONE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "capstone >= 3.0.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CAPSTONE_CFLAGS=`$PKG_CONFIG --cflags "capstone >= 3.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -57396,10 +53579,10 @@
     pkg_cv_CAPSTONE_LIBS="$CAPSTONE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "capstone >= 3.0.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CAPSTONE_LIBS=`$PKG_CONFIG --libs "capstone >= 3.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -57413,8 +53596,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -57431,19 +53614,19 @@
 
 	have_capstone="no"
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	have_capstone="no"
 else
 	CAPSTONE_CFLAGS=$pkg_cv_CAPSTONE_CFLAGS
 	CAPSTONE_LIBS=$pkg_cv_CAPSTONE_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	have_capstone="yes"
 fi
     if test "$have_capstone" = "yes"; then
 
-printf "%s\n" "#define HAVE_CAPSTONE 1" >>confdefs.h
+$as_echo "#define HAVE_CAPSTONE 1" >>confdefs.h
 
 
   for ac_i in $CAPSTONE_LIBS; do
@@ -57593,19 +53776,19 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST DASM_ARCH"
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for opagent in default path" >&5
-printf %s "checking for opagent in default path... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opagent in default path" >&5
+$as_echo_n "checking for opagent in default path... " >&6; }
     for i in /usr/local /usr; do
       if test -r $i/include/opagent.h; then
         OPAGENT_DIR=$i
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5
-printf "%s\n" "found in $i" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5
+$as_echo "found in $i" >&6; }
         break
       fi
     done
     if test -z "$OPAGENT_DIR"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "not found" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
     else
 
   save_old_LDFLAGS=$LDFLAGS
@@ -57714,57 +53897,49 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for op_write_native_code in -lopagent" >&5
-printf %s "checking for op_write_native_code in -lopagent... " >&6; }
-if test ${ac_cv_lib_opagent_op_write_native_code+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for op_write_native_code in -lopagent" >&5
+$as_echo_n "checking for op_write_native_code in -lopagent... " >&6; }
+if ${ac_cv_lib_opagent_op_write_native_code+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lopagent  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char op_write_native_code (void);
+char op_write_native_code ();
 int
-main (void)
+main ()
 {
 return op_write_native_code ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_opagent_op_write_native_code=yes
-else case e in #(
-  e) ac_cv_lib_opagent_op_write_native_code=no ;;
-esac
+else
+  ac_cv_lib_opagent_op_write_native_code=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opagent_op_write_native_code" >&5
-printf "%s\n" "$ac_cv_lib_opagent_op_write_native_code" >&6; }
-if test "x$ac_cv_lib_opagent_op_write_native_code" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opagent_op_write_native_code" >&5
+$as_echo "$ac_cv_lib_opagent_op_write_native_code" >&6; }
+if test "x$ac_cv_lib_opagent_op_write_native_code" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_OPROFILE 1" >>confdefs.h
+$as_echo "#define HAVE_OPROFILE 1" >>confdefs.h
 
 
   if test "$OPAGENT_DIR/include" != "/usr/include"; then
@@ -57899,38 +54074,40 @@
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_opagent_op_write_native_code
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "not found" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
 
-   ;;
-esac
 fi
 
     fi
 
   fi
 
+  for ac_func in mprotect
+do :
   ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect"
-if test "x$ac_cv_func_mprotect" = xyes
-then :
-  printf "%s\n" "#define HAVE_MPROTECT 1" >>confdefs.h
+if test "x$ac_cv_func_mprotect" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MPROTECT 1
+_ACEOF
 
 fi
+done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysvipc shared memory support" >&5
-printf %s "checking for sysvipc shared memory support... " >&6; }
-  if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysvipc shared memory support" >&5
+$as_echo_n "checking for sysvipc shared memory support... " >&6; }
+  if test "$cross_compiling" = yes; then :
   have_shm_ipc=no
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -57998,30 +54175,26 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   have_shm_ipc=yes
-else case e in #(
-  e) have_shm_ipc=no ;;
-esac
+else
+  have_shm_ipc=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   if test "$have_shm_ipc" = "yes"; then
 
-printf "%s\n" "#define HAVE_SHM_IPC 1" >>confdefs.h
+$as_echo "#define HAVE_SHM_IPC 1" >>confdefs.h
 
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_shm_ipc" >&5
-printf "%s\n" "$have_shm_ipc" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_shm_ipc" >&5
+$as_echo "$have_shm_ipc" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mmap() using MAP_ANON shared memory support" >&5
-printf %s "checking for mmap() using MAP_ANON shared memory support... " >&6; }
-  if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mmap() using MAP_ANON shared memory support" >&5
+$as_echo_n "checking for mmap() using MAP_ANON shared memory support... " >&6; }
+  if test "$cross_compiling" = yes; then :
 
   case $host_alias in
     *linux*)
@@ -58032,8 +54205,8 @@
       ;;
   esac
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -58083,165 +54256,140 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   have_shm_mmap_anon=yes
-else case e in #(
-  e) have_shm_mmap_anon=no ;;
-esac
+else
+  have_shm_mmap_anon=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   if test "$have_shm_mmap_anon" = "yes"; then
 
-printf "%s\n" "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h
+$as_echo "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h
 
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_shm_mmap_anon" >&5
-printf "%s\n" "$have_shm_mmap_anon" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_shm_mmap_anon" >&5
+$as_echo "$have_shm_mmap_anon" >&6; }
 
 
 
   unset ac_cv_lib_rt_shm_open
   unset ac_cv_lib_rt___shm_open
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shm_open in -lrt" >&5
-printf %s "checking for shm_open in -lrt... " >&6; }
-if test ${ac_cv_lib_rt_shm_open+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shm_open in -lrt" >&5
+$as_echo_n "checking for shm_open in -lrt... " >&6; }
+if ${ac_cv_lib_rt_shm_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char shm_open (void);
+char shm_open ();
 int
-main (void)
+main ()
 {
 return shm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt_shm_open=yes
-else case e in #(
-  e) ac_cv_lib_rt_shm_open=no ;;
-esac
+else
+  ac_cv_lib_rt_shm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_shm_open" >&5
-printf "%s\n" "$ac_cv_lib_rt_shm_open" >&6; }
-if test "x$ac_cv_lib_rt_shm_open" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_shm_open" >&5
+$as_echo "$ac_cv_lib_rt_shm_open" >&6; }
+if test "x$ac_cv_lib_rt_shm_open" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __shm_open in -lrt" >&5
-printf %s "checking for __shm_open in -lrt... " >&6; }
-if test ${ac_cv_lib_rt___shm_open+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __shm_open in -lrt" >&5
+$as_echo_n "checking for __shm_open in -lrt... " >&6; }
+if ${ac_cv_lib_rt___shm_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __shm_open (void);
+char __shm_open ();
 int
-main (void)
+main ()
 {
 return __shm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt___shm_open=yes
-else case e in #(
-  e) ac_cv_lib_rt___shm_open=no ;;
-esac
+else
+  ac_cv_lib_rt___shm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___shm_open" >&5
-printf "%s\n" "$ac_cv_lib_rt___shm_open" >&6; }
-if test "x$ac_cv_lib_rt___shm_open" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___shm_open" >&5
+$as_echo "$ac_cv_lib_rt___shm_open" >&6; }
+if test "x$ac_cv_lib_rt___shm_open" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lrt"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -58259,10 +54407,10 @@
 
 
 
-printf "%s\n" "#define HAVE_SHM_OPEN 1" >>confdefs.h
+$as_echo "#define HAVE_SHM_OPEN 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRT 1" >>confdefs.h
 
     ac_cv_func_shm_open=yes
   else
@@ -58271,140 +54419,118 @@
   unset ac_cv_lib_root_shm_open
   unset ac_cv_lib_root___shm_open
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shm_open in -lroot" >&5
-printf %s "checking for shm_open in -lroot... " >&6; }
-if test ${ac_cv_lib_root_shm_open+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shm_open in -lroot" >&5
+$as_echo_n "checking for shm_open in -lroot... " >&6; }
+if ${ac_cv_lib_root_shm_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char shm_open (void);
+char shm_open ();
 int
-main (void)
+main ()
 {
 return shm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_root_shm_open=yes
-else case e in #(
-  e) ac_cv_lib_root_shm_open=no ;;
-esac
+else
+  ac_cv_lib_root_shm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_shm_open" >&5
-printf "%s\n" "$ac_cv_lib_root_shm_open" >&6; }
-if test "x$ac_cv_lib_root_shm_open" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_shm_open" >&5
+$as_echo "$ac_cv_lib_root_shm_open" >&6; }
+if test "x$ac_cv_lib_root_shm_open" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __shm_open in -lroot" >&5
-printf %s "checking for __shm_open in -lroot... " >&6; }
-if test ${ac_cv_lib_root___shm_open+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __shm_open in -lroot" >&5
+$as_echo_n "checking for __shm_open in -lroot... " >&6; }
+if ${ac_cv_lib_root___shm_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __shm_open (void);
+char __shm_open ();
 int
-main (void)
+main ()
 {
 return __shm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_root___shm_open=yes
-else case e in #(
-  e) ac_cv_lib_root___shm_open=no ;;
-esac
+else
+  ac_cv_lib_root___shm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___shm_open" >&5
-printf "%s\n" "$ac_cv_lib_root___shm_open" >&6; }
-if test "x$ac_cv_lib_root___shm_open" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___shm_open" >&5
+$as_echo "$ac_cv_lib_root___shm_open" >&6; }
+if test "x$ac_cv_lib_root___shm_open" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lroot"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -58422,10 +54548,10 @@
 
 
 
-printf "%s\n" "#define HAVE_SHM_OPEN 1" >>confdefs.h
+$as_echo "#define HAVE_SHM_OPEN 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBROOT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBROOT 1" >>confdefs.h
 
     ac_cv_func_shm_open=yes
   else
@@ -58438,13 +54564,12 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mmap() using shm_open() shared memory support" >&5
-printf %s "checking for mmap() using shm_open() shared memory support... " >&6; }
-  if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mmap() using shm_open() shared memory support" >&5
+$as_echo_n "checking for mmap() using shm_open() shared memory support... " >&6; }
+  if test "$cross_compiling" = yes; then :
   have_shm_mmap_posix=no
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -58511,21 +54636,18 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   have_shm_mmap_posix=yes
-else case e in #(
-  e) have_shm_mmap_posix=no ;;
-esac
+else
+  have_shm_mmap_posix=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   if test "$have_shm_mmap_posix" = "yes"; then
 
-printf "%s\n" "#define HAVE_SHM_MMAP_POSIX 1" >>confdefs.h
+$as_echo "#define HAVE_SHM_MMAP_POSIX 1" >>confdefs.h
 
 
   save_old_LDFLAGS=$LDFLAGS
@@ -58632,51 +54754,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shm_unlink in -lrt" >&5
-printf %s "checking for shm_unlink in -lrt... " >&6; }
-if test ${ac_cv_lib_rt_shm_unlink+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shm_unlink in -lrt" >&5
+$as_echo_n "checking for shm_unlink in -lrt... " >&6; }
+if ${ac_cv_lib_rt_shm_unlink+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char shm_unlink (void);
+char shm_unlink ();
 int
-main (void)
+main ()
 {
 return shm_unlink ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt_shm_unlink=yes
-else case e in #(
-  e) ac_cv_lib_rt_shm_unlink=no ;;
-esac
+else
+  ac_cv_lib_rt_shm_unlink=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_shm_unlink" >&5
-printf "%s\n" "$ac_cv_lib_rt_shm_unlink" >&6; }
-if test "x$ac_cv_lib_rt_shm_unlink" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_shm_unlink" >&5
+$as_echo "$ac_cv_lib_rt_shm_unlink" >&6; }
+if test "x$ac_cv_lib_rt_shm_unlink" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -58704,59 +54818,52 @@
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_rt_shm_unlink
 
-   ;;
-esac
+
 fi
 
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_shm_mmap_posix" >&5
-printf "%s\n" "$have_shm_mmap_posix" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_shm_mmap_posix" >&5
+$as_echo "$have_shm_mmap_posix" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
+$as_echo_n "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
-printf %s "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wno-implicit-fallthrough"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes; then :
   PHP_OPCACHE_CFLAGS="$PHP_OPCACHE_CFLAGS -Wno-implicit-fallthrough"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
@@ -58920,7 +55027,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_OPCACHE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_OPCACHE 1
+_ACEOF
 
     fi
   fi
@@ -59116,18 +55225,16 @@
 
 php_enable_pcntl=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable pcntl support" >&5
-printf %s "checking whether to enable pcntl support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable pcntl support" >&5
+$as_echo_n "checking whether to enable pcntl support... " >&6; }
 # Check whether --enable-pcntl was given.
-if test ${enable_pcntl+y}
-then :
+if test "${enable_pcntl+set}" = set; then :
   enableval=$enable_pcntl; PHP_PCNTL=$enableval
-else case e in #(
-  e)
+else
+
   PHP_PCNTL=no
   test "$PHP_ENABLE_ALL" && PHP_PCNTL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -59153,113 +55260,67 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_PCNTL" != "no"; then
-
   for ac_func in fork
 do :
   ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
-if test "x$ac_cv_func_fork" = xyes
-then :
-  printf "%s\n" "#define HAVE_FORK 1" >>confdefs.h
+if test "x$ac_cv_func_fork" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_FORK 1
+_ACEOF
 
-else case e in #(
-  e) as_fn_error $? "pcntl: fork() not supported by this platform" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "pcntl: fork() not supported by this platform" "$LINENO" 5
 fi
-
 done
 
   for ac_func in waitpid
 do :
   ac_fn_c_check_func "$LINENO" "waitpid" "ac_cv_func_waitpid"
-if test "x$ac_cv_func_waitpid" = xyes
-then :
-  printf "%s\n" "#define HAVE_WAITPID 1" >>confdefs.h
+if test "x$ac_cv_func_waitpid" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_WAITPID 1
+_ACEOF
 
-else case e in #(
-  e) as_fn_error $? "pcntl: waitpid() not supported by this platform" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "pcntl: waitpid() not supported by this platform" "$LINENO" 5
 fi
-
 done
 
   for ac_func in sigaction
 do :
   ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
-if test "x$ac_cv_func_sigaction" = xyes
-then :
-  printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
+if test "x$ac_cv_func_sigaction" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGACTION 1
+_ACEOF
 
-else case e in #(
-  e) as_fn_error $? "pcntl: sigaction() not supported by this platform" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "pcntl: sigaction() not supported by this platform" "$LINENO" 5
 fi
-
 done
-  ac_fn_c_check_func "$LINENO" "getpriority" "ac_cv_func_getpriority"
-if test "x$ac_cv_func_getpriority" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETPRIORITY 1" >>confdefs.h
 
-fi
-ac_fn_c_check_func "$LINENO" "setpriority" "ac_cv_func_setpriority"
-if test "x$ac_cv_func_setpriority" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETPRIORITY 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "wait3" "ac_cv_func_wait3"
-if test "x$ac_cv_func_wait3" = xyes
-then :
-  printf "%s\n" "#define HAVE_WAIT3 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "wait4" "ac_cv_func_wait4"
-if test "x$ac_cv_func_wait4" = xyes
-then :
-  printf "%s\n" "#define HAVE_WAIT4 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "sigwaitinfo" "ac_cv_func_sigwaitinfo"
-if test "x$ac_cv_func_sigwaitinfo" = xyes
-then :
-  printf "%s\n" "#define HAVE_SIGWAITINFO 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "sigtimedwait" "ac_cv_func_sigtimedwait"
-if test "x$ac_cv_func_sigtimedwait" = xyes
-then :
-  printf "%s\n" "#define HAVE_SIGTIMEDWAIT 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "unshare" "ac_cv_func_unshare"
-if test "x$ac_cv_func_unshare" = xyes
-then :
-  printf "%s\n" "#define HAVE_UNSHARE 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "rfork" "ac_cv_func_rfork"
-if test "x$ac_cv_func_rfork" = xyes
-then :
-  printf "%s\n" "#define HAVE_RFORK 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "forkx" "ac_cv_func_forkx"
-if test "x$ac_cv_func_forkx" = xyes
-then :
-  printf "%s\n" "#define HAVE_FORKX 1" >>confdefs.h
+  for ac_func in getpriority setpriority wait3 wait4 sigwaitinfo sigtimedwait unshare rfork forkx
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for siginfo_t" >&5
-printf %s "checking for siginfo_t... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for siginfo_t" >&5
+$as_echo_n "checking for siginfo_t... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -59269,7 +55330,7 @@
     #endif
 
 int
-main (void)
+main ()
 {
 
     siginfo_t info;
@@ -59278,21 +55339,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     PCNTL_CFLAGS="-DHAVE_STRUCT_SIGINFO_T"
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
   ext_builddir=ext/pcntl
@@ -59428,7 +55487,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PCNTL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PCNTL 1
+_ACEOF
 
     fi
   fi
@@ -59557,18 +55618,16 @@
 
 php_enable_pdo=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PDO support" >&5
-printf %s "checking whether to enable PDO support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PDO support" >&5
+$as_echo_n "checking whether to enable PDO support... " >&6; }
 # Check whether --enable-pdo was given.
-if test ${enable_pdo+y}
-then :
+if test "${enable_pdo+set}" = set; then :
   enableval=$enable_pdo; PHP_PDO=$enableval
-else case e in #(
-  e)
+else
+
   PHP_PDO=yes
   test "$PHP_ENABLE_ALL" && PHP_PDO=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -59594,8 +55653,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -59738,7 +55797,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PDO 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO 1
+_ACEOF
 
     fi
   fi
@@ -59913,19 +55974,17 @@
 
 php_with_pdo_dblib=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO_DBLIB support via FreeTDS" >&5
-printf %s "checking for PDO_DBLIB support via FreeTDS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO_DBLIB support via FreeTDS" >&5
+$as_echo_n "checking for PDO_DBLIB support via FreeTDS... " >&6; }
 
 # Check whether --with-pdo-dblib was given.
-if test ${with_pdo_dblib+y}
-then :
+if test "${with_pdo_dblib+set}" = set; then :
   withval=$with_pdo_dblib; PHP_PDO_DBLIB=$withval
-else case e in #(
-  e)
+else
+
   PHP_PDO_DBLIB=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_DBLIB=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -59951,8 +56010,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -60069,66 +56128,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbsqlexec in -lsybdb" >&5
-printf %s "checking for dbsqlexec in -lsybdb... " >&6; }
-if test ${ac_cv_lib_sybdb_dbsqlexec+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbsqlexec in -lsybdb" >&5
+$as_echo_n "checking for dbsqlexec in -lsybdb... " >&6; }
+if ${ac_cv_lib_sybdb_dbsqlexec+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsybdb  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dbsqlexec (void);
+char dbsqlexec ();
 int
-main (void)
+main ()
 {
 return dbsqlexec ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sybdb_dbsqlexec=yes
-else case e in #(
-  e) ac_cv_lib_sybdb_dbsqlexec=no ;;
-esac
+else
+  ac_cv_lib_sybdb_dbsqlexec=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybdb_dbsqlexec" >&5
-printf "%s\n" "$ac_cv_lib_sybdb_dbsqlexec" >&6; }
-if test "x$ac_cv_lib_sybdb_dbsqlexec" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybdb_dbsqlexec" >&5
+$as_echo "$ac_cv_lib_sybdb_dbsqlexec" >&6; }
+if test "x$ac_cv_lib_sybdb_dbsqlexec" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sybdb_dbsqlexec
 
       as_fn_error $? "Cannot find FreeTDS in known installation directories" "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -60305,13 +56355,12 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-printf %s "checking for PDO includes... " >&6; }
-if test ${pdo_cv_inc_path+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if ${pdo_cv_inc_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
     elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -60319,11 +56368,10 @@
     elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$phpincludedir/ext
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-printf "%s\n" "$pdo_cv_inc_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+$as_echo "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
@@ -60466,7 +56514,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PDO_DBLIB 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO_DBLIB 1
+_ACEOF
 
     fi
   fi
@@ -60587,51 +56637,43 @@
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_addr in -ldnet_stub" >&5
-printf %s "checking for dnet_addr in -ldnet_stub... " >&6; }
-if test ${ac_cv_lib_dnet_stub_dnet_addr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_addr in -ldnet_stub" >&5
+$as_echo_n "checking for dnet_addr in -ldnet_stub... " >&6; }
+if ${ac_cv_lib_dnet_stub_dnet_addr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dnet_addr (void);
+char dnet_addr ();
 int
-main (void)
+main ()
 {
 return dnet_addr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dnet_stub_dnet_addr=yes
-else case e in #(
-  e) ac_cv_lib_dnet_stub_dnet_addr=no ;;
-esac
+else
+  ac_cv_lib_dnet_stub_dnet_addr=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_addr" >&5
-printf "%s\n" "$ac_cv_lib_dnet_stub_dnet_addr" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_addr" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_addr" >&5
+$as_echo "$ac_cv_lib_dnet_stub_dnet_addr" >&6; }
+if test "x$ac_cv_lib_dnet_stub_dnet_addr" = xyes; then :
 
 
 
@@ -60734,7 +56776,7 @@
 fi
 
 
-printf "%s\n" "#define HAVE_PDO_DBLIB 1" >>confdefs.h
+$as_echo "#define HAVE_PDO_DBLIB 1" >>confdefs.h
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_DBLIB_SHARED_LIBADD"
@@ -60767,19 +56809,17 @@
 
 php_with_pdo_firebird=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Firebird support for PDO" >&5
-printf %s "checking for Firebird support for PDO... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Firebird support for PDO" >&5
+$as_echo_n "checking for Firebird support for PDO... " >&6; }
 
 # Check whether --with-pdo-firebird was given.
-if test ${with_pdo_firebird+y}
-then :
+if test "${with_pdo_firebird+set}" = set; then :
   withval=$with_pdo_firebird; PHP_PDO_FIREBIRD=$withval
-else case e in #(
-  e)
+else
+
   PHP_PDO_FIREBIRD=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_FIREBIRD=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -60805,8 +56845,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -60819,13 +56859,12 @@
 
   # Extract the first word of "fb_config", so it can be a program name with args.
 set dummy fb_config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_FB_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $FB_CONFIG in
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_FB_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $FB_CONFIG in
   \\/* | ?:\\/*)
   ac_cv_path_FB_CONFIG="$FB_CONFIG" # Let the user override the test with a path.
   ;;
@@ -60834,15 +56873,11 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_FB_CONFIG="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_FB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -60851,28 +56886,27 @@
 
   test -z "$ac_cv_path_FB_CONFIG" && ac_cv_path_FB_CONFIG="no"
   ;;
-esac ;;
 esac
 fi
 FB_CONFIG=$ac_cv_path_FB_CONFIG
 if test -n "$FB_CONFIG"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FB_CONFIG" >&5
-printf "%s\n" "$FB_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FB_CONFIG" >&5
+$as_echo "$FB_CONFIG" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
   if test -x "$FB_CONFIG" && test "$PHP_PDO_FIREBIRD" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libfbconfig" >&5
-printf %s "checking for libfbconfig... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libfbconfig" >&5
+$as_echo_n "checking for libfbconfig... " >&6; }
     FB_CFLAGS=`$FB_CONFIG --cflags`
     FB_LIBDIR=`$FB_CONFIG --libs`
     FB_VERSION=`$FB_CONFIG --version`
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: version $FB_VERSION" >&5
-printf "%s\n" "version $FB_VERSION" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: version $FB_VERSION" >&5
+$as_echo "version $FB_VERSION" >&6; }
 
   for ac_i in $FB_LIBDIR; do
     case $ac_i in
@@ -61131,51 +57165,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lfbclient" >&5
-printf %s "checking for isc_detach_database in -lfbclient... " >&6; }
-if test ${ac_cv_lib_fbclient_isc_detach_database+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lfbclient" >&5
+$as_echo_n "checking for isc_detach_database in -lfbclient... " >&6; }
+if ${ac_cv_lib_fbclient_isc_detach_database+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfbclient  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char isc_detach_database (void);
+char isc_detach_database ();
 int
-main (void)
+main ()
 {
 return isc_detach_database ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_fbclient_isc_detach_database=yes
-else case e in #(
-  e) ac_cv_lib_fbclient_isc_detach_database=no ;;
-esac
+else
+  ac_cv_lib_fbclient_isc_detach_database=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fbclient_isc_detach_database" >&5
-printf "%s\n" "$ac_cv_lib_fbclient_isc_detach_database" >&6; }
-if test "x$ac_cv_lib_fbclient_isc_detach_database" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fbclient_isc_detach_database" >&5
+$as_echo "$ac_cv_lib_fbclient_isc_detach_database" >&6; }
+if test "x$ac_cv_lib_fbclient_isc_detach_database" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -61183,8 +57209,8 @@
       FIREBIRD_LIBNAME=fbclient
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_fbclient_isc_detach_database
@@ -61296,51 +57322,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lgds" >&5
-printf %s "checking for isc_detach_database in -lgds... " >&6; }
-if test ${ac_cv_lib_gds_isc_detach_database+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lgds" >&5
+$as_echo_n "checking for isc_detach_database in -lgds... " >&6; }
+if ${ac_cv_lib_gds_isc_detach_database+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgds  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char isc_detach_database (void);
+char isc_detach_database ();
 int
-main (void)
+main ()
 {
 return isc_detach_database ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gds_isc_detach_database=yes
-else case e in #(
-  e) ac_cv_lib_gds_isc_detach_database=no ;;
-esac
+else
+  ac_cv_lib_gds_isc_detach_database=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gds_isc_detach_database" >&5
-printf "%s\n" "$ac_cv_lib_gds_isc_detach_database" >&6; }
-if test "x$ac_cv_lib_gds_isc_detach_database" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gds_isc_detach_database" >&5
+$as_echo "$ac_cv_lib_gds_isc_detach_database" >&6; }
+if test "x$ac_cv_lib_gds_isc_detach_database" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -61348,8 +57366,8 @@
         FIREBIRD_LIBNAME=gds
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gds_isc_detach_database
@@ -61461,51 +57479,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lib_util" >&5
-printf %s "checking for isc_detach_database in -lib_util... " >&6; }
-if test ${ac_cv_lib_ib_util_isc_detach_database+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lib_util" >&5
+$as_echo_n "checking for isc_detach_database in -lib_util... " >&6; }
+if ${ac_cv_lib_ib_util_isc_detach_database+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lib_util  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char isc_detach_database (void);
+char isc_detach_database ();
 int
-main (void)
+main ()
 {
 return isc_detach_database ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ib_util_isc_detach_database=yes
-else case e in #(
-  e) ac_cv_lib_ib_util_isc_detach_database=no ;;
-esac
+else
+  ac_cv_lib_ib_util_isc_detach_database=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ib_util_isc_detach_database" >&5
-printf "%s\n" "$ac_cv_lib_ib_util_isc_detach_database" >&6; }
-if test "x$ac_cv_lib_ib_util_isc_detach_database" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ib_util_isc_detach_database" >&5
+$as_echo "$ac_cv_lib_ib_util_isc_detach_database" >&6; }
+if test "x$ac_cv_lib_ib_util_isc_detach_database" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -61513,26 +57523,23 @@
           FIREBIRD_LIBNAME=ib_util
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_ib_util_isc_detach_database
 
           as_fn_error $? "libfbclient, libgds or libib_util not found! Check config.log for more information." "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
-   ;;
-esac
+
 fi
 
 
-   ;;
-esac
+
 fi
 
 
@@ -61666,13 +57673,12 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-printf %s "checking for PDO includes... " >&6; }
-if test ${pdo_cv_inc_path+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if ${pdo_cv_inc_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
     elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -61680,11 +57686,10 @@
     elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$phpincludedir/ext
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-printf "%s\n" "$pdo_cv_inc_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+$as_echo "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
@@ -61693,7 +57698,7 @@
 
 
 
-printf "%s\n" "#define HAVE_PDO_FIREBIRD 1" >>confdefs.h
+$as_echo "#define HAVE_PDO_FIREBIRD 1" >>confdefs.h
 
 
   ext_builddir=ext/pdo_firebird
@@ -61829,7 +57834,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PDO_FIREBIRD 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO_FIREBIRD 1
+_ACEOF
 
     fi
   fi
@@ -61980,19 +57987,17 @@
 
 php_with_pdo_mysql=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQL support for PDO" >&5
-printf %s "checking for MySQL support for PDO... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL support for PDO" >&5
+$as_echo_n "checking for MySQL support for PDO... " >&6; }
 
 # Check whether --with-pdo-mysql was given.
-if test ${with_pdo_mysql+y}
-then :
+if test "${with_pdo_mysql+set}" = set; then :
   withval=$with_pdo_mysql; PHP_PDO_MYSQL=$withval
-else case e in #(
-  e)
+else
+
   PHP_PDO_MYSQL=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_MYSQL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -62018,8 +58023,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -62028,40 +58033,40 @@
 
 php_with_zlib_dir=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the location of libz" >&5
-printf %s "checking for the location of libz... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libz" >&5
+$as_echo_n "checking for the location of libz... " >&6; }
 
 # Check whether --with-zlib-dir was given.
-if test ${with_zlib_dir+y}
-then :
+if test "${with_zlib_dir+set}" = set; then :
   withval=$with_zlib_dir; PHP_ZLIB_DIR=$withval
-else case e in #(
-  e)
+else
+
   PHP_ZLIB_DIR=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_ZLIB_DIR
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 fi
 
 if test "$PHP_PDO_MYSQL" != "no"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQL UNIX socket location" >&5
-printf %s "checking for MySQL UNIX socket location... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL UNIX socket location" >&5
+$as_echo_n "checking for MySQL UNIX socket location... " >&6; }
   if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
     MYSQL_SOCK=$PHP_MYSQL_SOCK
 
-printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
+_ACEOF
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
-printf "%s\n" "$MYSQL_SOCK" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
+$as_echo "$MYSQL_SOCK" >&6; }
   elif test "$PHP_MYSQL_SOCK" = "yes"; then
 
   for i in  \
@@ -62083,18 +58088,20 @@
 
   if test -n "$MYSQL_SOCK"; then
 
-printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
+_ACEOF
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
-printf "%s\n" "$MYSQL_SOCK" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
+$as_echo "$MYSQL_SOCK" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
@@ -62118,28 +58125,27 @@
   if test "$PHP_PDO_MYSQL" = "yes" || test "$PHP_PDO_MYSQL" = "mysqlnd"; then
         PHP_MYSQLND_ENABLED=yes
 
-printf "%s\n" "#define PDO_USE_MYSQLND 1" >>confdefs.h
+$as_echo "#define PDO_USE_MYSQLND 1" >>confdefs.h
 
   else
 
-printf "%s\n" "#define HAVE_MYSQL 1" >>confdefs.h
+$as_echo "#define HAVE_MYSQL 1" >>confdefs.h
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_config" >&5
-printf %s "checking for mysql_config... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_config" >&5
+$as_echo_n "checking for mysql_config... " >&6; }
     if test -n "$PDO_MYSQL_CONFIG"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PDO_MYSQL_CONFIG" >&5
-printf "%s\n" "$PDO_MYSQL_CONFIG" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_MYSQL_CONFIG" >&5
+$as_echo "$PDO_MYSQL_CONFIG" >&6; }
       if test "x$SED" = "x"; then
         # Extract the first word of "sed", so it can be a program name with args.
 set dummy sed; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_SED+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $SED in
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $SED in
   \\/* | ?:\\/*)
   ac_cv_path_SED="$SED" # Let the user override the test with a path.
   ;;
@@ -62148,15 +58154,11 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_SED="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -62164,16 +58166,15 @@
 IFS=$as_save_IFS
 
   ;;
-esac ;;
 esac
 fi
 SED=$ac_cv_path_SED
 if test -n "$SED"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
-printf "%s\n" "$SED" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+$as_echo "$SED" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -62181,10 +58182,10 @@
       PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"`
       PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
     elif test -n "$PDO_MYSQL_DIR"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "not found" >&6; }
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql install under $PDO_MYSQL_DIR" >&5
-printf %s "checking for mysql install under $PDO_MYSQL_DIR... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql install under $PDO_MYSQL_DIR" >&5
+$as_echo_n "checking for mysql install under $PDO_MYSQL_DIR... " >&6; }
       if test -r $PDO_MYSQL_DIR/include/mysql; then
         PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql
       else
@@ -62197,11 +58198,11 @@
       fi
 
       if test -r "$PDO_MYSQL_LIB_DIR"; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libs under $PDO_MYSQL_LIB_DIR; seems promising" >&5
-printf "%s\n" "libs under $PDO_MYSQL_LIB_DIR; seems promising" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: libs under $PDO_MYSQL_LIB_DIR; seems promising" >&5
+$as_echo "libs under $PDO_MYSQL_LIB_DIR; seems promising" >&6; }
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can not find it" >&5
-printf "%s\n" "can not find it" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: can not find it" >&5
+$as_echo "can not find it" >&6; }
         as_fn_error $? "Unable to find your mysql installation" "$LINENO" 5
       fi
 
@@ -62238,8 +58239,8 @@
 
       PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "not found" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
       as_fn_error $? "Unable to find your mysql installation" "$LINENO" 5
     fi
 
@@ -62385,13 +58386,12 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-printf %s "checking for PDO includes... " >&6; }
-if test ${pdo_cv_inc_path+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if ${pdo_cv_inc_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
     elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -62399,11 +58399,10 @@
     elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$phpincludedir/ext
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-printf "%s\n" "$pdo_cv_inc_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+$as_echo "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
@@ -62414,7 +58413,9 @@
   if test -n "$PDO_MYSQL_CONFIG"; then
     PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket`
 
-printf "%s\n" "#define PDO_MYSQL_UNIX_ADDR \"$PDO_MYSQL_SOCKET\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PDO_MYSQL_UNIX_ADDR "$PDO_MYSQL_SOCKET"
+_ACEOF
 
   fi
 
@@ -62552,7 +58553,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PDO_MYSQL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO_MYSQL 1
+_ACEOF
 
     fi
   fi
@@ -62752,19 +58755,17 @@
 
 php_with_pdo_oci=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle OCI support for PDO" >&5
-printf %s "checking Oracle OCI support for PDO... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle OCI support for PDO" >&5
+$as_echo_n "checking Oracle OCI support for PDO... " >&6; }
 
 # Check whether --with-pdo-oci was given.
-if test ${with_pdo_oci+y}
-then :
+if test "${with_pdo_oci+set}" = set; then :
   withval=$with_pdo_oci; PHP_PDO_OCI=$withval
-else case e in #(
-  e)
+else
+
   PHP_PDO_OCI=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_OCI=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -62790,8 +58791,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -62802,83 +58803,79 @@
     as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle Install-Dir" >&5
-printf %s "checking Oracle Install-Dir... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Install-Dir" >&5
+$as_echo_n "checking Oracle Install-Dir... " >&6; }
   if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then
     PDO_OCI_DIR=$ORACLE_HOME
   else
     PDO_OCI_DIR=$PHP_PDO_OCI
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_PDO_OCI" >&5
-printf "%s\n" "$PHP_PDO_OCI" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_PDO_OCI" >&5
+$as_echo "$PHP_PDO_OCI" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if that is sane" >&5
-printf %s "checking if that is sane... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if that is sane" >&5
+$as_echo_n "checking if that is sane... " >&6; }
   if test -z "$PDO_OCI_DIR"; then
     as_fn_error $? "You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME." "$LINENO" 5
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   fi
 
   if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then
     # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3(sizeof (unsigned char)) >= 0;'.
+# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-printf %s "checking size of long... " >&6; }
-if test ${ac_cv_sizeof_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-printf %s "checking if we're at 64-bit platform... " >&6; }
-    if test "$ac_cv_sizeof_long" -eq 4
-then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+$as_echo_n "checking if we're at 64-bit platform... " >&6; }
+    if test "$ac_cv_sizeof_long" -eq 4; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       PDO_OCI_CLIENT_DIR="client"
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       PDO_OCI_CLIENT_DIR="client64"
-     ;;
-esac
+
 fi
 
     PDO_OCI_LIB_DIR="`echo $PDO_OCI_DIR | cut -d, -f2`"
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5
-printf %s "checking Oracle version... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5
+$as_echo_n "checking Oracle version... " >&6; }
   PDO_OCI_LCS_BASE=$PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
     PDO_OCI_LCS=`ls $PDO_OCI_LCS_BASE.*.1 2> /dev/null | $PHP_PDO_OCI_TAIL1`
   if test -f "$PDO_OCI_LCS"; then
@@ -62888,12 +58885,12 @@
   else
     as_fn_error $? "Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found or its version is lower than 9" "$LINENO" 5
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_VERSION" >&5
-printf "%s\n" "$PDO_OCI_VERSION" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_VERSION" >&5
+$as_echo "$PDO_OCI_VERSION" >&6; }
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for oci.h" >&5
-printf %s "checking for oci.h... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for oci.h" >&5
+$as_echo_n "checking for oci.h... " >&6; }
         OCISDKRPMINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^$.*$/lib/oracle/$.*$/$'${PDO_OCI_CLIENT_DIR}'$/lib/*$!\1/include/oracle/\2/\3!'`
 
         OCISDKMANINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^$.*$/lib/*$!\1/include!'`
@@ -62933,8 +58930,8 @@
 
   fi
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKRPMINC" >&5
-printf "%s\n" "$OCISDKRPMINC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKRPMINC" >&5
+$as_echo "$OCISDKRPMINC" >&6; }
     elif test -f "$OCISDKMANINC/oci.h" ; then
 
   if test "$OCISDKMANINC" != "/usr/include"; then
@@ -62967,8 +58964,8 @@
 
   fi
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKMANINC" >&5
-printf "%s\n" "$OCISDKMANINC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKMANINC" >&5
+$as_echo "$OCISDKMANINC" >&6; }
     elif test -f "$OCISDKZIPINC/oci.h" ; then
 
   if test "$OCISDKZIPINC" != "/usr/include"; then
@@ -63001,8 +58998,8 @@
 
   fi
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKZIPINC" >&5
-printf "%s\n" "$OCISDKZIPINC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKZIPINC" >&5
+$as_echo "$OCISDKZIPINC" >&6; }
     else
       as_fn_error $? "I'm too dumb to figure out where the include dir is in your Instant Client install" "$LINENO" 5
     fi
@@ -63010,59 +59007,55 @@
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3(sizeof (unsigned char)) >= 0;'.
+# declarations like `int a3(sizeof (unsigned char)) >= 0;'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-printf %s "checking size of long... " >&6; }
-if test ${ac_cv_sizeof_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-printf %s "checking if we're at 64-bit platform... " >&6; }
-  if test "$ac_cv_sizeof_long" -eq 4
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+$as_echo_n "checking if we're at 64-bit platform... " >&6; }
+  if test "$ac_cv_sizeof_long" -eq 4; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
-   ;;
-esac
+
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking OCI8 libraries dir" >&5
-printf %s "checking OCI8 libraries dir... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking OCI8 libraries dir" >&5
+$as_echo_n "checking OCI8 libraries dir... " >&6; }
   if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then
     PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
   elif test ! -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then
@@ -63072,8 +59065,8 @@
   else
     as_fn_error $? "Oracle required OCI8 libraries not found" "$LINENO" 5
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_LIB_DIR" >&5
-printf "%s\n" "$PDO_OCI_LIB_DIR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_LIB_DIR" >&5
+$as_echo "$PDO_OCI_LIB_DIR" >&6; }
 
 
     if test -d "$PDO_OCI_DIR/rdbms/public"; then
@@ -63449,8 +59442,8 @@
 
     fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5
-printf %s "checking Oracle version... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5
+$as_echo_n "checking Oracle version... " >&6; }
   PDO_OCI_LCS_BASE=$PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
     PDO_OCI_LCS=`ls $PDO_OCI_LCS_BASE.*.1 2> /dev/null | $PHP_PDO_OCI_TAIL1`
   if test -f "$PDO_OCI_LCS"; then
@@ -63460,8 +59453,8 @@
   else
     as_fn_error $? "Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found or its version is lower than 9" "$LINENO" 5
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_VERSION" >&5
-printf "%s\n" "$PDO_OCI_VERSION" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_VERSION" >&5
+$as_echo "$PDO_OCI_VERSION" >&6; }
 
   fi
 
@@ -63640,68 +59633,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OCIEnvCreate in -lclntsh" >&5
-printf %s "checking for OCIEnvCreate in -lclntsh... " >&6; }
-if test ${ac_cv_lib_clntsh_OCIEnvCreate+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIEnvCreate in -lclntsh" >&5
+$as_echo_n "checking for OCIEnvCreate in -lclntsh... " >&6; }
+if ${ac_cv_lib_clntsh_OCIEnvCreate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char OCIEnvCreate (void);
+char OCIEnvCreate ();
 int
-main (void)
+main ()
 {
 return OCIEnvCreate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_clntsh_OCIEnvCreate=yes
-else case e in #(
-  e) ac_cv_lib_clntsh_OCIEnvCreate=no ;;
-esac
+else
+  ac_cv_lib_clntsh_OCIEnvCreate=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvCreate" >&5
-printf "%s\n" "$ac_cv_lib_clntsh_OCIEnvCreate" >&6; }
-if test "x$ac_cv_lib_clntsh_OCIEnvCreate" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvCreate" >&5
+$as_echo "$ac_cv_lib_clntsh_OCIEnvCreate" >&6; }
+if test "x$ac_cv_lib_clntsh_OCIEnvCreate" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_OCIENVCREATE 1" >>confdefs.h
+$as_echo "#define HAVE_OCIENVCREATE 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_clntsh_OCIEnvCreate
 
-   ;;
-esac
+
 fi
 
 
@@ -63812,68 +59796,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OCIEnvNlsCreate in -lclntsh" >&5
-printf %s "checking for OCIEnvNlsCreate in -lclntsh... " >&6; }
-if test ${ac_cv_lib_clntsh_OCIEnvNlsCreate+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIEnvNlsCreate in -lclntsh" >&5
+$as_echo_n "checking for OCIEnvNlsCreate in -lclntsh... " >&6; }
+if ${ac_cv_lib_clntsh_OCIEnvNlsCreate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char OCIEnvNlsCreate (void);
+char OCIEnvNlsCreate ();
 int
-main (void)
+main ()
 {
 return OCIEnvNlsCreate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_clntsh_OCIEnvNlsCreate=yes
-else case e in #(
-  e) ac_cv_lib_clntsh_OCIEnvNlsCreate=no ;;
-esac
+else
+  ac_cv_lib_clntsh_OCIEnvNlsCreate=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5
-printf "%s\n" "$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6; }
-if test "x$ac_cv_lib_clntsh_OCIEnvNlsCreate" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5
+$as_echo "$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6; }
+if test "x$ac_cv_lib_clntsh_OCIEnvNlsCreate" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_OCIENVNLSCREATE 1" >>confdefs.h
+$as_echo "#define HAVE_OCIENVNLSCREATE 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_clntsh_OCIEnvNlsCreate
 
-   ;;
-esac
+
 fi
 
 
@@ -63984,68 +59959,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OCIStmtFetch2 in -lclntsh" >&5
-printf %s "checking for OCIStmtFetch2 in -lclntsh... " >&6; }
-if test ${ac_cv_lib_clntsh_OCIStmtFetch2+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIStmtFetch2 in -lclntsh" >&5
+$as_echo_n "checking for OCIStmtFetch2 in -lclntsh... " >&6; }
+if ${ac_cv_lib_clntsh_OCIStmtFetch2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char OCIStmtFetch2 (void);
+char OCIStmtFetch2 ();
 int
-main (void)
+main ()
 {
 return OCIStmtFetch2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_clntsh_OCIStmtFetch2=yes
-else case e in #(
-  e) ac_cv_lib_clntsh_OCIStmtFetch2=no ;;
-esac
+else
+  ac_cv_lib_clntsh_OCIStmtFetch2=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIStmtFetch2" >&5
-printf "%s\n" "$ac_cv_lib_clntsh_OCIStmtFetch2" >&6; }
-if test "x$ac_cv_lib_clntsh_OCIStmtFetch2" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIStmtFetch2" >&5
+$as_echo "$ac_cv_lib_clntsh_OCIStmtFetch2" >&6; }
+if test "x$ac_cv_lib_clntsh_OCIStmtFetch2" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_OCISTMTFETCH2 1" >>confdefs.h
+$as_echo "#define HAVE_OCISTMTFETCH2 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_clntsh_OCIStmtFetch2
 
-   ;;
-esac
+
 fi
 
 
@@ -64156,79 +60122,69 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OCILobRead2 in -lclntsh" >&5
-printf %s "checking for OCILobRead2 in -lclntsh... " >&6; }
-if test ${ac_cv_lib_clntsh_OCILobRead2+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCILobRead2 in -lclntsh" >&5
+$as_echo_n "checking for OCILobRead2 in -lclntsh... " >&6; }
+if ${ac_cv_lib_clntsh_OCILobRead2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char OCILobRead2 (void);
+char OCILobRead2 ();
 int
-main (void)
+main ()
 {
 return OCILobRead2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_clntsh_OCILobRead2=yes
-else case e in #(
-  e) ac_cv_lib_clntsh_OCILobRead2=no ;;
-esac
+else
+  ac_cv_lib_clntsh_OCILobRead2=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCILobRead2" >&5
-printf "%s\n" "$ac_cv_lib_clntsh_OCILobRead2" >&6; }
-if test "x$ac_cv_lib_clntsh_OCILobRead2" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCILobRead2" >&5
+$as_echo "$ac_cv_lib_clntsh_OCILobRead2" >&6; }
+if test "x$ac_cv_lib_clntsh_OCILobRead2" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_OCILOBREAD2 1" >>confdefs.h
+$as_echo "#define HAVE_OCILOBREAD2 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_clntsh_OCILobRead2
 
-   ;;
-esac
+
 fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-printf %s "checking for PDO includes... " >&6; }
-if test ${pdo_cv_inc_path+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if ${pdo_cv_inc_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
     elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -64236,11 +60192,10 @@
     elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$phpincludedir/ext
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-printf "%s\n" "$pdo_cv_inc_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+$as_echo "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
@@ -64382,7 +60337,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PDO_OCI 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO_OCI 1
+_ACEOF
 
     fi
   fi
@@ -64544,7 +60501,9 @@
 
 
 
-printf "%s\n" "#define PHP_PDO_OCI_CLIENT_VERSION \"$PDO_OCI_VERSION\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_PDO_OCI_CLIENT_VERSION "$PDO_OCI_VERSION"
+_ACEOF
 
 fi
 
@@ -64556,19 +60515,17 @@
 
 php_with_pdo_odbc=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ODBC v3 support for PDO" >&5
-printf %s "checking for ODBC v3 support for PDO... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ODBC v3 support for PDO" >&5
+$as_echo_n "checking for ODBC v3 support for PDO... " >&6; }
 
 # Check whether --with-pdo-odbc was given.
-if test ${with_pdo_odbc+y}
-then :
+if test "${with_pdo_odbc+set}" = set; then :
   withval=$with_pdo_odbc; PHP_PDO_ODBC=$withval
-else case e in #(
-  e)
+else
+
   PHP_PDO_ODBC=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_ODBC=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -64594,8 +60551,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -64609,13 +60566,12 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-printf %s "checking for PDO includes... " >&6; }
-if test ${pdo_cv_inc_path+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if ${pdo_cv_inc_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
     elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -64623,11 +60579,10 @@
     elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$phpincludedir/ext
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-printf "%s\n" "$pdo_cv_inc_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+$as_echo "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
@@ -64635,8 +60590,8 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for selected PDO ODBC flavour" >&5
-printf %s "checking for selected PDO ODBC flavour... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for selected PDO ODBC flavour" >&5
+$as_echo_n "checking for selected PDO ODBC flavour... " >&6; }
 
   pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`"
   pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`"
@@ -64697,286 +60652,286 @@
     PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir"
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_odbc_flavour
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_odbc_flavour
           libs       $PDO_ODBC_LIBDIR,
           headers    $PDO_ODBC_INCDIR" >&5
-printf "%s\n" "$pdo_odbc_flavour
+$as_echo "$pdo_odbc_flavour
           libs       $PDO_ODBC_LIBDIR,
           headers    $PDO_ODBC_INCDIR" >&6; }
 
   if test ! -d "$PDO_ODBC_LIBDIR" ; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&5
-printf "%s\n" "$as_me: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&5
+$as_echo "$as_me: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&2;}
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for odbc.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for odbc.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/odbc.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_ODBC_H 1" >>confdefs.h
+$as_echo "#define HAVE_ODBC_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for odbcsdk.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_ODBCSDK_H 1" >>confdefs.h
+$as_echo "#define HAVE_ODBCSDK_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for iodbc.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for iodbc.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_IODBC_H 1" >>confdefs.h
+$as_echo "#define HAVE_IODBC_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for sqlunix.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for sqlunix.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_SQLUNIX_H 1" >>confdefs.h
+$as_echo "#define HAVE_SQLUNIX_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for sqltypes.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for sqltypes.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_SQLTYPES_H 1" >>confdefs.h
+$as_echo "#define HAVE_SQLTYPES_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for sqlucode.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for sqlucode.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_SQLUCODE_H 1" >>confdefs.h
+$as_echo "#define HAVE_SQLUCODE_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sql.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for sql.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sql.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for sql.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sql.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_SQL_H 1" >>confdefs.h
+$as_echo "#define HAVE_SQL_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isql.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for isql.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isql.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for isql.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/isql.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_ISQL_H 1" >>confdefs.h
+$as_echo "#define HAVE_ISQL_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for sqlext.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for sqlext.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_SQLEXT_H 1" >>confdefs.h
+$as_echo "#define HAVE_SQLEXT_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for isqlext.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for isqlext.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_ISQLEXT_H 1" >>confdefs.h
+$as_echo "#define HAVE_ISQLEXT_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for udbcext.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for udbcext.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_UDBCEXT_H 1" >>confdefs.h
+$as_echo "#define HAVE_UDBCEXT_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for sqlcli1.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_SQLCLI1_H 1" >>confdefs.h
+$as_echo "#define HAVE_SQLCLI1_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for LibraryManager.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_LIBRARYMANAGER_H 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRARYMANAGER_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for cli0core.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for cli0core.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_CLI0CORE_H 1" >>confdefs.h
+$as_echo "#define HAVE_CLI0CORE_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for cli0ext.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for cli0ext.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_CLI0EXT_H 1" >>confdefs.h
+$as_echo "#define HAVE_CLI0EXT_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for cli0cli.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for cli0cli.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_CLI0CLI_H 1" >>confdefs.h
+$as_echo "#define HAVE_CLI0CLI_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for cli0defs.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for cli0defs.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_CLI0DEFS_H 1" >>confdefs.h
+$as_echo "#define HAVE_CLI0DEFS_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for cli0env.h in $PDO_ODBC_INCDIR... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for cli0env.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then
     php_pdo_have_header=yes
 
-printf "%s\n" "#define HAVE_CLI0ENV_H 1" >>confdefs.h
+$as_echo "#define HAVE_CLI0ENV_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
@@ -65192,53 +61147,45 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$pdo_odbc_def_lib""_SQLBindCol" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
-printf %s "checking for SQLBindCol in -l$pdo_odbc_def_lib... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$pdo_odbc_def_lib''_SQLBindCol" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
+$as_echo_n "checking for SQLBindCol in -l$pdo_odbc_def_lib... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$pdo_odbc_def_lib  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char SQLBindCol (void);
+char SQLBindCol ();
 int
-main (void)
+main ()
 {
 return SQLBindCol ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -65348,60 +61295,52 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$pdo_odbc_def_lib""_SQLAllocHandle" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
-printf %s "checking for SQLAllocHandle in -l$pdo_odbc_def_lib... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$pdo_odbc_def_lib''_SQLAllocHandle" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
+$as_echo_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$pdo_odbc_def_lib  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char SQLAllocHandle (void);
+char SQLAllocHandle ();
 int
-main (void)
+main ()
 {
 return SQLAllocHandle ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$pdo_odbc_def_lib_SQLAllocHandle
@@ -65412,22 +61351,20 @@
 libraries as a driver in that environment; it will emulate the
 functions required for PDO support.
 " "$LINENO" 5
-   ;;
-esac
+
 fi
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$pdo_odbc_def_lib_SQLBindCol
 
     as_fn_error $? "Your ODBC library does not exist or there was an error. Check config.log for more information" "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -65565,7 +61502,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PDO_ODBC 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO_ODBC 1
+_ACEOF
 
     fi
   fi
@@ -65716,19 +61655,17 @@
 
 php_with_pdo_pgsql=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support for PDO" >&5
-printf %s "checking for PostgreSQL support for PDO... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support for PDO" >&5
+$as_echo_n "checking for PostgreSQL support for PDO... " >&6; }
 
 # Check whether --with-pdo-pgsql was given.
-if test ${with_pdo_pgsql+y}
-then :
+if test "${with_pdo_pgsql+set}" = set; then :
   withval=$with_pdo_pgsql; PHP_PDO_PGSQL=$withval
-else case e in #(
-  e)
+else
+
   PHP_PDO_PGSQL=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_PGSQL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -65754,8 +61691,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -65778,8 +61715,8 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5
-printf %s "checking for pg_config... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5
+$as_echo_n "checking for pg_config... " >&6; }
   for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
     if test -x $i/pg_config; then
       PG_CONFIG="$i/pg_config"
@@ -65788,13 +61725,13 @@
   done
 
   if test -n "$PG_CONFIG"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
-printf "%s\n" "$PG_CONFIG" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+$as_echo "$PG_CONFIG" >&6; }
     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "not found" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
     if test "$PHP_PDO_PGSQL" = "yes"; then
       PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql"
     else
@@ -65830,65 +61767,58 @@
   fi
 
 
-printf "%s\n" "#define HAVE_PDO_PGSQL 1" >>confdefs.h
+$as_echo "#define HAVE_PDO_PGSQL 1" >>confdefs.h
 
 
   old_LIBS=$LIBS
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQlibVersion in -lpq" >&5
-printf %s "checking for PQlibVersion in -lpq... " >&6; }
-if test ${ac_cv_lib_pq_PQlibVersion+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQlibVersion in -lpq" >&5
+$as_echo_n "checking for PQlibVersion in -lpq... " >&6; }
+if ${ac_cv_lib_pq_PQlibVersion+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char PQlibVersion (void);
+char PQlibVersion ();
 int
-main (void)
+main ()
 {
 return PQlibVersion ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQlibVersion=yes
-else case e in #(
-  e) ac_cv_lib_pq_PQlibVersion=no ;;
-esac
+else
+  ac_cv_lib_pq_PQlibVersion=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQlibVersion" >&5
-printf "%s\n" "$ac_cv_lib_pq_PQlibVersion" >&6; }
-if test "x$ac_cv_lib_pq_PQlibVersion" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBPQ 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQlibVersion" >&5
+$as_echo "$ac_cv_lib_pq_PQlibVersion" >&6; }
+if test "x$ac_cv_lib_pq_PQlibVersion" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPQ 1
+_ACEOF
 
   LIBS="-lpq $LIBS"
 
-else case e in #(
-  e) as_fn_error $? "Unable to build the PDO PostgreSQL driver: at least libpq 9.1 is required" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "Unable to build the PDO PostgreSQL driver: at least libpq 9.1 is required" "$LINENO" 5
 fi
 
 
@@ -66029,13 +61959,12 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-printf %s "checking for PDO includes... " >&6; }
-if test ${pdo_cv_inc_path+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if ${pdo_cv_inc_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
     elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -66043,11 +61972,10 @@
     elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$phpincludedir/ext
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-printf "%s\n" "$pdo_cv_inc_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+$as_echo "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
@@ -66189,7 +62117,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PDO_PGSQL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO_PGSQL 1
+_ACEOF
 
     fi
   fi
@@ -66337,19 +62267,17 @@
 
 php_with_pdo_sqlite=$PHP_PDO
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite 3 support for PDO" >&5
-printf %s "checking for sqlite 3 support for PDO... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite 3 support for PDO" >&5
+$as_echo_n "checking for sqlite 3 support for PDO... " >&6; }
 
 # Check whether --with-pdo-sqlite was given.
-if test ${with_pdo_sqlite+y}
-then :
+if test "${with_pdo_sqlite+set}" = set; then :
   withval=$with_pdo_sqlite; PHP_PDO_SQLITE=$withval
-else case e in #(
-  e)
+else
+
   PHP_PDO_SQLITE=$PHP_PDO
   test "$PHP_ENABLE_ALL" && PHP_PDO_SQLITE=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -66375,8 +62303,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -66388,13 +62316,12 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-printf %s "checking for PDO includes... " >&6; }
-if test ${pdo_cv_inc_path+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if ${pdo_cv_inc_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
     elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -66402,11 +62329,10 @@
     elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$phpincludedir/ext
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-printf "%s\n" "$pdo_cv_inc_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+$as_echo "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
@@ -66416,17 +62342,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5
-printf %s "checking for sqlite3 >= 3.7.7... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5
+$as_echo_n "checking for sqlite3 >= 3.7.7... " >&6; }
 
 if test -n "$SQLITE_CFLAGS"; then
     pkg_cv_SQLITE_CFLAGS="$SQLITE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.7.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -66440,10 +62366,10 @@
     pkg_cv_SQLITE_LIBS="$SQLITE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.7.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -66457,8 +62383,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -66484,10 +62410,10 @@
 and SQLITE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -66497,12 +62423,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	SQLITE_CFLAGS=$pkg_cv_SQLITE_CFLAGS
 	SQLITE_LIBS=$pkg_cv_SQLITE_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -66646,7 +62572,7 @@
   done
 
 
-printf "%s\n" "#define HAVE_PDO_SQLITELIB 1" >>confdefs.h
+$as_echo "#define HAVE_PDO_SQLITELIB 1" >>confdefs.h
 
 
 
@@ -66754,68 +62680,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_close_v2 in -lsqlite3" >&5
-printf %s "checking for sqlite3_close_v2 in -lsqlite3... " >&6; }
-if test ${ac_cv_lib_sqlite3_sqlite3_close_v2+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_close_v2 in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_close_v2 in -lsqlite3... " >&6; }
+if ${ac_cv_lib_sqlite3_sqlite3_close_v2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char sqlite3_close_v2 (void);
+char sqlite3_close_v2 ();
 int
-main (void)
+main ()
 {
 return sqlite3_close_v2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_close_v2=yes
-else case e in #(
-  e) ac_cv_lib_sqlite3_sqlite3_close_v2=no ;;
-esac
+else
+  ac_cv_lib_sqlite3_sqlite3_close_v2=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_close_v2" >&5
-printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_close_v2" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_close_v2" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_close_v2" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_close_v2" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_close_v2" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SQLITE3_CLOSE_V2 1" >>confdefs.h
+$as_echo "#define HAVE_SQLITE3_CLOSE_V2 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_close_v2
 
-   ;;
-esac
+
 fi
 
 
@@ -66924,68 +62841,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_column_table_name in -lsqlite3" >&5
-printf %s "checking for sqlite3_column_table_name in -lsqlite3... " >&6; }
-if test ${ac_cv_lib_sqlite3_sqlite3_column_table_name+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_column_table_name in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_column_table_name in -lsqlite3... " >&6; }
+if ${ac_cv_lib_sqlite3_sqlite3_column_table_name+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char sqlite3_column_table_name (void);
+char sqlite3_column_table_name ();
 int
-main (void)
+main ()
 {
 return sqlite3_column_table_name ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_column_table_name=yes
-else case e in #(
-  e) ac_cv_lib_sqlite3_sqlite3_column_table_name=no ;;
-esac
+else
+  ac_cv_lib_sqlite3_sqlite3_column_table_name=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_column_table_name" >&5
-printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_column_table_name" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_column_table_name" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_column_table_name" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_column_table_name" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_column_table_name" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SQLITE3_COLUMN_TABLE_NAME 1" >>confdefs.h
+$as_echo "#define HAVE_SQLITE3_COLUMN_TABLE_NAME 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_column_table_name
 
-   ;;
-esac
+
 fi
 
 
@@ -67126,7 +63034,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PDO_SQLITE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO_SQLITE 1
+_ACEOF
 
     fi
   fi
@@ -67275,19 +63185,17 @@
 
 php_with_pgsql=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support" >&5
-printf %s "checking for PostgreSQL support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support" >&5
+$as_echo_n "checking for PostgreSQL support... " >&6; }
 
 # Check whether --with-pgsql was given.
-if test ${with_pgsql+y}
-then :
+if test "${with_pgsql+set}" = set; then :
   withval=$with_pgsql; PHP_PGSQL=$withval
-else case e in #(
-  e)
+else
+
   PHP_PGSQL=no
   test "$PHP_ENABLE_ALL" && PHP_PGSQL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -67313,8 +63221,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -67333,8 +63241,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5
-printf %s "checking for pg_config... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5
+$as_echo_n "checking for pg_config... " >&6; }
   for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
 	if test -x $i/pg_config; then
       PG_CONFIG="$i/pg_config"
@@ -67343,13 +63251,13 @@
   done
 
   if test -n "$PG_CONFIG"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
-printf "%s\n" "$PG_CONFIG" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+$as_echo "$PG_CONFIG" >&6; }
     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "not found" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
     if test "$PHP_PGSQL" = "yes"; then
       PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql"
     else
@@ -67385,162 +63293,139 @@
   fi
 
 
-printf "%s\n" "#define HAVE_PGSQL 1" >>confdefs.h
+$as_echo "#define HAVE_PGSQL 1" >>confdefs.h
 
   old_LIBS=$LIBS
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQlibVersion in -lpq" >&5
-printf %s "checking for PQlibVersion in -lpq... " >&6; }
-if test ${ac_cv_lib_pq_PQlibVersion+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQlibVersion in -lpq" >&5
+$as_echo_n "checking for PQlibVersion in -lpq... " >&6; }
+if ${ac_cv_lib_pq_PQlibVersion+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char PQlibVersion (void);
+char PQlibVersion ();
 int
-main (void)
+main ()
 {
 return PQlibVersion ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQlibVersion=yes
-else case e in #(
-  e) ac_cv_lib_pq_PQlibVersion=no ;;
-esac
+else
+  ac_cv_lib_pq_PQlibVersion=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQlibVersion" >&5
-printf "%s\n" "$ac_cv_lib_pq_PQlibVersion" >&6; }
-if test "x$ac_cv_lib_pq_PQlibVersion" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBPQ 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQlibVersion" >&5
+$as_echo "$ac_cv_lib_pq_PQlibVersion" >&6; }
+if test "x$ac_cv_lib_pq_PQlibVersion" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPQ 1
+_ACEOF
 
   LIBS="-lpq $LIBS"
 
-else case e in #(
-  e) as_fn_error $? "Unable to build the PostgreSQL extension: at least libpq 9.1 is required" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "Unable to build the PostgreSQL extension: at least libpq 9.1 is required" "$LINENO" 5
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pg_encoding_to_char in -lpq" >&5
-printf %s "checking for pg_encoding_to_char in -lpq... " >&6; }
-if test ${ac_cv_lib_pq_pg_encoding_to_char+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_encoding_to_char in -lpq" >&5
+$as_echo_n "checking for pg_encoding_to_char in -lpq... " >&6; }
+if ${ac_cv_lib_pq_pg_encoding_to_char+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char pg_encoding_to_char (void);
+char pg_encoding_to_char ();
 int
-main (void)
+main ()
 {
 return pg_encoding_to_char ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_pg_encoding_to_char=yes
-else case e in #(
-  e) ac_cv_lib_pq_pg_encoding_to_char=no ;;
-esac
+else
+  ac_cv_lib_pq_pg_encoding_to_char=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5
-printf "%s\n" "$ac_cv_lib_pq_pg_encoding_to_char" >&6; }
-if test "x$ac_cv_lib_pq_pg_encoding_to_char" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5
+$as_echo "$ac_cv_lib_pq_pg_encoding_to_char" >&6; }
+if test "x$ac_cv_lib_pq_pg_encoding_to_char" = xyes; then :
 
-printf "%s\n" "#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1" >>confdefs.h
+$as_echo "#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1" >>confdefs.h
 
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lo_truncate64 in -lpq" >&5
-printf %s "checking for lo_truncate64 in -lpq... " >&6; }
-if test ${ac_cv_lib_pq_lo_truncate64+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lo_truncate64 in -lpq" >&5
+$as_echo_n "checking for lo_truncate64 in -lpq... " >&6; }
+if ${ac_cv_lib_pq_lo_truncate64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char lo_truncate64 (void);
+char lo_truncate64 ();
 int
-main (void)
+main ()
 {
 return lo_truncate64 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_lo_truncate64=yes
-else case e in #(
-  e) ac_cv_lib_pq_lo_truncate64=no ;;
-esac
+else
+  ac_cv_lib_pq_lo_truncate64=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_lo_truncate64" >&5
-printf "%s\n" "$ac_cv_lib_pq_lo_truncate64" >&6; }
-if test "x$ac_cv_lib_pq_lo_truncate64" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_lo_truncate64" >&5
+$as_echo "$ac_cv_lib_pq_lo_truncate64" >&6; }
+if test "x$ac_cv_lib_pq_lo_truncate64" = xyes; then :
 
-printf "%s\n" "#define HAVE_PG_LO64 1" >>confdefs.h
+$as_echo "#define HAVE_PG_LO64 1" >>confdefs.h
 
 fi
 
@@ -67814,7 +63699,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PGSQL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PGSQL 1
+_ACEOF
 
     fi
   fi
@@ -67943,18 +63830,16 @@
 
 php_enable_phar=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phar archive support" >&5
-printf %s "checking for phar archive support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for phar archive support" >&5
+$as_echo_n "checking for phar archive support... " >&6; }
 # Check whether --enable-phar was given.
-if test ${enable_phar+y}
-then :
+if test "${enable_phar+set}" = set; then :
   enableval=$enable_phar; PHP_PHAR=$enableval
-else case e in #(
-  e)
+else
+
   PHP_PHAR=yes
   test "$PHP_ENABLE_ALL" && PHP_PHAR=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -67980,8 +63865,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -68121,7 +64006,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PHAR 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PHAR 1
+_ACEOF
 
     fi
   fi
@@ -68242,21 +64129,21 @@
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phar openssl support" >&5
-printf %s "checking for phar openssl support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for phar openssl support" >&5
+$as_echo_n "checking for phar openssl support... " >&6; }
   if test "$PHP_OPENSSL_SHARED" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (shared openssl)" >&5
-printf "%s\n" "no (shared openssl)" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (shared openssl)" >&5
+$as_echo "no (shared openssl)" >&6; }
   else
     if test "$PHP_OPENSSL" = "yes"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define PHAR_HAVE_OPENSSL 1" >>confdefs.h
+$as_echo "#define PHAR_HAVE_OPENSSL 1" >>confdefs.h
 
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
   fi
 
@@ -68336,18 +64223,16 @@
 
 php_enable_posix=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable POSIX-like functions" >&5
-printf %s "checking whether to enable POSIX-like functions... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable POSIX-like functions" >&5
+$as_echo_n "checking whether to enable POSIX-like functions... " >&6; }
 # Check whether --enable-posix was given.
-if test ${enable_posix+y}
-then :
+if test "${enable_posix+set}" = set; then :
   enableval=$enable_posix; PHP_POSIX=$enableval
-else case e in #(
-  e)
+else
+
   PHP_POSIX=yes
   test "$PHP_ENABLE_ALL" && PHP_POSIX=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -68373,15 +64258,15 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_POSIX" = "yes"; then
 
-printf "%s\n" "#define HAVE_POSIX 1" >>confdefs.h
+$as_echo "#define HAVE_POSIX 1" >>confdefs.h
 
 
   ext_builddir=ext/posix
@@ -68517,7 +64402,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_POSIX 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_POSIX 1
+_ACEOF
 
     fi
   fi
@@ -68639,116 +64526,42 @@
   fi
 
 
-  ac_fn_c_check_header_compile "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mkdev_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_MKDEV_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sysmacros_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_SYSMACROS_H 1" >>confdefs.h
-
-fi
-
-
-  ac_fn_c_check_func "$LINENO" "seteuid" "ac_cv_func_seteuid"
-if test "x$ac_cv_func_seteuid" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETEUID 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "setegid" "ac_cv_func_setegid"
-if test "x$ac_cv_func_setegid" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETEGID 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "setsid" "ac_cv_func_setsid"
-if test "x$ac_cv_func_setsid" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETSID 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getsid" "ac_cv_func_getsid"
-if test "x$ac_cv_func_getsid" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETSID 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getpgid" "ac_cv_func_getpgid"
-if test "x$ac_cv_func_getpgid" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETPGID 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ctermid" "ac_cv_func_ctermid"
-if test "x$ac_cv_func_ctermid" = xyes
-then :
-  printf "%s\n" "#define HAVE_CTERMID 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "mkfifo" "ac_cv_func_mkfifo"
-if test "x$ac_cv_func_mkfifo" = xyes
-then :
-  printf "%s\n" "#define HAVE_MKFIFO 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "mknod" "ac_cv_func_mknod"
-if test "x$ac_cv_func_mknod" = xyes
-then :
-  printf "%s\n" "#define HAVE_MKNOD 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit"
-if test "x$ac_cv_func_setrlimit" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETRLIMIT 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit"
-if test "x$ac_cv_func_getrlimit" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETRLIMIT 1" >>confdefs.h
+  for ac_header in sys/mkdev.h sys/sysmacros.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
 fi
-ac_fn_c_check_func "$LINENO" "getgroups" "ac_cv_func_getgroups"
-if test "x$ac_cv_func_getgroups" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETGROUPS 1" >>confdefs.h
 
-fi
-ac_fn_c_check_func "$LINENO" "makedev" "ac_cv_func_makedev"
-if test "x$ac_cv_func_makedev" = xyes
-then :
-  printf "%s\n" "#define HAVE_MAKEDEV 1" >>confdefs.h
+done
 
-fi
-ac_fn_c_check_func "$LINENO" "initgroups" "ac_cv_func_initgroups"
-if test "x$ac_cv_func_initgroups" = xyes
-then :
-  printf "%s\n" "#define HAVE_INITGROUPS 1" >>confdefs.h
 
-fi
-ac_fn_c_check_func "$LINENO" "getgrgid_r" "ac_cv_func_getgrgid_r"
-if test "x$ac_cv_func_getgrgid_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETGRGID_R 1" >>confdefs.h
+  for ac_func in seteuid setegid setsid getsid getpgid ctermid mkfifo mknod setrlimit getrlimit getgroups makedev initgroups getgrgid_r
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working ttyname_r() implementation" >&5
-printf %s "checking for working ttyname_r() implementation... " >&6; }
-  if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working ttyname_r() implementation" >&5
+$as_echo_n "checking for working ttyname_r() implementation... " >&6; }
+  if test "$cross_compiling" = yes; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&5
-printf "%s\n" "no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&5
+$as_echo "no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
@@ -68761,35 +64574,31 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_TTYNAME_R 1" >>confdefs.h
+$as_echo "#define HAVE_TTYNAME_R 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, posix_ttyname() will be thread-unsafe" >&5
-printf "%s\n" "no, posix_ttyname() will be thread-unsafe" >&6; }
-   ;;
-esac
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, posix_ttyname() will be thread-unsafe" >&5
+$as_echo "no, posix_ttyname() will be thread-unsafe" >&6; }
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for utsname.domainname" >&5
-printf %s "checking for utsname.domainname... " >&6; }
-if test ${ac_cv_have_utsname_domainname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utsname.domainname" >&5
+$as_echo_n "checking for utsname.domainname... " >&6; }
+if ${ac_cv_have_utsname_domainname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -68797,7 +64606,7 @@
       #include <sys/utsname.h>
 
 int
-main (void)
+main ()
 {
 
       return sizeof(((struct utsname *)0)->domainname);
@@ -68806,26 +64615,23 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
       ac_cv_have_utsname_domainname=yes
 
-else case e in #(
-  e)
+else
+
       ac_cv_have_utsname_domainname=no
-     ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_utsname_domainname" >&5
-printf "%s\n" "$ac_cv_have_utsname_domainname" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_utsname_domainname" >&5
+$as_echo "$ac_cv_have_utsname_domainname" >&6; }
   if test "$ac_cv_have_utsname_domainname" = yes; then
 
-printf "%s\n" "#define HAVE_UTSNAME_DOMAINNAME 1" >>confdefs.h
+$as_echo "#define HAVE_UTSNAME_DOMAINNAME 1" >>confdefs.h
 
   fi
 fi
@@ -68836,19 +64642,17 @@
 
 php_with_pspell=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PSPELL support" >&5
-printf %s "checking for PSPELL support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PSPELL support" >&5
+$as_echo_n "checking for PSPELL support... " >&6; }
 
 # Check whether --with-pspell was given.
-if test ${with_pspell+y}
-then :
+if test "${with_pspell+set}" = set; then :
   withval=$with_pspell; PHP_PSPELL=$withval
-else case e in #(
-  e)
+else
+
   PHP_PSPELL=no
   test "$PHP_ENABLE_ALL" && PHP_PSPELL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -68874,8 +64678,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -69015,7 +64819,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PSPELL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PSPELL 1
+_ACEOF
 
     fi
   fi
@@ -69362,51 +65168,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for new_aspell_config in -laspell" >&5
-printf %s "checking for new_aspell_config in -laspell... " >&6; }
-if test ${ac_cv_lib_aspell_new_aspell_config+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for new_aspell_config in -laspell" >&5
+$as_echo_n "checking for new_aspell_config in -laspell... " >&6; }
+if ${ac_cv_lib_aspell_new_aspell_config+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-laspell  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char new_aspell_config (void);
+char new_aspell_config ();
 int
-main (void)
+main ()
 {
 return new_aspell_config ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_aspell_new_aspell_config=yes
-else case e in #(
-  e) ac_cv_lib_aspell_new_aspell_config=no ;;
-esac
+else
+  ac_cv_lib_aspell_new_aspell_config=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aspell_new_aspell_config" >&5
-printf "%s\n" "$ac_cv_lib_aspell_new_aspell_config" >&6; }
-if test "x$ac_cv_lib_aspell_new_aspell_config" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aspell_new_aspell_config" >&5
+$as_echo "$ac_cv_lib_aspell_new_aspell_config" >&6; }
+if test "x$ac_cv_lib_aspell_new_aspell_config" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -69510,14 +65308,13 @@
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_aspell_new_aspell_config
 
-   ;;
-esac
+
 fi
 
 
@@ -69556,36 +65353,54 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD"
 
 
-printf "%s\n" "#define HAVE_PSPELL 1" >>confdefs.h
+$as_echo "#define HAVE_PSPELL 1" >>confdefs.h
 
 fi
 
 
 
 
-ac_fn_check_decl "$LINENO" "arc4random_buf" "ac_cv_have_decl_arc4random_buf" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_arc4random_buf" = xyes
-then :
+ac_fn_c_check_decl "$LINENO" "arc4random_buf" "ac_cv_have_decl_arc4random_buf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_arc4random_buf" = xyes; then :
   ac_have_decl=1
-else case e in #(
-  e) ac_have_decl=0 ;;
-esac
+else
+  ac_have_decl=0
 fi
-printf "%s\n" "#define HAVE_DECL_ARC4RANDOM_BUF $ac_have_decl" >>confdefs.h
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ARC4RANDOM_BUF $ac_have_decl
+_ACEOF
 
 
-ac_fn_c_check_header_compile "$LINENO" "CommonCrypto/CommonRandom.h" "ac_cv_header_CommonCrypto_CommonRandom_h" "
+for ac_header in CommonCrypto/CommonRandom.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "CommonCrypto/CommonRandom.h" "ac_cv_header_CommonCrypto_CommonRandom_h" "
 	#include <sys/types.h>
 	#include <Availability.h>
 	#include <CommonCrypto/CommonCryptoError.h>
 
 "
-if test "x$ac_cv_header_CommonCrypto_CommonRandom_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_COMMONCRYPTO_COMMONRANDOM_H 1" >>confdefs.h
+if test "x$ac_cv_header_CommonCrypto_CommonRandom_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_COMMONCRYPTO_COMMONRANDOM_H 1
+_ACEOF
 
 fi
 
+done
+
+
+for ac_func in getrandom
+do :
+  ac_fn_c_check_func "$LINENO" "getrandom" "ac_cv_func_getrandom"
+if test "x$ac_cv_func_getrandom" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETRANDOM 1
+_ACEOF
+
+fi
+done
+
 
 
   ext_builddir=ext/random
@@ -69735,7 +65550,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_RANDOM 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_RANDOM 1
+_ACEOF
 
     fi
   fi
@@ -69897,19 +65714,17 @@
 
 php_with_libedit=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libedit readline replacement" >&5
-printf %s "checking for libedit readline replacement... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libedit readline replacement" >&5
+$as_echo_n "checking for libedit readline replacement... " >&6; }
 
 # Check whether --with-libedit was given.
-if test ${with_libedit+y}
-then :
+if test "${with_libedit+set}" = set; then :
   withval=$with_libedit; PHP_LIBEDIT=$withval
-else case e in #(
-  e)
+else
+
   PHP_LIBEDIT=no
   test "$PHP_ENABLE_ALL" && PHP_LIBEDIT=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -69935,8 +65750,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -69945,19 +65760,17 @@
 
 php_with_readline=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline support" >&5
-printf %s "checking for readline support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline support" >&5
+$as_echo_n "checking for readline support... " >&6; }
 
 # Check whether --with-readline was given.
-if test ${with_readline+y}
-then :
+if test "${with_readline+set}" = set; then :
   withval=$with_readline; PHP_READLINE=$withval
-else case e in #(
-  e)
+else
+
   PHP_READLINE=no
   test "$PHP_ENABLE_ALL" && PHP_READLINE=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -69983,8 +65796,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -70034,51 +65847,43 @@
 
 
   PHP_READLINE_LIBS=""
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
-printf %s "checking for tgetent in -lncurses... " >&6; }
-if test ${ac_cv_lib_ncurses_tgetent+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
+$as_echo_n "checking for tgetent in -lncurses... " >&6; }
+if ${ac_cv_lib_ncurses_tgetent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tgetent (void);
+char tgetent ();
 int
-main (void)
+main ()
 {
 return tgetent ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ncurses_tgetent=yes
-else case e in #(
-  e) ac_cv_lib_ncurses_tgetent=no ;;
-esac
+else
+  ac_cv_lib_ncurses_tgetent=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
-printf "%s\n" "$ac_cv_lib_ncurses_tgetent" >&6; }
-if test "x$ac_cv_lib_ncurses_tgetent" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
+$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
+if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
 
 
 
@@ -70105,53 +65910,45 @@
 
     PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses"
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
-printf %s "checking for tgetent in -ltermcap... " >&6; }
-if test ${ac_cv_lib_termcap_tgetent+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
+$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
+if ${ac_cv_lib_termcap_tgetent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tgetent (void);
+char tgetent ();
 int
-main (void)
+main ()
 {
 return tgetent ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_termcap_tgetent=yes
-else case e in #(
-  e) ac_cv_lib_termcap_tgetent=no ;;
-esac
+else
+  ac_cv_lib_termcap_tgetent=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
-printf "%s\n" "$ac_cv_lib_termcap_tgetent" >&6; }
-if test "x$ac_cv_lib_termcap_tgetent" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
+$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
+if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
 
 
 
@@ -70180,8 +65977,7 @@
 
 fi
 
-   ;;
-esac
+
 fi
 
 
@@ -70292,51 +66088,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
-printf %s "checking for readline in -lreadline... " >&6; }
-if test ${ac_cv_lib_readline_readline+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+$as_echo_n "checking for readline in -lreadline... " >&6; }
+if ${ac_cv_lib_readline_readline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char readline (void);
+char readline ();
 int
-main (void)
+main ()
 {
 return readline ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_readline_readline=yes
-else case e in #(
-  e) ac_cv_lib_readline_readline=no ;;
-esac
+else
+  ac_cv_lib_readline_readline=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
-printf "%s\n" "$ac_cv_lib_readline_readline" >&6; }
-if test "x$ac_cv_lib_readline_readline" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
+$as_echo "$ac_cv_lib_readline_readline" >&6; }
+if test "x$ac_cv_lib_readline_readline" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -70440,16 +66228,15 @@
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_readline_readline
 
     as_fn_error $? "readline library not found" "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -70560,66 +66347,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_pending_input in -lreadline" >&5
-printf %s "checking for rl_pending_input in -lreadline... " >&6; }
-if test ${ac_cv_lib_readline_rl_pending_input+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pending_input in -lreadline" >&5
+$as_echo_n "checking for rl_pending_input in -lreadline... " >&6; }
+if ${ac_cv_lib_readline_rl_pending_input+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_pending_input (void);
+char rl_pending_input ();
 int
-main (void)
+main ()
 {
 return rl_pending_input ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_readline_rl_pending_input=yes
-else case e in #(
-  e) ac_cv_lib_readline_rl_pending_input=no ;;
-esac
+else
+  ac_cv_lib_readline_rl_pending_input=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_pending_input" >&5
-printf "%s\n" "$ac_cv_lib_readline_rl_pending_input" >&6; }
-if test "x$ac_cv_lib_readline_rl_pending_input" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_pending_input" >&5
+$as_echo "$ac_cv_lib_readline_rl_pending_input" >&6; }
+if test "x$ac_cv_lib_readline_rl_pending_input" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_readline_rl_pending_input
 
     as_fn_error $? "invalid readline installation detected. Try --with-libedit instead." "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -70730,68 +66508,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -lreadline" >&5
-printf %s "checking for rl_callback_read_char in -lreadline... " >&6; }
-if test ${ac_cv_lib_readline_rl_callback_read_char+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -lreadline" >&5
+$as_echo_n "checking for rl_callback_read_char in -lreadline... " >&6; }
+if ${ac_cv_lib_readline_rl_callback_read_char+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_callback_read_char (void);
+char rl_callback_read_char ();
 int
-main (void)
+main ()
 {
 return rl_callback_read_char ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_readline_rl_callback_read_char=yes
-else case e in #(
-  e) ac_cv_lib_readline_rl_callback_read_char=no ;;
-esac
+else
+  ac_cv_lib_readline_rl_callback_read_char=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_read_char" >&5
-printf "%s\n" "$ac_cv_lib_readline_rl_callback_read_char" >&6; }
-if test "x$ac_cv_lib_readline_rl_callback_read_char" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_read_char" >&5
+$as_echo "$ac_cv_lib_readline_rl_callback_read_char" >&6; }
+if test "x$ac_cv_lib_readline_rl_callback_read_char" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h
+$as_echo "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_readline_rl_callback_read_char
 
-   ;;
-esac
+
 fi
 
 
@@ -70902,68 +66671,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -lreadline" >&5
-printf %s "checking for rl_on_new_line in -lreadline... " >&6; }
-if test ${ac_cv_lib_readline_rl_on_new_line+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -lreadline" >&5
+$as_echo_n "checking for rl_on_new_line in -lreadline... " >&6; }
+if ${ac_cv_lib_readline_rl_on_new_line+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_on_new_line (void);
+char rl_on_new_line ();
 int
-main (void)
+main ()
 {
 return rl_on_new_line ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_readline_rl_on_new_line=yes
-else case e in #(
-  e) ac_cv_lib_readline_rl_on_new_line=no ;;
-esac
+else
+  ac_cv_lib_readline_rl_on_new_line=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_on_new_line" >&5
-printf "%s\n" "$ac_cv_lib_readline_rl_on_new_line" >&6; }
-if test "x$ac_cv_lib_readline_rl_on_new_line" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_on_new_line" >&5
+$as_echo "$ac_cv_lib_readline_rl_on_new_line" >&6; }
+if test "x$ac_cv_lib_readline_rl_on_new_line" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h
+$as_echo "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_readline_rl_on_new_line
 
-   ;;
-esac
+
 fi
 
 
@@ -71074,97 +66834,88 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
-printf %s "checking for rl_completion_matches in -lreadline... " >&6; }
-if test ${ac_cv_lib_readline_rl_completion_matches+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
+$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
+if ${ac_cv_lib_readline_rl_completion_matches+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_completion_matches (void);
+char rl_completion_matches ();
 int
-main (void)
+main ()
 {
 return rl_completion_matches ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_readline_rl_completion_matches=yes
-else case e in #(
-  e) ac_cv_lib_readline_rl_completion_matches=no ;;
-esac
+else
+  ac_cv_lib_readline_rl_completion_matches=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5
-printf "%s\n" "$ac_cv_lib_readline_rl_completion_matches" >&6; }
-if test "x$ac_cv_lib_readline_rl_completion_matches" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5
+$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
+if test "x$ac_cv_lib_readline_rl_completion_matches" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
+$as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_readline_rl_completion_matches
 
-   ;;
-esac
+
 fi
 
 
 
-printf "%s\n" "#define HAVE_HISTORY_LIST 1" >>confdefs.h
+$as_echo "#define HAVE_HISTORY_LIST 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBREADLINE 1" >>confdefs.h
+$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
 
 
 elif test "$PHP_LIBEDIT" != "no"; then
   if test "$PHP_LIBEDIT" != "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libedit directory ignored, rely on pkg-config" >&5
-printf "%s\n" "$as_me: WARNING: libedit directory ignored, rely on pkg-config" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libedit directory ignored, rely on pkg-config" >&5
+$as_echo "$as_me: WARNING: libedit directory ignored, rely on pkg-config" >&2;}
   fi
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5
-printf %s "checking for libedit... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5
+$as_echo_n "checking for libedit... " >&6; }
 
 if test -n "$EDIT_CFLAGS"; then
     pkg_cv_EDIT_CFLAGS="$EDIT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libedit") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EDIT_CFLAGS=`$PKG_CONFIG --cflags "libedit" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -71178,10 +66929,10 @@
     pkg_cv_EDIT_LIBS="$EDIT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libedit") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EDIT_LIBS=`$PKG_CONFIG --libs "libedit" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -71195,8 +66946,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -71222,10 +66973,10 @@
 and EDIT_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -71235,12 +66986,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	EDIT_CFLAGS=$pkg_cv_EDIT_CFLAGS
 	EDIT_LIBS=$pkg_cv_EDIT_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -71383,51 +67134,43 @@
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
-printf %s "checking for tgetent in -lncurses... " >&6; }
-if test ${ac_cv_lib_ncurses_tgetent+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
+$as_echo_n "checking for tgetent in -lncurses... " >&6; }
+if ${ac_cv_lib_ncurses_tgetent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tgetent (void);
+char tgetent ();
 int
-main (void)
+main ()
 {
 return tgetent ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ncurses_tgetent=yes
-else case e in #(
-  e) ac_cv_lib_ncurses_tgetent=no ;;
-esac
+else
+  ac_cv_lib_ncurses_tgetent=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
-printf "%s\n" "$ac_cv_lib_ncurses_tgetent" >&6; }
-if test "x$ac_cv_lib_ncurses_tgetent" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
+$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
+if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
 
 
 
@@ -71453,53 +67196,45 @@
 
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
-printf %s "checking for tgetent in -ltermcap... " >&6; }
-if test ${ac_cv_lib_termcap_tgetent+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
+$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
+if ${ac_cv_lib_termcap_tgetent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tgetent (void);
+char tgetent ();
 int
-main (void)
+main ()
 {
 return tgetent ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_termcap_tgetent=yes
-else case e in #(
-  e) ac_cv_lib_termcap_tgetent=no ;;
-esac
+else
+  ac_cv_lib_termcap_tgetent=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
-printf "%s\n" "$ac_cv_lib_termcap_tgetent" >&6; }
-if test "x$ac_cv_lib_termcap_tgetent" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
+$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
+if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
 
 
 
@@ -71527,8 +67262,7 @@
 
 fi
 
-   ;;
-esac
+
 fi
 
 
@@ -71639,67 +67373,58 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
-printf %s "checking for readline in -ledit... " >&6; }
-if test ${ac_cv_lib_edit_readline+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
+$as_echo_n "checking for readline in -ledit... " >&6; }
+if ${ac_cv_lib_edit_readline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char readline (void);
+char readline ();
 int
-main (void)
+main ()
 {
 return readline ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_edit_readline=yes
-else case e in #(
-  e) ac_cv_lib_edit_readline=no ;;
-esac
+else
+  ac_cv_lib_edit_readline=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5
-printf "%s\n" "$ac_cv_lib_edit_readline" >&6; }
-if test "x$ac_cv_lib_edit_readline" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5
+$as_echo "$ac_cv_lib_edit_readline" >&6; }
+if test "x$ac_cv_lib_edit_readline" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_edit_readline
 
     as_fn_error $? "edit library required by readline not found" "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -71810,68 +67535,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -ledit" >&5
-printf %s "checking for rl_callback_read_char in -ledit... " >&6; }
-if test ${ac_cv_lib_edit_rl_callback_read_char+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -ledit" >&5
+$as_echo_n "checking for rl_callback_read_char in -ledit... " >&6; }
+if ${ac_cv_lib_edit_rl_callback_read_char+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_callback_read_char (void);
+char rl_callback_read_char ();
 int
-main (void)
+main ()
 {
 return rl_callback_read_char ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_edit_rl_callback_read_char=yes
-else case e in #(
-  e) ac_cv_lib_edit_rl_callback_read_char=no ;;
-esac
+else
+  ac_cv_lib_edit_rl_callback_read_char=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_callback_read_char" >&5
-printf "%s\n" "$ac_cv_lib_edit_rl_callback_read_char" >&6; }
-if test "x$ac_cv_lib_edit_rl_callback_read_char" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_callback_read_char" >&5
+$as_echo "$ac_cv_lib_edit_rl_callback_read_char" >&6; }
+if test "x$ac_cv_lib_edit_rl_callback_read_char" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h
+$as_echo "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_edit_rl_callback_read_char
 
-   ;;
-esac
+
 fi
 
 
@@ -71982,68 +67698,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -ledit" >&5
-printf %s "checking for rl_on_new_line in -ledit... " >&6; }
-if test ${ac_cv_lib_edit_rl_on_new_line+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -ledit" >&5
+$as_echo_n "checking for rl_on_new_line in -ledit... " >&6; }
+if ${ac_cv_lib_edit_rl_on_new_line+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_on_new_line (void);
+char rl_on_new_line ();
 int
-main (void)
+main ()
 {
 return rl_on_new_line ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_edit_rl_on_new_line=yes
-else case e in #(
-  e) ac_cv_lib_edit_rl_on_new_line=no ;;
-esac
+else
+  ac_cv_lib_edit_rl_on_new_line=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_on_new_line" >&5
-printf "%s\n" "$ac_cv_lib_edit_rl_on_new_line" >&6; }
-if test "x$ac_cv_lib_edit_rl_on_new_line" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_on_new_line" >&5
+$as_echo "$ac_cv_lib_edit_rl_on_new_line" >&6; }
+if test "x$ac_cv_lib_edit_rl_on_new_line" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h
+$as_echo "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_edit_rl_on_new_line
 
-   ;;
-esac
+
 fi
 
 
@@ -72154,68 +67861,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -ledit" >&5
-printf %s "checking for rl_completion_matches in -ledit... " >&6; }
-if test ${ac_cv_lib_edit_rl_completion_matches+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -ledit" >&5
+$as_echo_n "checking for rl_completion_matches in -ledit... " >&6; }
+if ${ac_cv_lib_edit_rl_completion_matches+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_completion_matches (void);
+char rl_completion_matches ();
 int
-main (void)
+main ()
 {
 return rl_completion_matches ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_edit_rl_completion_matches=yes
-else case e in #(
-  e) ac_cv_lib_edit_rl_completion_matches=no ;;
-esac
+else
+  ac_cv_lib_edit_rl_completion_matches=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_completion_matches" >&5
-printf "%s\n" "$ac_cv_lib_edit_rl_completion_matches" >&6; }
-if test "x$ac_cv_lib_edit_rl_completion_matches" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_completion_matches" >&5
+$as_echo "$ac_cv_lib_edit_rl_completion_matches" >&6; }
+if test "x$ac_cv_lib_edit_rl_completion_matches" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
+$as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_edit_rl_completion_matches
 
-   ;;
-esac
+
 fi
 
 
@@ -72326,73 +68024,64 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for history_list in -ledit" >&5
-printf %s "checking for history_list in -ledit... " >&6; }
-if test ${ac_cv_lib_edit_history_list+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for history_list in -ledit" >&5
+$as_echo_n "checking for history_list in -ledit... " >&6; }
+if ${ac_cv_lib_edit_history_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char history_list (void);
+char history_list ();
 int
-main (void)
+main ()
 {
 return history_list ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_edit_history_list=yes
-else case e in #(
-  e) ac_cv_lib_edit_history_list=no ;;
-esac
+else
+  ac_cv_lib_edit_history_list=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_history_list" >&5
-printf "%s\n" "$ac_cv_lib_edit_history_list" >&6; }
-if test "x$ac_cv_lib_edit_history_list" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_history_list" >&5
+$as_echo "$ac_cv_lib_edit_history_list" >&6; }
+if test "x$ac_cv_lib_edit_history_list" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_HISTORY_LIST 1" >>confdefs.h
+$as_echo "#define HAVE_HISTORY_LIST 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_edit_history_list
 
-   ;;
-esac
+
 fi
 
 
 
-printf "%s\n" "#define HAVE_LIBEDIT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBEDIT 1" >>confdefs.h
 
 fi
 
@@ -72531,7 +68220,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_READLINE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_READLINE 1
+_ACEOF
 
     fi
   fi
@@ -72794,7 +68485,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_REFLECTION 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_REFLECTION 1
+_ACEOF
 
     fi
   fi
@@ -72922,18 +68615,16 @@
 
 php_enable_session=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP sessions" >&5
-printf %s "checking whether to enable PHP sessions... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP sessions" >&5
+$as_echo_n "checking whether to enable PHP sessions... " >&6; }
 # Check whether --enable-session was given.
-if test ${enable_session+y}
-then :
+if test "${enable_session+set}" = set; then :
   enableval=$enable_session; PHP_SESSION=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SESSION=yes
   test "$PHP_ENABLE_ALL" && PHP_SESSION=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -72959,8 +68650,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -72968,46 +68659,42 @@
 
 php_with_mm=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mm support" >&5
-printf %s "checking for mm support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mm support" >&5
+$as_echo_n "checking for mm support... " >&6; }
 
 # Check whether --with-mm was given.
-if test ${with_mm+y}
-then :
+if test "${with_mm+set}" = set; then :
   withval=$with_mm; PHP_MM=$withval
-else case e in #(
-  e)
+else
+
   PHP_MM=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_MM
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SESSION" != "no"; then
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pwrite works" >&5
-printf %s "checking whether pwrite works... " >&6; }
-if test ${ac_cv_pwrite+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pwrite works" >&5
+$as_echo_n "checking whether pwrite works... " >&6; }
+if ${ac_cv_pwrite+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_pwrite=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -73029,32 +68716,28 @@
 
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_pwrite=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_pwrite=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
     if test "$ac_cv_pwrite" = "no"; then
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_pwrite=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -73076,20 +68759,17 @@
 
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_pwrite=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_pwrite=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
@@ -73097,40 +68777,37 @@
         ac_cv_pwrite=64
       fi
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pwrite" >&5
-printf "%s\n" "$ac_cv_pwrite" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pwrite" >&5
+$as_echo "$ac_cv_pwrite" >&6; }
 
   if test "$ac_cv_pwrite" != "no"; then
 
-printf "%s\n" "#define HAVE_PWRITE 1" >>confdefs.h
+$as_echo "#define HAVE_PWRITE 1" >>confdefs.h
 
     if test "$ac_cv_pwrite" = "64"; then
 
-printf "%s\n" "#define PHP_PWRITE_64 1" >>confdefs.h
+$as_echo "#define PHP_PWRITE_64 1" >>confdefs.h
 
     fi
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pread works" >&5
-printf %s "checking whether pread works... " >&6; }
-if test ${ac_cv_pread+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pread works" >&5
+$as_echo_n "checking whether pread works... " >&6; }
+if ${ac_cv_pread+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
 
   echo test > conftest_in
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_pread=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -73151,20 +68828,17 @@
     }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_pread=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_pread=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   rm -f conftest_in
@@ -73172,13 +68846,12 @@
     if test "$ac_cv_pread" = "no"; then
 
   echo test > conftest_in
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_pread=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -73199,20 +68872,17 @@
     }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_pread=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_pread=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   rm -f conftest_in
@@ -73221,19 +68891,18 @@
         ac_cv_pread=64
       fi
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pread" >&5
-printf "%s\n" "$ac_cv_pread" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pread" >&5
+$as_echo "$ac_cv_pread" >&6; }
 
   if test "$ac_cv_pread" != "no"; then
 
-printf "%s\n" "#define HAVE_PREAD 1" >>confdefs.h
+$as_echo "#define HAVE_PREAD 1" >>confdefs.h
 
     if test "$ac_cv_pread" = "64"; then
 
-printf "%s\n" "#define PHP_PREAD_64 1" >>confdefs.h
+$as_echo "#define PHP_PREAD_64 1" >>confdefs.h
 
     fi
   fi
@@ -73372,7 +69041,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SESSION 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SESSION 1
+_ACEOF
 
     fi
   fi
@@ -73555,7 +69226,7 @@
 
 
 
-printf "%s\n" "#define HAVE_PHP_SESSION 1" >>confdefs.h
+$as_echo "#define HAVE_PHP_SESSION 1" >>confdefs.h
 
 fi
 
@@ -73719,7 +69390,7 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBMM 1" >>confdefs.h
+$as_echo "#define HAVE_LIBMM 1" >>confdefs.h
 
 fi
 
@@ -73729,18 +69400,16 @@
 
 php_enable_shmop=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable shmop support" >&5
-printf %s "checking whether to enable shmop support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable shmop support" >&5
+$as_echo_n "checking whether to enable shmop support... " >&6; }
 # Check whether --enable-shmop was given.
-if test ${enable_shmop+y}
-then :
+if test "${enable_shmop+set}" = set; then :
   enableval=$enable_shmop; PHP_SHMOP=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SHMOP=no
   test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -73766,15 +69435,15 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SHMOP" != "no"; then
 
-printf "%s\n" "#define HAVE_SHMOP 1" >>confdefs.h
+$as_echo "#define HAVE_SHMOP 1" >>confdefs.h
 
 
   ext_builddir=ext/shmop
@@ -73910,7 +69579,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SHMOP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SHMOP 1
+_ACEOF
 
     fi
   fi
@@ -74039,18 +69710,16 @@
 
 php_enable_simplexml=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable SimpleXML support" >&5
-printf %s "checking whether to enable SimpleXML support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable SimpleXML support" >&5
+$as_echo_n "checking whether to enable SimpleXML support... " >&6; }
 # Check whether --enable-simplexml was given.
-if test ${enable_simplexml+y}
-then :
+if test "${enable_simplexml+set}" = set; then :
   enableval=$enable_simplexml; PHP_SIMPLEXML=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SIMPLEXML=yes
   test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -74076,8 +69745,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -74091,17 +69760,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -74115,10 +69784,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -74132,8 +69801,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -74159,10 +69828,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -74172,12 +69841,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -74322,12 +69991,12 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define HAVE_SIMPLEXML 1" >>confdefs.h
+$as_echo "#define HAVE_SIMPLEXML 1" >>confdefs.h
 
 
   ext_builddir=ext/simplexml
@@ -74463,7 +70132,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SIMPLEXML 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SIMPLEXML 1
+_ACEOF
 
     fi
   fi
@@ -74653,19 +70324,17 @@
 
 php_with_snmp=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SNMP support" >&5
-printf %s "checking for SNMP support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNMP support" >&5
+$as_echo_n "checking for SNMP support... " >&6; }
 
 # Check whether --with-snmp was given.
-if test ${with_snmp+y}
-then :
+if test "${with_snmp+set}" = set; then :
   withval=$with_snmp; PHP_SNMP=$withval
-else case e in #(
-  e)
+else
+
   PHP_SNMP=no
   test "$PHP_ENABLE_ALL" && PHP_SNMP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -74691,8 +70360,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -74702,13 +70371,12 @@
   if test "$PHP_SNMP" = "yes"; then
     # Extract the first word of "net-snmp-config", so it can be a program name with args.
 set dummy net-snmp-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_SNMP_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $SNMP_CONFIG in
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SNMP_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $SNMP_CONFIG in
   \\/* | ?:\\/*)
   ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path.
   ;;
@@ -74718,15 +70386,11 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_SNMP_CONFIG="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -74734,16 +70398,15 @@
 IFS=$as_save_IFS
 
   ;;
-esac ;;
 esac
 fi
 SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG
 if test -n "$SNMP_CONFIG"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG" >&5
-printf "%s\n" "$SNMP_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG" >&5
+$as_echo "$SNMP_CONFIG" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -75011,72 +70674,63 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$SNMP_LIBNAME""_init_snmp" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for init_snmp in -l$SNMP_LIBNAME" >&5
-printf %s "checking for init_snmp in -l$SNMP_LIBNAME... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$SNMP_LIBNAME''_init_snmp" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for init_snmp in -l$SNMP_LIBNAME" >&5
+$as_echo_n "checking for init_snmp in -l$SNMP_LIBNAME... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$SNMP_LIBNAME  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char init_snmp (void);
+char init_snmp ();
 int
-main (void)
+main ()
 {
 return init_snmp ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SNMP 1" >>confdefs.h
+$as_echo "#define HAVE_SNMP 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$SNMP_LIBNAME_init_snmp
 
     as_fn_error $? "SNMP sanity check failed. Please check config.log for more information." "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -75187,70 +70841,61 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$SNMP_LIBNAME""_shutdown_snmp_logging" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shutdown_snmp_logging in -l$SNMP_LIBNAME" >&5
-printf %s "checking for shutdown_snmp_logging in -l$SNMP_LIBNAME... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$SNMP_LIBNAME''_shutdown_snmp_logging" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shutdown_snmp_logging in -l$SNMP_LIBNAME" >&5
+$as_echo_n "checking for shutdown_snmp_logging in -l$SNMP_LIBNAME... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$SNMP_LIBNAME  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char shutdown_snmp_logging (void);
+char shutdown_snmp_logging ();
 int
-main (void)
+main ()
 {
 return shutdown_snmp_logging ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SHUTDOWN_SNMP_LOGGING 1" >>confdefs.h
+$as_echo "#define HAVE_SHUTDOWN_SNMP_LOGGING 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$SNMP_LIBNAME_shutdown_snmp_logging
 
-   ;;
-esac
+
 fi
 
 
@@ -75361,70 +71006,61 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$SNMP_LIBNAME""_usmHMAC192SHA256AuthProtocol" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usmHMAC192SHA256AuthProtocol in -l$SNMP_LIBNAME" >&5
-printf %s "checking for usmHMAC192SHA256AuthProtocol in -l$SNMP_LIBNAME... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$SNMP_LIBNAME''_usmHMAC192SHA256AuthProtocol" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usmHMAC192SHA256AuthProtocol in -l$SNMP_LIBNAME" >&5
+$as_echo_n "checking for usmHMAC192SHA256AuthProtocol in -l$SNMP_LIBNAME... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$SNMP_LIBNAME  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char usmHMAC192SHA256AuthProtocol (void);
+char usmHMAC192SHA256AuthProtocol ();
 int
-main (void)
+main ()
 {
 return usmHMAC192SHA256AuthProtocol ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SNMP_SHA256 1" >>confdefs.h
+$as_echo "#define HAVE_SNMP_SHA256 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$SNMP_LIBNAME_usmHMAC192SHA256AuthProtocol
 
-   ;;
-esac
+
 fi
 
 
@@ -75535,70 +71171,61 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$SNMP_LIBNAME""_usmHMAC384SHA512AuthProtocol" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usmHMAC384SHA512AuthProtocol in -l$SNMP_LIBNAME" >&5
-printf %s "checking for usmHMAC384SHA512AuthProtocol in -l$SNMP_LIBNAME... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$SNMP_LIBNAME''_usmHMAC384SHA512AuthProtocol" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usmHMAC384SHA512AuthProtocol in -l$SNMP_LIBNAME" >&5
+$as_echo_n "checking for usmHMAC384SHA512AuthProtocol in -l$SNMP_LIBNAME... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$SNMP_LIBNAME  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char usmHMAC384SHA512AuthProtocol (void);
+char usmHMAC384SHA512AuthProtocol ();
 int
-main (void)
+main ()
 {
 return usmHMAC384SHA512AuthProtocol ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SNMP_SHA512 1" >>confdefs.h
+$as_echo "#define HAVE_SNMP_SHA512 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$SNMP_LIBNAME_usmHMAC384SHA512AuthProtocol
 
-   ;;
-esac
+
 fi
 
 
@@ -75736,7 +71363,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SNMP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SNMP 1
+_ACEOF
 
     fi
   fi
@@ -75868,18 +71497,16 @@
 
 php_enable_soap=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable SOAP support" >&5
-printf %s "checking whether to enable SOAP support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable SOAP support" >&5
+$as_echo_n "checking whether to enable SOAP support... " >&6; }
 # Check whether --enable-soap was given.
-if test ${enable_soap+y}
-then :
+if test "${enable_soap+set}" = set; then :
   enableval=$enable_soap; PHP_SOAP=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SOAP=no
   test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -75905,8 +71532,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -75920,17 +71547,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -75944,10 +71571,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -75961,8 +71588,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -75988,10 +71615,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -76001,12 +71628,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -76151,12 +71778,12 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define HAVE_SOAP 1" >>confdefs.h
+$as_echo "#define HAVE_SOAP 1" >>confdefs.h
 
 
   ext_builddir=ext/soap
@@ -76292,7 +71919,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SOAP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SOAP 1
+_ACEOF
 
     fi
   fi
@@ -76426,18 +72055,16 @@
 
 php_enable_sockets=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable sockets support" >&5
-printf %s "checking whether to enable sockets support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sockets support" >&5
+$as_echo_n "checking whether to enable sockets support... " >&6; }
 # Check whether --enable-sockets was given.
-if test ${enable_sockets+y}
-then :
+if test "${enable_sockets+set}" = set; then :
   enableval=$enable_sockets; PHP_SOCKETS=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SOCKETS=no
   test "$PHP_ENABLE_ALL" && PHP_SOCKETS=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -76463,62 +72090,48 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SOCKETS" != "no"; then
-  ac_fn_c_check_func "$LINENO" "hstrerror" "ac_cv_func_hstrerror"
-if test "x$ac_cv_func_hstrerror" = xyes
-then :
-  printf "%s\n" "#define HAVE_HSTRERROR 1" >>confdefs.h
+  for ac_func in hstrerror if_nametoindex if_indextoname
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
-ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
-if test "x$ac_cv_func_if_nametoindex" = xyes
-then :
-  printf "%s\n" "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h
+done
 
-fi
-ac_fn_c_check_func "$LINENO" "if_indextoname" "ac_cv_func_if_indextoname"
-if test "x$ac_cv_func_if_indextoname" = xyes
-then :
-  printf "%s\n" "#define HAVE_IF_INDEXTONAME 1" >>confdefs.h
+  for ac_header in netinet/tcp.h sys/un.h sys/sockio.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
 fi
 
-  ac_fn_c_check_header_compile "$LINENO" "netinet/tcp.h" "ac_cv_header_netinet_tcp_h" "$ac_includes_default"
-if test "x$ac_cv_header_netinet_tcp_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_NETINET_TCP_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_un_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_UN_H 1" >>confdefs.h
+done
 
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sockio_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_SOCKIO_H 1" >>confdefs.h
 
-fi
+$as_echo "#define HAVE_SOCKETS 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_SOCKETS 1" >>confdefs.h
-
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for field ss_family in struct sockaddr_storage" >&5
+$as_echo_n "checking for field ss_family in struct sockaddr_storage... " >&6; }
+if ${ac_cv_ss_family+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for field ss_family in struct sockaddr_storage" >&5
-printf %s "checking for field ss_family in struct sockaddr_storage... " >&6; }
-if test ${ac_cv_ss_family+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -76527,160 +72140,144 @@
 #include <netdb.h>
 
 int
-main (void)
+main ()
 {
 struct sockaddr_storage sa_store; sa_store.ss_family = AF_INET6;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ss_family=yes
-else case e in #(
-  e) ac_cv_ss_family=no ;;
-esac
+else
+  ac_cv_ss_family=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ss_family" >&5
-printf "%s\n" "$ac_cv_ss_family" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ss_family" >&5
+$as_echo "$ac_cv_ss_family" >&6; }
 
   if test "$ac_cv_ss_family" = yes; then
 
-printf "%s\n" "#define HAVE_SA_SS_FAMILY 1" >>confdefs.h
+$as_echo "#define HAVE_SA_SS_FAMILY 1" >>confdefs.h
 
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_V4MAPPED" >&5
-printf %s "checking if getaddrinfo supports AI_V4MAPPED... " >&6; }
-if test ${ac_cv_gai_ai_v4mapped+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_V4MAPPED" >&5
+$as_echo_n "checking if getaddrinfo supports AI_V4MAPPED... " >&6; }
+if ${ac_cv_gai_ai_v4mapped+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <netdb.h>
 
 int
-main (void)
+main ()
 {
 int flag = AI_V4MAPPED;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_gai_ai_v4mapped=yes
-else case e in #(
-  e) ac_cv_gai_ai_v4mapped=no ;;
-esac
+else
+  ac_cv_gai_ai_v4mapped=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_v4mapped" >&5
-printf "%s\n" "$ac_cv_gai_ai_v4mapped" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_v4mapped" >&5
+$as_echo "$ac_cv_gai_ai_v4mapped" >&6; }
 
   if test "$ac_cv_gai_ai_v4mapped" = yes; then
 
-printf "%s\n" "#define HAVE_AI_V4MAPPED 1" >>confdefs.h
+$as_echo "#define HAVE_AI_V4MAPPED 1" >>confdefs.h
 
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_ALL" >&5
-printf %s "checking if getaddrinfo supports AI_ALL... " >&6; }
-if test ${ac_cv_gai_ai_all+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_ALL" >&5
+$as_echo_n "checking if getaddrinfo supports AI_ALL... " >&6; }
+if ${ac_cv_gai_ai_all+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <netdb.h>
 
 int
-main (void)
+main ()
 {
 int flag = AI_ALL;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_gai_ai_all=yes
-else case e in #(
-  e) ac_cv_gai_ai_all=no ;;
-esac
+else
+  ac_cv_gai_ai_all=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_all" >&5
-printf "%s\n" "$ac_cv_gai_ai_all" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_all" >&5
+$as_echo "$ac_cv_gai_ai_all" >&6; }
 
   if test "$ac_cv_gai_ai_all" = yes; then
 
-printf "%s\n" "#define HAVE_AI_ALL 1" >>confdefs.h
+$as_echo "#define HAVE_AI_ALL 1" >>confdefs.h
 
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_IDN" >&5
-printf %s "checking if getaddrinfo supports AI_IDN... " >&6; }
-if test ${ac_cv_gai_ai_idn+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_IDN" >&5
+$as_echo_n "checking if getaddrinfo supports AI_IDN... " >&6; }
+if ${ac_cv_gai_ai_idn+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <netdb.h>
 
 int
-main (void)
+main ()
 {
 int flag = AI_IDN;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_gai_ai_idn=yes
-else case e in #(
-  e) ac_cv_gai_ai_idn=no ;;
-esac
+else
+  ac_cv_gai_ai_idn=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_idn" >&5
-printf "%s\n" "$ac_cv_gai_ai_idn" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_idn" >&5
+$as_echo "$ac_cv_gai_ai_idn" >&6; }
 
   if test "$ac_cv_gai_ai_idn" = yes; then
 
-printf "%s\n" "#define HAVE_AI_IDN 1" >>confdefs.h
+$as_echo "#define HAVE_AI_IDN 1" >>confdefs.h
 
   fi
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ancillary credentials uses ucred" >&5
-printf %s "checking if ancillary credentials uses ucred... " >&6; }
-if test ${ac_cv_ucred+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ancillary credentials uses ucred" >&5
+$as_echo_n "checking if ancillary credentials uses ucred... " >&6; }
+if ${ac_cv_ucred+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -76690,70 +72287,63 @@
 #include <sys/socket.h>
 
 int
-main (void)
+main ()
 {
 struct ucred u = {.gid = 0};
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ucred=yes
-else case e in #(
-  e) ac_cv_ucred=no ;;
-esac
+else
+  ac_cv_ucred=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ucred" >&5
-printf "%s\n" "$ac_cv_ucred" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ucred" >&5
+$as_echo "$ac_cv_ucred" >&6; }
 
   if test "$ac_cv_ucred" = yes; then
 
-printf "%s\n" "#define ANC_CREDS_UCRED 1" >>confdefs.h
+$as_echo "#define ANC_CREDS_UCRED 1" >>confdefs.h
 
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ancillary credentials uses cmsgcred" >&5
-printf %s "checking if ancillary credentials uses cmsgcred... " >&6; }
-if test ${ac_cv_cmsgcred+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ancillary credentials uses cmsgcred" >&5
+$as_echo_n "checking if ancillary credentials uses cmsgcred... " >&6; }
+if ${ac_cv_cmsgcred+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/socket.h>
 
 int
-main (void)
+main ()
 {
 struct cmsgcred c = {0};
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_cmsgcred=yes
-else case e in #(
-  e) ac_cv_cmsgcred=no ;;
-esac
+else
+  ac_cv_cmsgcred=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cmsgcred" >&5
-printf "%s\n" "$ac_cv_cmsgcred" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cmsgcred" >&5
+$as_echo "$ac_cv_cmsgcred" >&6; }
 
   if test "$ac_cv_cmsgcred" = yes; then
 
-printf "%s\n" "#define ANC_CREDS_CMSGCRED 1" >>confdefs.h
+$as_echo "#define ANC_CREDS_CMSGCRED 1" >>confdefs.h
 
   fi
 
@@ -76896,7 +72486,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SOCKETS 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SOCKETS 1
+_ACEOF
 
     fi
   fi
@@ -77045,19 +72637,17 @@
 
 php_with_sodium=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sodium support" >&5
-printf %s "checking for sodium support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sodium support" >&5
+$as_echo_n "checking for sodium support... " >&6; }
 
 # Check whether --with-sodium was given.
-if test ${with_sodium+y}
-then :
+if test "${with_sodium+set}" = set; then :
   withval=$with_sodium; PHP_SODIUM=$withval
-else case e in #(
-  e)
+else
+
   PHP_SODIUM=no
   test "$PHP_ENABLE_ALL" && PHP_SODIUM=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -77083,8 +72673,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -77092,17 +72682,17 @@
 if test "$PHP_SODIUM" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsodium >= 1.0.8" >&5
-printf %s "checking for libsodium >= 1.0.8... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsodium >= 1.0.8" >&5
+$as_echo_n "checking for libsodium >= 1.0.8... " >&6; }
 
 if test -n "$LIBSODIUM_CFLAGS"; then
     pkg_cv_LIBSODIUM_CFLAGS="$LIBSODIUM_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsodium >= 1.0.8") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBSODIUM_CFLAGS=`$PKG_CONFIG --cflags "libsodium >= 1.0.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -77116,10 +72706,10 @@
     pkg_cv_LIBSODIUM_LIBS="$LIBSODIUM_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsodium >= 1.0.8") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBSODIUM_LIBS=`$PKG_CONFIG --libs "libsodium >= 1.0.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -77133,8 +72723,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -77160,10 +72750,10 @@
 and LIBSODIUM_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -77173,12 +72763,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBSODIUM_CFLAGS=$pkg_cv_LIBSODIUM_CFLAGS
 	LIBSODIUM_LIBS=$pkg_cv_LIBSODIUM_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -77323,49 +72913,43 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBSODIUMLIB 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSODIUMLIB 1" >>confdefs.h
 
 
     SODIUM_COMPILER_FLAGS="$LIBSODIUM_CFLAGS -Wno-type-limits"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-logical-op" >&5
-printf %s "checking whether C compiler accepts -Wno-logical-op... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wno_logical_op+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-logical-op" >&5
+$as_echo_n "checking whether C compiler accepts -Wno-logical-op... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wno_logical_op+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wno-logical-op"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wno_logical_op=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wno_logical_op=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wno_logical_op=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_logical_op" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_logical_op" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wno_logical_op" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_logical_op" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wno_logical_op" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_logical_op" = xyes; then :
   SODIUM_COMPILER_FLAGS="$SODIUM_COMPILER_FLAGS -Wno-logical-op"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
@@ -77502,7 +73086,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SODIUM 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SODIUM 1
+_ACEOF
 
     fi
   fi
@@ -77765,7 +73351,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SPL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SPL 1
+_ACEOF
 
     fi
   fi
@@ -77967,20 +73555,18 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether flush should be called explicitly after a buffered io" >&5
-printf %s "checking whether flush should be called explicitly after a buffered io... " >&6; }
-if test ${ac_cv_flush_io+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-if test "$cross_compiling" = yes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether flush should be called explicitly after a buffered io" >&5
+$as_echo_n "checking whether flush should be called explicitly after a buffered io... " >&6; }
+if ${ac_cv_flush_io+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+if test "$cross_compiling" = yes; then :
 
   ac_cv_flush_io=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -78022,54 +73608,48 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_flush_io=no
 
-else case e in #(
-  e)
+else
+
   ac_cv_flush_io=yes
- ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_flush_io" >&5
-printf "%s\n" "$ac_cv_flush_io" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_flush_io" >&5
+$as_echo "$ac_cv_flush_io" >&6; }
 if test "$ac_cv_flush_io" = "yes"; then
 
-printf "%s\n" "#define HAVE_FLUSHIO 1" >>confdefs.h
+$as_echo "#define HAVE_FLUSHIO 1" >>confdefs.h
 
 fi
 
 
 php_with_external_libcrypt=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for external libcrypt or libxcrypt" >&5
-printf %s "checking for external libcrypt or libxcrypt... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for external libcrypt or libxcrypt" >&5
+$as_echo_n "checking for external libcrypt or libxcrypt... " >&6; }
 
 # Check whether --with-external-libcrypt was given.
-if test ${with_external_libcrypt+y}
-then :
+if test "${with_external_libcrypt+set}" = set; then :
   withval=$with_external_libcrypt; PHP_EXTERNAL_LIBCRYPT=$withval
-else case e in #(
-  e)
+else
+
   PHP_EXTERNAL_LIBCRYPT=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_EXTERNAL_LIBCRYPT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -78081,27 +73661,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
-if test "x$ac_cv_func_crypt" = xyes
-then :
+if test "x$ac_cv_func_crypt" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__crypt" "ac_cv_func___crypt"
-if test "x$ac_cv_func___crypt" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__crypt" "ac_cv_func___crypt"
+if test "x$ac_cv_func___crypt" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_CRYPT 1" >>confdefs.h
+$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
 
     ac_cv_func_crypt=yes
   ;;
@@ -78111,140 +73687,118 @@
   unset ac_cv_lib_crypt_crypt
   unset ac_cv_lib_crypt___crypt
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
-printf %s "checking for crypt in -lcrypt... " >&6; }
-if test ${ac_cv_lib_crypt_crypt+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+$as_echo_n "checking for crypt in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt_crypt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char crypt (void);
+char crypt ();
 int
-main (void)
+main ()
 {
 return crypt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypt_crypt=yes
-else case e in #(
-  e) ac_cv_lib_crypt_crypt=no ;;
-esac
+else
+  ac_cv_lib_crypt_crypt=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
-printf "%s\n" "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __crypt in -lcrypt" >&5
-printf %s "checking for __crypt in -lcrypt... " >&6; }
-if test ${ac_cv_lib_crypt___crypt+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __crypt in -lcrypt" >&5
+$as_echo_n "checking for __crypt in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt___crypt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __crypt (void);
+char __crypt ();
 int
-main (void)
+main ()
 {
 return __crypt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypt___crypt=yes
-else case e in #(
-  e) ac_cv_lib_crypt___crypt=no ;;
-esac
+else
+  ac_cv_lib_crypt___crypt=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt___crypt" >&5
-printf "%s\n" "$ac_cv_lib_crypt___crypt" >&6; }
-if test "x$ac_cv_lib_crypt___crypt" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt___crypt" >&5
+$as_echo "$ac_cv_lib_crypt___crypt" >&6; }
+if test "x$ac_cv_lib_crypt___crypt" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lcrypt"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -78262,10 +73816,10 @@
 
 
 
-printf "%s\n" "#define HAVE_CRYPT 1" >>confdefs.h
+$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBCRYPT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBCRYPT 1" >>confdefs.h
 
     ac_cv_func_crypt=yes
   else
@@ -78284,27 +73838,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "crypt_r" "ac_cv_func_crypt_r"
-if test "x$ac_cv_func_crypt_r" = xyes
-then :
+if test "x$ac_cv_func_crypt_r" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__crypt_r" "ac_cv_func___crypt_r"
-if test "x$ac_cv_func___crypt_r" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__crypt_r" "ac_cv_func___crypt_r"
+if test "x$ac_cv_func___crypt_r" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_CRYPT_R 1" >>confdefs.h
+$as_echo "#define HAVE_CRYPT_R 1" >>confdefs.h
 
     ac_cv_func_crypt_r=yes
   ;;
@@ -78314,140 +73864,118 @@
   unset ac_cv_lib_crypt_crypt_r
   unset ac_cv_lib_crypt___crypt_r
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypt_r in -lcrypt" >&5
-printf %s "checking for crypt_r in -lcrypt... " >&6; }
-if test ${ac_cv_lib_crypt_crypt_r+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt_r in -lcrypt" >&5
+$as_echo_n "checking for crypt_r in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt_crypt_r+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char crypt_r (void);
+char crypt_r ();
 int
-main (void)
+main ()
 {
 return crypt_r ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypt_crypt_r=yes
-else case e in #(
-  e) ac_cv_lib_crypt_crypt_r=no ;;
-esac
+else
+  ac_cv_lib_crypt_crypt_r=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt_r" >&5
-printf "%s\n" "$ac_cv_lib_crypt_crypt_r" >&6; }
-if test "x$ac_cv_lib_crypt_crypt_r" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt_r" >&5
+$as_echo "$ac_cv_lib_crypt_crypt_r" >&6; }
+if test "x$ac_cv_lib_crypt_crypt_r" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __crypt_r in -lcrypt" >&5
-printf %s "checking for __crypt_r in -lcrypt... " >&6; }
-if test ${ac_cv_lib_crypt___crypt_r+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __crypt_r in -lcrypt" >&5
+$as_echo_n "checking for __crypt_r in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt___crypt_r+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __crypt_r (void);
+char __crypt_r ();
 int
-main (void)
+main ()
 {
 return __crypt_r ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypt___crypt_r=yes
-else case e in #(
-  e) ac_cv_lib_crypt___crypt_r=no ;;
-esac
+else
+  ac_cv_lib_crypt___crypt_r=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt___crypt_r" >&5
-printf "%s\n" "$ac_cv_lib_crypt___crypt_r" >&6; }
-if test "x$ac_cv_lib_crypt___crypt_r" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt___crypt_r" >&5
+$as_echo "$ac_cv_lib_crypt___crypt_r" >&6; }
+if test "x$ac_cv_lib_crypt___crypt_r" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lcrypt"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -78465,10 +73993,10 @@
 
 
 
-printf "%s\n" "#define HAVE_CRYPT_R 1" >>confdefs.h
+$as_echo "#define HAVE_CRYPT_R 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBCRYPT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBCRYPT 1" >>confdefs.h
 
     ac_cv_func_crypt_r=yes
   else
@@ -78481,22 +74009,26 @@
 
   esac
 
-  ac_fn_c_check_header_compile "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
-if test "x$ac_cv_header_crypt_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_CRYPT_H 1" >>confdefs.h
+  for ac_header in crypt.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
+if test "x$ac_cv_header_crypt_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CRYPT_H 1
+_ACEOF
 
 fi
 
+done
+
   if test "$ac_cv_func_crypt_r" = "yes"; then
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which data struct is used by crypt_r" >&5
-printf %s "checking which data struct is used by crypt_r... " >&6; }
-if test ${php_cv_crypt_r_style+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which data struct is used by crypt_r" >&5
+$as_echo_n "checking which data struct is used by crypt_r... " >&6; }
+if ${php_cv_crypt_r_style+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     php_cv_crypt_r_style=none
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -78505,7 +74037,7 @@
 #include <crypt.h>
 
 int
-main (void)
+main ()
 {
 
 CRYPTD buffer;
@@ -78515,11 +74047,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   php_cv_crypt_r_style=cryptd
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
     if test "$php_cv_crypt_r_style" = "none"; then
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -78529,7 +74060,7 @@
 #include <crypt.h>
 
 int
-main (void)
+main ()
 {
 
 struct crypt_data buffer;
@@ -78539,11 +74070,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   php_cv_crypt_r_style=struct_crypt_data
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
 
     if test "$php_cv_crypt_r_style" = "none"; then
@@ -78555,7 +74085,7 @@
 #include <crypt.h>
 
 int
-main (void)
+main ()
 {
 
 struct crypt_data buffer;
@@ -78565,11 +74095,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   php_cv_crypt_r_style=struct_crypt_data_gnu_source
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
 
     if test "$php_cv_crypt_r_style" = "none"; then
@@ -78580,7 +74109,7 @@
 #include <unistd.h>
 
 int
-main (void)
+main ()
 {
 
 struct crypt_data buffer;
@@ -78590,31 +74119,29 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   php_cv_crypt_r_style=struct_crypt_data
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
-     ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_crypt_r_style" >&5
-printf "%s\n" "$php_cv_crypt_r_style" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_crypt_r_style" >&5
+$as_echo "$php_cv_crypt_r_style" >&6; }
 
   if test "$php_cv_crypt_r_style" = "cryptd"; then
 
-printf "%s\n" "#define CRYPT_R_CRYPTD 1" >>confdefs.h
+$as_echo "#define CRYPT_R_CRYPTD 1" >>confdefs.h
 
   fi
   if test "$php_cv_crypt_r_style" = "struct_crypt_data" -o "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then
 
-printf "%s\n" "#define CRYPT_R_STRUCT_CRYPT_DATA 1" >>confdefs.h
+$as_echo "#define CRYPT_R_STRUCT_CRYPT_DATA 1" >>confdefs.h
 
   fi
   if test "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then
 
-printf "%s\n" "#define CRYPT_R_GNU_SOURCE 1" >>confdefs.h
+$as_echo "#define CRYPT_R_GNU_SOURCE 1" >>confdefs.h
 
   fi
   if test "$php_cv_crypt_r_style" = "none"; then
@@ -78623,20 +74150,18 @@
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for standard DES crypt" >&5
-printf %s "checking for standard DES crypt... " >&6; }
-if test ${ac_cv_crypt_des+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-    if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for standard DES crypt" >&5
+$as_echo_n "checking for standard DES crypt... " >&6; }
+if ${ac_cv_crypt_des+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    if test "$cross_compiling" = yes; then :
 
   ac_cv_crypt_des=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -78661,41 +74186,35 @@
 #endif
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_crypt_des=yes
 
-else case e in #(
-  e)
+else
+
   ac_cv_crypt_des=no
- ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_des" >&5
-printf "%s\n" "$ac_cv_crypt_des" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_des" >&5
+$as_echo "$ac_cv_crypt_des" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for extended DES crypt" >&5
-printf %s "checking for extended DES crypt... " >&6; }
-if test ${ac_cv_crypt_ext_des+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-    if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extended DES crypt" >&5
+$as_echo_n "checking for extended DES crypt... " >&6; }
+if ${ac_cv_crypt_ext_des+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    if test "$cross_compiling" = yes; then :
 
     ac_cv_crypt_ext_des=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -78720,41 +74239,35 @@
 #endif
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_crypt_ext_des=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_crypt_ext_des=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_ext_des" >&5
-printf "%s\n" "$ac_cv_crypt_ext_des" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_ext_des" >&5
+$as_echo "$ac_cv_crypt_ext_des" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MD5 crypt" >&5
-printf %s "checking for MD5 crypt... " >&6; }
-if test ${ac_cv_crypt_md5+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-  if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 crypt" >&5
+$as_echo_n "checking for MD5 crypt... " >&6; }
+if ${ac_cv_crypt_md5+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_crypt_md5=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -78789,41 +74302,35 @@
 #endif
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_crypt_md5=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_crypt_md5=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_md5" >&5
-printf "%s\n" "$ac_cv_crypt_md5" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_md5" >&5
+$as_echo "$ac_cv_crypt_md5" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Blowfish crypt" >&5
-printf %s "checking for Blowfish crypt... " >&6; }
-if test ${ac_cv_crypt_blowfish+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-  if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Blowfish crypt" >&5
+$as_echo_n "checking for Blowfish crypt... " >&6; }
+if ${ac_cv_crypt_blowfish+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_crypt_blowfish=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -78855,41 +74362,35 @@
 #endif
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_crypt_blowfish=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_crypt_blowfish=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_blowfish" >&5
-printf "%s\n" "$ac_cv_crypt_blowfish" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_blowfish" >&5
+$as_echo "$ac_cv_crypt_blowfish" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA512 crypt" >&5
+$as_echo_n "checking for SHA512 crypt... " >&6; }
+if ${ac_cv_crypt_sha512+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SHA512 crypt" >&5
-printf %s "checking for SHA512 crypt... " >&6; }
-if test ${ac_cv_crypt_sha512+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_crypt_sha512=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -78920,41 +74421,35 @@
 #endif
   }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_crypt_sha512=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_crypt_sha512=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_sha512" >&5
-printf "%s\n" "$ac_cv_crypt_sha512" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_sha512" >&5
+$as_echo "$ac_cv_crypt_sha512" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA256 crypt" >&5
+$as_echo_n "checking for SHA256 crypt... " >&6; }
+if ${ac_cv_crypt_sha256+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SHA256 crypt" >&5
-printf %s "checking for SHA256 crypt... " >&6; }
-if test ${ac_cv_crypt_sha256+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_crypt_sha256=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -78985,26 +74480,22 @@
 #endif
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_crypt_sha256=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_crypt_sha256=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_sha256" >&5
-printf "%s\n" "$ac_cv_crypt_sha256" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_sha256" >&5
+$as_echo "$ac_cv_crypt_sha256" >&6; }
 
 
   if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no" || test "$ac_cv_func_crypt_r" != "yes"; then
@@ -79012,11 +74503,15 @@
   fi
 
 
-printf "%s\n" "#define PHP_USE_PHP_CRYPT_R 0" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_USE_PHP_CRYPT_R 0
+_ACEOF
 
 else
 
-printf "%s\n" "#define PHP_USE_PHP_CRYPT_R 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_USE_PHP_CRYPT_R 1
+_ACEOF
 
 
 
@@ -79067,19 +74562,18 @@
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports aligned attribute" >&5
-printf %s "checking whether the compiler supports aligned attribute... " >&6; }
-if test ${ac_cv_attribute_aligned+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports aligned attribute" >&5
+$as_echo_n "checking whether the compiler supports aligned attribute... " >&6; }
+if ${ac_cv_attribute_aligned+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main (void)
+main ()
 {
 
   unsigned char test32 __attribute__ ((__aligned__ (__alignof__ (int))));
@@ -79088,25 +74582,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
   ac_cv_attribute_aligned=yes
 
-else case e in #(
-  e)
+else
+
   ac_cv_attribute_aligned=no
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_attribute_aligned" >&5
-printf "%s\n" "$ac_cv_attribute_aligned" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_attribute_aligned" >&5
+$as_echo "$ac_cv_attribute_aligned" >&6; }
 if test "$ac_cv_attribute_aligned" = "yes"; then
 
-printf "%s\n" "#define HAVE_ATTRIBUTE_ALIGNED 1" >>confdefs.h
+$as_echo "#define HAVE_ATTRIBUTE_ALIGNED 1" >>confdefs.h
 
 fi
 
@@ -79114,33 +74605,31 @@
   case $host_alias in
     *linux*)
 
-printf "%s\n" "#define HAVE_FNMATCH 1" >>confdefs.h
+$as_echo "#define HAVE_FNMATCH 1" >>confdefs.h
 
       ;;
   esac
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working POSIX fnmatch" >&5
-printf %s "checking for working POSIX fnmatch... " >&6; }
-if test ${ac_cv_func_fnmatch_works+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) # Some versions of Solaris, SCO, and the GNU C Library
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working POSIX fnmatch" >&5
+$as_echo_n "checking for working POSIX fnmatch... " >&6; }
+if ${ac_cv_func_fnmatch_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # Some versions of Solaris, SCO, and the GNU C Library
    # have a broken or incompatible fnmatch.
    # So we run a test program.  If we are cross-compiling, take no chance.
-   # Thanks to John Oleynick, François Pinard, and Paul Eggert for this test.
-   if test "$cross_compiling" = yes
-then :
+   # Thanks to John Oleynick, Franc,ois Pinard, and Paul Eggert for this test.
+   if test "$cross_compiling" = yes; then :
   ac_cv_func_fnmatch_works=cross
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <fnmatch.h>
 #	   define y(a, b, c) (fnmatch (a, b, c) == 0)
 #	   define n(a, b, c) (fnmatch (a, b, c) == FNM_NOMATCH)
 
 int
-main (void)
+main ()
 {
 return
 	   (!(y ("a*", "abc", 0)
@@ -79154,65 +74643,57 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_fnmatch_works=yes
-else case e in #(
-  e) ac_cv_func_fnmatch_works=no ;;
-esac
+else
+  ac_cv_func_fnmatch_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fnmatch_works" >&5
-printf "%s\n" "$ac_cv_func_fnmatch_works" >&6; }
-if test $ac_cv_func_fnmatch_works = yes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fnmatch_works" >&5
+$as_echo "$ac_cv_func_fnmatch_works" >&6; }
+if test $ac_cv_func_fnmatch_works = yes; then :
 
-printf "%s\n" "#define HAVE_FNMATCH 1" >>confdefs.h
+$as_echo "#define HAVE_FNMATCH 1" >>confdefs.h
 
 fi
 
 
 fi
 
-
-  for ac_func in fork CreateProcess
+for ac_func in fork CreateProcess
 do :
-  as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_sh"`
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"
-then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
   php_can_support_proc_open=yes
   break
 
-else case e in #(
-  e)
+else
+
   php_can_support_proc_open=no
- ;;
-esac
-fi
 
+fi
 done
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if your OS can spawn processes with inherited handles" >&5
-printf %s "checking if your OS can spawn processes with inherited handles... " >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if your OS can spawn processes with inherited handles" >&5
+$as_echo_n "checking if your OS can spawn processes with inherited handles... " >&6; }
 if test "$php_can_support_proc_open" = "yes"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define PHP_CAN_SUPPORT_PROC_OPEN 1" >>confdefs.h
+$as_echo "#define PHP_CAN_SUPPORT_PROC_OPEN 1" >>confdefs.h
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 PHP_ENABLE_CHROOT_FUNC=no
@@ -79239,7 +74720,7 @@
 
 if test "$PHP_ENABLE_CHROOT_FUNC" = "yes"; then
 
-printf "%s\n" "#define ENABLE_CHROOT_FUNC 1" >>confdefs.h
+$as_echo "#define ENABLE_CHROOT_FUNC 1" >>confdefs.h
 
 fi
 
@@ -79249,27 +74730,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "res_nsearch" "ac_cv_func_res_nsearch"
-if test "x$ac_cv_func_res_nsearch" = xyes
-then :
+if test "x$ac_cv_func_res_nsearch" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__res_nsearch" "ac_cv_func___res_nsearch"
-if test "x$ac_cv_func___res_nsearch" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__res_nsearch" "ac_cv_func___res_nsearch"
+if test "x$ac_cv_func___res_nsearch" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_RES_NSEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   ;;
@@ -79279,140 +74756,118 @@
   unset ac_cv_lib_resolv_res_nsearch
   unset ac_cv_lib_resolv___res_nsearch
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lresolv" >&5
-printf %s "checking for res_nsearch in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv_res_nsearch+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lresolv" >&5
+$as_echo_n "checking for res_nsearch in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv_res_nsearch+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_nsearch (void);
+char res_nsearch ();
 int
-main (void)
+main ()
 {
 return res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_res_nsearch=yes
-else case e in #(
-  e) ac_cv_lib_resolv_res_nsearch=no ;;
-esac
+else
+  ac_cv_lib_resolv_res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_nsearch" >&5
-printf "%s\n" "$ac_cv_lib_resolv_res_nsearch" >&6; }
-if test "x$ac_cv_lib_resolv_res_nsearch" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_nsearch" >&5
+$as_echo "$ac_cv_lib_resolv_res_nsearch" >&6; }
+if test "x$ac_cv_lib_resolv_res_nsearch" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lresolv" >&5
-printf %s "checking for __res_nsearch in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv___res_nsearch+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lresolv" >&5
+$as_echo_n "checking for __res_nsearch in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv___res_nsearch+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_nsearch (void);
+char __res_nsearch ();
 int
-main (void)
+main ()
 {
 return __res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___res_nsearch=yes
-else case e in #(
-  e) ac_cv_lib_resolv___res_nsearch=no ;;
-esac
+else
+  ac_cv_lib_resolv___res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_nsearch" >&5
-printf "%s\n" "$ac_cv_lib_resolv___res_nsearch" >&6; }
-if test "x$ac_cv_lib_resolv___res_nsearch" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_nsearch" >&5
+$as_echo "$ac_cv_lib_resolv___res_nsearch" >&6; }
+if test "x$ac_cv_lib_resolv___res_nsearch" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -79430,10 +74885,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_NSEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   else
@@ -79442,140 +74897,118 @@
   unset ac_cv_lib_bind_res_nsearch
   unset ac_cv_lib_bind___res_nsearch
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lbind" >&5
-printf %s "checking for res_nsearch in -lbind... " >&6; }
-if test ${ac_cv_lib_bind_res_nsearch+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lbind" >&5
+$as_echo_n "checking for res_nsearch in -lbind... " >&6; }
+if ${ac_cv_lib_bind_res_nsearch+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_nsearch (void);
+char res_nsearch ();
 int
-main (void)
+main ()
 {
 return res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_res_nsearch=yes
-else case e in #(
-  e) ac_cv_lib_bind_res_nsearch=no ;;
-esac
+else
+  ac_cv_lib_bind_res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_nsearch" >&5
-printf "%s\n" "$ac_cv_lib_bind_res_nsearch" >&6; }
-if test "x$ac_cv_lib_bind_res_nsearch" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_nsearch" >&5
+$as_echo "$ac_cv_lib_bind_res_nsearch" >&6; }
+if test "x$ac_cv_lib_bind_res_nsearch" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lbind" >&5
-printf %s "checking for __res_nsearch in -lbind... " >&6; }
-if test ${ac_cv_lib_bind___res_nsearch+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lbind" >&5
+$as_echo_n "checking for __res_nsearch in -lbind... " >&6; }
+if ${ac_cv_lib_bind___res_nsearch+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_nsearch (void);
+char __res_nsearch ();
 int
-main (void)
+main ()
 {
 return __res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___res_nsearch=yes
-else case e in #(
-  e) ac_cv_lib_bind___res_nsearch=no ;;
-esac
+else
+  ac_cv_lib_bind___res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_nsearch" >&5
-printf "%s\n" "$ac_cv_lib_bind___res_nsearch" >&6; }
-if test "x$ac_cv_lib_bind___res_nsearch" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_nsearch" >&5
+$as_echo "$ac_cv_lib_bind___res_nsearch" >&6; }
+if test "x$ac_cv_lib_bind___res_nsearch" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -79593,10 +75026,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_NSEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   else
@@ -79605,140 +75038,118 @@
   unset ac_cv_lib_socket_res_nsearch
   unset ac_cv_lib_socket___res_nsearch
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lsocket" >&5
-printf %s "checking for res_nsearch in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_res_nsearch+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lsocket" >&5
+$as_echo_n "checking for res_nsearch in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_res_nsearch+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_nsearch (void);
+char res_nsearch ();
 int
-main (void)
+main ()
 {
 return res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_res_nsearch=yes
-else case e in #(
-  e) ac_cv_lib_socket_res_nsearch=no ;;
-esac
+else
+  ac_cv_lib_socket_res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_nsearch" >&5
-printf "%s\n" "$ac_cv_lib_socket_res_nsearch" >&6; }
-if test "x$ac_cv_lib_socket_res_nsearch" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_nsearch" >&5
+$as_echo "$ac_cv_lib_socket_res_nsearch" >&6; }
+if test "x$ac_cv_lib_socket_res_nsearch" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lsocket" >&5
-printf %s "checking for __res_nsearch in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___res_nsearch+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lsocket" >&5
+$as_echo_n "checking for __res_nsearch in -lsocket... " >&6; }
+if ${ac_cv_lib_socket___res_nsearch+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_nsearch (void);
+char __res_nsearch ();
 int
-main (void)
+main ()
 {
 return __res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___res_nsearch=yes
-else case e in #(
-  e) ac_cv_lib_socket___res_nsearch=no ;;
-esac
+else
+  ac_cv_lib_socket___res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_nsearch" >&5
-printf "%s\n" "$ac_cv_lib_socket___res_nsearch" >&6; }
-if test "x$ac_cv_lib_socket___res_nsearch" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_nsearch" >&5
+$as_echo "$ac_cv_lib_socket___res_nsearch" >&6; }
+if test "x$ac_cv_lib_socket___res_nsearch" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -79756,10 +75167,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_NSEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   else
@@ -79784,27 +75195,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "res_ndestroy" "ac_cv_func_res_ndestroy"
-if test "x$ac_cv_func_res_ndestroy" = xyes
-then :
+if test "x$ac_cv_func_res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__res_ndestroy" "ac_cv_func___res_ndestroy"
-if test "x$ac_cv_func___res_ndestroy" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__res_ndestroy" "ac_cv_func___res_ndestroy"
+if test "x$ac_cv_func___res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h
 
     ac_cv_func_res_ndestroy=yes
   ;;
@@ -79814,140 +75221,118 @@
   unset ac_cv_lib_resolv_res_ndestroy
   unset ac_cv_lib_resolv___res_ndestroy
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lresolv" >&5
-printf %s "checking for res_ndestroy in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv_res_ndestroy+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lresolv" >&5
+$as_echo_n "checking for res_ndestroy in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv_res_ndestroy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_ndestroy (void);
+char res_ndestroy ();
 int
-main (void)
+main ()
 {
 return res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_res_ndestroy=yes
-else case e in #(
-  e) ac_cv_lib_resolv_res_ndestroy=no ;;
-esac
+else
+  ac_cv_lib_resolv_res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_ndestroy" >&5
-printf "%s\n" "$ac_cv_lib_resolv_res_ndestroy" >&6; }
-if test "x$ac_cv_lib_resolv_res_ndestroy" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_ndestroy" >&5
+$as_echo "$ac_cv_lib_resolv_res_ndestroy" >&6; }
+if test "x$ac_cv_lib_resolv_res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lresolv" >&5
-printf %s "checking for __res_ndestroy in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv___res_ndestroy+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lresolv" >&5
+$as_echo_n "checking for __res_ndestroy in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv___res_ndestroy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_ndestroy (void);
+char __res_ndestroy ();
 int
-main (void)
+main ()
 {
 return __res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___res_ndestroy=yes
-else case e in #(
-  e) ac_cv_lib_resolv___res_ndestroy=no ;;
-esac
+else
+  ac_cv_lib_resolv___res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_ndestroy" >&5
-printf "%s\n" "$ac_cv_lib_resolv___res_ndestroy" >&6; }
-if test "x$ac_cv_lib_resolv___res_ndestroy" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_ndestroy" >&5
+$as_echo "$ac_cv_lib_resolv___res_ndestroy" >&6; }
+if test "x$ac_cv_lib_resolv___res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -79965,10 +75350,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_res_ndestroy=yes
   else
@@ -79977,140 +75362,118 @@
   unset ac_cv_lib_bind_res_ndestroy
   unset ac_cv_lib_bind___res_ndestroy
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lbind" >&5
-printf %s "checking for res_ndestroy in -lbind... " >&6; }
-if test ${ac_cv_lib_bind_res_ndestroy+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lbind" >&5
+$as_echo_n "checking for res_ndestroy in -lbind... " >&6; }
+if ${ac_cv_lib_bind_res_ndestroy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_ndestroy (void);
+char res_ndestroy ();
 int
-main (void)
+main ()
 {
 return res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_res_ndestroy=yes
-else case e in #(
-  e) ac_cv_lib_bind_res_ndestroy=no ;;
-esac
+else
+  ac_cv_lib_bind_res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_ndestroy" >&5
-printf "%s\n" "$ac_cv_lib_bind_res_ndestroy" >&6; }
-if test "x$ac_cv_lib_bind_res_ndestroy" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_ndestroy" >&5
+$as_echo "$ac_cv_lib_bind_res_ndestroy" >&6; }
+if test "x$ac_cv_lib_bind_res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lbind" >&5
-printf %s "checking for __res_ndestroy in -lbind... " >&6; }
-if test ${ac_cv_lib_bind___res_ndestroy+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lbind" >&5
+$as_echo_n "checking for __res_ndestroy in -lbind... " >&6; }
+if ${ac_cv_lib_bind___res_ndestroy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_ndestroy (void);
+char __res_ndestroy ();
 int
-main (void)
+main ()
 {
 return __res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___res_ndestroy=yes
-else case e in #(
-  e) ac_cv_lib_bind___res_ndestroy=no ;;
-esac
+else
+  ac_cv_lib_bind___res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_ndestroy" >&5
-printf "%s\n" "$ac_cv_lib_bind___res_ndestroy" >&6; }
-if test "x$ac_cv_lib_bind___res_ndestroy" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_ndestroy" >&5
+$as_echo "$ac_cv_lib_bind___res_ndestroy" >&6; }
+if test "x$ac_cv_lib_bind___res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -80128,10 +75491,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_res_ndestroy=yes
   else
@@ -80140,140 +75503,118 @@
   unset ac_cv_lib_socket_res_ndestroy
   unset ac_cv_lib_socket___res_ndestroy
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lsocket" >&5
-printf %s "checking for res_ndestroy in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_res_ndestroy+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lsocket" >&5
+$as_echo_n "checking for res_ndestroy in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_res_ndestroy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_ndestroy (void);
+char res_ndestroy ();
 int
-main (void)
+main ()
 {
 return res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_res_ndestroy=yes
-else case e in #(
-  e) ac_cv_lib_socket_res_ndestroy=no ;;
-esac
+else
+  ac_cv_lib_socket_res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_ndestroy" >&5
-printf "%s\n" "$ac_cv_lib_socket_res_ndestroy" >&6; }
-if test "x$ac_cv_lib_socket_res_ndestroy" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_ndestroy" >&5
+$as_echo "$ac_cv_lib_socket_res_ndestroy" >&6; }
+if test "x$ac_cv_lib_socket_res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lsocket" >&5
-printf %s "checking for __res_ndestroy in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___res_ndestroy+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lsocket" >&5
+$as_echo_n "checking for __res_ndestroy in -lsocket... " >&6; }
+if ${ac_cv_lib_socket___res_ndestroy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_ndestroy (void);
+char __res_ndestroy ();
 int
-main (void)
+main ()
 {
 return __res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___res_ndestroy=yes
-else case e in #(
-  e) ac_cv_lib_socket___res_ndestroy=no ;;
-esac
+else
+  ac_cv_lib_socket___res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_ndestroy" >&5
-printf "%s\n" "$ac_cv_lib_socket___res_ndestroy" >&6; }
-if test "x$ac_cv_lib_socket___res_ndestroy" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_ndestroy" >&5
+$as_echo "$ac_cv_lib_socket___res_ndestroy" >&6; }
+if test "x$ac_cv_lib_socket___res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -80291,10 +75632,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_res_ndestroy=yes
   else
@@ -80319,27 +75660,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "dns_search" "ac_cv_func_dns_search"
-if test "x$ac_cv_func_dns_search" = xyes
-then :
+if test "x$ac_cv_func_dns_search" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__dns_search" "ac_cv_func___dns_search"
-if test "x$ac_cv_func___dns_search" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__dns_search" "ac_cv_func___dns_search"
+if test "x$ac_cv_func___dns_search" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_DNS_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   ;;
@@ -80349,140 +75686,118 @@
   unset ac_cv_lib_resolv_dns_search
   unset ac_cv_lib_resolv___dns_search
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lresolv" >&5
-printf %s "checking for dns_search in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv_dns_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lresolv" >&5
+$as_echo_n "checking for dns_search in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv_dns_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dns_search (void);
+char dns_search ();
 int
-main (void)
+main ()
 {
 return dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_dns_search=yes
-else case e in #(
-  e) ac_cv_lib_resolv_dns_search=no ;;
-esac
+else
+  ac_cv_lib_resolv_dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dns_search" >&5
-printf "%s\n" "$ac_cv_lib_resolv_dns_search" >&6; }
-if test "x$ac_cv_lib_resolv_dns_search" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dns_search" >&5
+$as_echo "$ac_cv_lib_resolv_dns_search" >&6; }
+if test "x$ac_cv_lib_resolv_dns_search" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lresolv" >&5
-printf %s "checking for __dns_search in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv___dns_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lresolv" >&5
+$as_echo_n "checking for __dns_search in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv___dns_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dns_search (void);
+char __dns_search ();
 int
-main (void)
+main ()
 {
 return __dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___dns_search=yes
-else case e in #(
-  e) ac_cv_lib_resolv___dns_search=no ;;
-esac
+else
+  ac_cv_lib_resolv___dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dns_search" >&5
-printf "%s\n" "$ac_cv_lib_resolv___dns_search" >&6; }
-if test "x$ac_cv_lib_resolv___dns_search" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dns_search" >&5
+$as_echo "$ac_cv_lib_resolv___dns_search" >&6; }
+if test "x$ac_cv_lib_resolv___dns_search" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -80500,10 +75815,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DNS_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   else
@@ -80512,140 +75827,118 @@
   unset ac_cv_lib_bind_dns_search
   unset ac_cv_lib_bind___dns_search
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lbind" >&5
-printf %s "checking for dns_search in -lbind... " >&6; }
-if test ${ac_cv_lib_bind_dns_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lbind" >&5
+$as_echo_n "checking for dns_search in -lbind... " >&6; }
+if ${ac_cv_lib_bind_dns_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dns_search (void);
+char dns_search ();
 int
-main (void)
+main ()
 {
 return dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_dns_search=yes
-else case e in #(
-  e) ac_cv_lib_bind_dns_search=no ;;
-esac
+else
+  ac_cv_lib_bind_dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dns_search" >&5
-printf "%s\n" "$ac_cv_lib_bind_dns_search" >&6; }
-if test "x$ac_cv_lib_bind_dns_search" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dns_search" >&5
+$as_echo "$ac_cv_lib_bind_dns_search" >&6; }
+if test "x$ac_cv_lib_bind_dns_search" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lbind" >&5
-printf %s "checking for __dns_search in -lbind... " >&6; }
-if test ${ac_cv_lib_bind___dns_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lbind" >&5
+$as_echo_n "checking for __dns_search in -lbind... " >&6; }
+if ${ac_cv_lib_bind___dns_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dns_search (void);
+char __dns_search ();
 int
-main (void)
+main ()
 {
 return __dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___dns_search=yes
-else case e in #(
-  e) ac_cv_lib_bind___dns_search=no ;;
-esac
+else
+  ac_cv_lib_bind___dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dns_search" >&5
-printf "%s\n" "$ac_cv_lib_bind___dns_search" >&6; }
-if test "x$ac_cv_lib_bind___dns_search" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dns_search" >&5
+$as_echo "$ac_cv_lib_bind___dns_search" >&6; }
+if test "x$ac_cv_lib_bind___dns_search" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -80663,10 +75956,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DNS_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   else
@@ -80675,140 +75968,118 @@
   unset ac_cv_lib_socket_dns_search
   unset ac_cv_lib_socket___dns_search
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lsocket" >&5
-printf %s "checking for dns_search in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_dns_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lsocket" >&5
+$as_echo_n "checking for dns_search in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_dns_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dns_search (void);
+char dns_search ();
 int
-main (void)
+main ()
 {
 return dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_dns_search=yes
-else case e in #(
-  e) ac_cv_lib_socket_dns_search=no ;;
-esac
+else
+  ac_cv_lib_socket_dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dns_search" >&5
-printf "%s\n" "$ac_cv_lib_socket_dns_search" >&6; }
-if test "x$ac_cv_lib_socket_dns_search" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dns_search" >&5
+$as_echo "$ac_cv_lib_socket_dns_search" >&6; }
+if test "x$ac_cv_lib_socket_dns_search" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lsocket" >&5
-printf %s "checking for __dns_search in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___dns_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lsocket" >&5
+$as_echo_n "checking for __dns_search in -lsocket... " >&6; }
+if ${ac_cv_lib_socket___dns_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dns_search (void);
+char __dns_search ();
 int
-main (void)
+main ()
 {
 return __dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___dns_search=yes
-else case e in #(
-  e) ac_cv_lib_socket___dns_search=no ;;
-esac
+else
+  ac_cv_lib_socket___dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dns_search" >&5
-printf "%s\n" "$ac_cv_lib_socket___dns_search" >&6; }
-if test "x$ac_cv_lib_socket___dns_search" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dns_search" >&5
+$as_echo "$ac_cv_lib_socket___dns_search" >&6; }
+if test "x$ac_cv_lib_socket___dns_search" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -80826,10 +76097,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DNS_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   else
@@ -80854,27 +76125,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "dn_expand" "ac_cv_func_dn_expand"
-if test "x$ac_cv_func_dn_expand" = xyes
-then :
+if test "x$ac_cv_func_dn_expand" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__dn_expand" "ac_cv_func___dn_expand"
-if test "x$ac_cv_func___dn_expand" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__dn_expand" "ac_cv_func___dn_expand"
+if test "x$ac_cv_func___dn_expand" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_DN_EXPAND 1" >>confdefs.h
+$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   ;;
@@ -80884,140 +76151,118 @@
   unset ac_cv_lib_resolv_dn_expand
   unset ac_cv_lib_resolv___dn_expand
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lresolv" >&5
-printf %s "checking for dn_expand in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv_dn_expand+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lresolv" >&5
+$as_echo_n "checking for dn_expand in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv_dn_expand+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dn_expand (void);
+char dn_expand ();
 int
-main (void)
+main ()
 {
 return dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_dn_expand=yes
-else case e in #(
-  e) ac_cv_lib_resolv_dn_expand=no ;;
-esac
+else
+  ac_cv_lib_resolv_dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_expand" >&5
-printf "%s\n" "$ac_cv_lib_resolv_dn_expand" >&6; }
-if test "x$ac_cv_lib_resolv_dn_expand" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_expand" >&5
+$as_echo "$ac_cv_lib_resolv_dn_expand" >&6; }
+if test "x$ac_cv_lib_resolv_dn_expand" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lresolv" >&5
-printf %s "checking for __dn_expand in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv___dn_expand+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lresolv" >&5
+$as_echo_n "checking for __dn_expand in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv___dn_expand+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dn_expand (void);
+char __dn_expand ();
 int
-main (void)
+main ()
 {
 return __dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___dn_expand=yes
-else case e in #(
-  e) ac_cv_lib_resolv___dn_expand=no ;;
-esac
+else
+  ac_cv_lib_resolv___dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_expand" >&5
-printf "%s\n" "$ac_cv_lib_resolv___dn_expand" >&6; }
-if test "x$ac_cv_lib_resolv___dn_expand" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_expand" >&5
+$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
+if test "x$ac_cv_lib_resolv___dn_expand" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -81035,10 +76280,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DN_EXPAND 1" >>confdefs.h
+$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   else
@@ -81047,140 +76292,118 @@
   unset ac_cv_lib_bind_dn_expand
   unset ac_cv_lib_bind___dn_expand
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lbind" >&5
-printf %s "checking for dn_expand in -lbind... " >&6; }
-if test ${ac_cv_lib_bind_dn_expand+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lbind" >&5
+$as_echo_n "checking for dn_expand in -lbind... " >&6; }
+if ${ac_cv_lib_bind_dn_expand+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dn_expand (void);
+char dn_expand ();
 int
-main (void)
+main ()
 {
 return dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_dn_expand=yes
-else case e in #(
-  e) ac_cv_lib_bind_dn_expand=no ;;
-esac
+else
+  ac_cv_lib_bind_dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_expand" >&5
-printf "%s\n" "$ac_cv_lib_bind_dn_expand" >&6; }
-if test "x$ac_cv_lib_bind_dn_expand" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_expand" >&5
+$as_echo "$ac_cv_lib_bind_dn_expand" >&6; }
+if test "x$ac_cv_lib_bind_dn_expand" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lbind" >&5
-printf %s "checking for __dn_expand in -lbind... " >&6; }
-if test ${ac_cv_lib_bind___dn_expand+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lbind" >&5
+$as_echo_n "checking for __dn_expand in -lbind... " >&6; }
+if ${ac_cv_lib_bind___dn_expand+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dn_expand (void);
+char __dn_expand ();
 int
-main (void)
+main ()
 {
 return __dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___dn_expand=yes
-else case e in #(
-  e) ac_cv_lib_bind___dn_expand=no ;;
-esac
+else
+  ac_cv_lib_bind___dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_expand" >&5
-printf "%s\n" "$ac_cv_lib_bind___dn_expand" >&6; }
-if test "x$ac_cv_lib_bind___dn_expand" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_expand" >&5
+$as_echo "$ac_cv_lib_bind___dn_expand" >&6; }
+if test "x$ac_cv_lib_bind___dn_expand" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -81198,10 +76421,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DN_EXPAND 1" >>confdefs.h
+$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   else
@@ -81210,140 +76433,118 @@
   unset ac_cv_lib_socket_dn_expand
   unset ac_cv_lib_socket___dn_expand
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lsocket" >&5
-printf %s "checking for dn_expand in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_dn_expand+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lsocket" >&5
+$as_echo_n "checking for dn_expand in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_dn_expand+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dn_expand (void);
+char dn_expand ();
 int
-main (void)
+main ()
 {
 return dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_dn_expand=yes
-else case e in #(
-  e) ac_cv_lib_socket_dn_expand=no ;;
-esac
+else
+  ac_cv_lib_socket_dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_expand" >&5
-printf "%s\n" "$ac_cv_lib_socket_dn_expand" >&6; }
-if test "x$ac_cv_lib_socket_dn_expand" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_expand" >&5
+$as_echo "$ac_cv_lib_socket_dn_expand" >&6; }
+if test "x$ac_cv_lib_socket_dn_expand" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lsocket" >&5
-printf %s "checking for __dn_expand in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___dn_expand+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lsocket" >&5
+$as_echo_n "checking for __dn_expand in -lsocket... " >&6; }
+if ${ac_cv_lib_socket___dn_expand+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dn_expand (void);
+char __dn_expand ();
 int
-main (void)
+main ()
 {
 return __dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___dn_expand=yes
-else case e in #(
-  e) ac_cv_lib_socket___dn_expand=no ;;
-esac
+else
+  ac_cv_lib_socket___dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_expand" >&5
-printf "%s\n" "$ac_cv_lib_socket___dn_expand" >&6; }
-if test "x$ac_cv_lib_socket___dn_expand" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_expand" >&5
+$as_echo "$ac_cv_lib_socket___dn_expand" >&6; }
+if test "x$ac_cv_lib_socket___dn_expand" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -81361,10 +76562,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DN_EXPAND 1" >>confdefs.h
+$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   else
@@ -81389,27 +76590,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "dn_skipname" "ac_cv_func_dn_skipname"
-if test "x$ac_cv_func_dn_skipname" = xyes
-then :
+if test "x$ac_cv_func_dn_skipname" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__dn_skipname" "ac_cv_func___dn_skipname"
-if test "x$ac_cv_func___dn_skipname" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__dn_skipname" "ac_cv_func___dn_skipname"
+if test "x$ac_cv_func___dn_skipname" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
+$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   ;;
@@ -81419,140 +76616,118 @@
   unset ac_cv_lib_resolv_dn_skipname
   unset ac_cv_lib_resolv___dn_skipname
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lresolv" >&5
-printf %s "checking for dn_skipname in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv_dn_skipname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lresolv" >&5
+$as_echo_n "checking for dn_skipname in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv_dn_skipname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dn_skipname (void);
+char dn_skipname ();
 int
-main (void)
+main ()
 {
 return dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_dn_skipname=yes
-else case e in #(
-  e) ac_cv_lib_resolv_dn_skipname=no ;;
-esac
+else
+  ac_cv_lib_resolv_dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_skipname" >&5
-printf "%s\n" "$ac_cv_lib_resolv_dn_skipname" >&6; }
-if test "x$ac_cv_lib_resolv_dn_skipname" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_skipname" >&5
+$as_echo "$ac_cv_lib_resolv_dn_skipname" >&6; }
+if test "x$ac_cv_lib_resolv_dn_skipname" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lresolv" >&5
-printf %s "checking for __dn_skipname in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv___dn_skipname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lresolv" >&5
+$as_echo_n "checking for __dn_skipname in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv___dn_skipname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dn_skipname (void);
+char __dn_skipname ();
 int
-main (void)
+main ()
 {
 return __dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___dn_skipname=yes
-else case e in #(
-  e) ac_cv_lib_resolv___dn_skipname=no ;;
-esac
+else
+  ac_cv_lib_resolv___dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_skipname" >&5
-printf "%s\n" "$ac_cv_lib_resolv___dn_skipname" >&6; }
-if test "x$ac_cv_lib_resolv___dn_skipname" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_skipname" >&5
+$as_echo "$ac_cv_lib_resolv___dn_skipname" >&6; }
+if test "x$ac_cv_lib_resolv___dn_skipname" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -81570,10 +76745,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
+$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   else
@@ -81582,140 +76757,118 @@
   unset ac_cv_lib_bind_dn_skipname
   unset ac_cv_lib_bind___dn_skipname
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lbind" >&5
-printf %s "checking for dn_skipname in -lbind... " >&6; }
-if test ${ac_cv_lib_bind_dn_skipname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lbind" >&5
+$as_echo_n "checking for dn_skipname in -lbind... " >&6; }
+if ${ac_cv_lib_bind_dn_skipname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dn_skipname (void);
+char dn_skipname ();
 int
-main (void)
+main ()
 {
 return dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_dn_skipname=yes
-else case e in #(
-  e) ac_cv_lib_bind_dn_skipname=no ;;
-esac
+else
+  ac_cv_lib_bind_dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_skipname" >&5
-printf "%s\n" "$ac_cv_lib_bind_dn_skipname" >&6; }
-if test "x$ac_cv_lib_bind_dn_skipname" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_skipname" >&5
+$as_echo "$ac_cv_lib_bind_dn_skipname" >&6; }
+if test "x$ac_cv_lib_bind_dn_skipname" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lbind" >&5
-printf %s "checking for __dn_skipname in -lbind... " >&6; }
-if test ${ac_cv_lib_bind___dn_skipname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lbind" >&5
+$as_echo_n "checking for __dn_skipname in -lbind... " >&6; }
+if ${ac_cv_lib_bind___dn_skipname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dn_skipname (void);
+char __dn_skipname ();
 int
-main (void)
+main ()
 {
 return __dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___dn_skipname=yes
-else case e in #(
-  e) ac_cv_lib_bind___dn_skipname=no ;;
-esac
+else
+  ac_cv_lib_bind___dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_skipname" >&5
-printf "%s\n" "$ac_cv_lib_bind___dn_skipname" >&6; }
-if test "x$ac_cv_lib_bind___dn_skipname" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_skipname" >&5
+$as_echo "$ac_cv_lib_bind___dn_skipname" >&6; }
+if test "x$ac_cv_lib_bind___dn_skipname" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -81733,10 +76886,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
+$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   else
@@ -81745,140 +76898,118 @@
   unset ac_cv_lib_socket_dn_skipname
   unset ac_cv_lib_socket___dn_skipname
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lsocket" >&5
-printf %s "checking for dn_skipname in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_dn_skipname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lsocket" >&5
+$as_echo_n "checking for dn_skipname in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_dn_skipname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dn_skipname (void);
+char dn_skipname ();
 int
-main (void)
+main ()
 {
 return dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_dn_skipname=yes
-else case e in #(
-  e) ac_cv_lib_socket_dn_skipname=no ;;
-esac
+else
+  ac_cv_lib_socket_dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_skipname" >&5
-printf "%s\n" "$ac_cv_lib_socket_dn_skipname" >&6; }
-if test "x$ac_cv_lib_socket_dn_skipname" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_skipname" >&5
+$as_echo "$ac_cv_lib_socket_dn_skipname" >&6; }
+if test "x$ac_cv_lib_socket_dn_skipname" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lsocket" >&5
-printf %s "checking for __dn_skipname in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___dn_skipname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lsocket" >&5
+$as_echo_n "checking for __dn_skipname in -lsocket... " >&6; }
+if ${ac_cv_lib_socket___dn_skipname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dn_skipname (void);
+char __dn_skipname ();
 int
-main (void)
+main ()
 {
 return __dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___dn_skipname=yes
-else case e in #(
-  e) ac_cv_lib_socket___dn_skipname=no ;;
-esac
+else
+  ac_cv_lib_socket___dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_skipname" >&5
-printf "%s\n" "$ac_cv_lib_socket___dn_skipname" >&6; }
-if test "x$ac_cv_lib_socket___dn_skipname" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_skipname" >&5
+$as_echo "$ac_cv_lib_socket___dn_skipname" >&6; }
+if test "x$ac_cv_lib_socket___dn_skipname" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -81896,10 +77027,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
+$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   else
@@ -81926,27 +77057,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search"
-if test "x$ac_cv_func_res_search" = xyes
-then :
+if test "x$ac_cv_func_res_search" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__res_search" "ac_cv_func___res_search"
-if test "x$ac_cv_func___res_search" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__res_search" "ac_cv_func___res_search"
+if test "x$ac_cv_func___res_search" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_RES_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   ;;
@@ -81956,140 +77083,118 @@
   unset ac_cv_lib_resolv_res_search
   unset ac_cv_lib_resolv___res_search
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
-printf %s "checking for res_search in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv_res_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
+$as_echo_n "checking for res_search in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv_res_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_search (void);
+char res_search ();
 int
-main (void)
+main ()
 {
 return res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_res_search=yes
-else case e in #(
-  e) ac_cv_lib_resolv_res_search=no ;;
-esac
+else
+  ac_cv_lib_resolv_res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
-printf "%s\n" "$ac_cv_lib_resolv_res_search" >&6; }
-if test "x$ac_cv_lib_resolv_res_search" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
+$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
+if test "x$ac_cv_lib_resolv_res_search" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lresolv" >&5
-printf %s "checking for __res_search in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv___res_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lresolv" >&5
+$as_echo_n "checking for __res_search in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv___res_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_search (void);
+char __res_search ();
 int
-main (void)
+main ()
 {
 return __res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___res_search=yes
-else case e in #(
-  e) ac_cv_lib_resolv___res_search=no ;;
-esac
+else
+  ac_cv_lib_resolv___res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_search" >&5
-printf "%s\n" "$ac_cv_lib_resolv___res_search" >&6; }
-if test "x$ac_cv_lib_resolv___res_search" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_search" >&5
+$as_echo "$ac_cv_lib_resolv___res_search" >&6; }
+if test "x$ac_cv_lib_resolv___res_search" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -82107,10 +77212,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   else
@@ -82119,140 +77224,118 @@
   unset ac_cv_lib_bind_res_search
   unset ac_cv_lib_bind___res_search
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_search in -lbind" >&5
-printf %s "checking for res_search in -lbind... " >&6; }
-if test ${ac_cv_lib_bind_res_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lbind" >&5
+$as_echo_n "checking for res_search in -lbind... " >&6; }
+if ${ac_cv_lib_bind_res_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_search (void);
+char res_search ();
 int
-main (void)
+main ()
 {
 return res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_res_search=yes
-else case e in #(
-  e) ac_cv_lib_bind_res_search=no ;;
-esac
+else
+  ac_cv_lib_bind_res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_search" >&5
-printf "%s\n" "$ac_cv_lib_bind_res_search" >&6; }
-if test "x$ac_cv_lib_bind_res_search" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_search" >&5
+$as_echo "$ac_cv_lib_bind_res_search" >&6; }
+if test "x$ac_cv_lib_bind_res_search" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lbind" >&5
-printf %s "checking for __res_search in -lbind... " >&6; }
-if test ${ac_cv_lib_bind___res_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lbind" >&5
+$as_echo_n "checking for __res_search in -lbind... " >&6; }
+if ${ac_cv_lib_bind___res_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_search (void);
+char __res_search ();
 int
-main (void)
+main ()
 {
 return __res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___res_search=yes
-else case e in #(
-  e) ac_cv_lib_bind___res_search=no ;;
-esac
+else
+  ac_cv_lib_bind___res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_search" >&5
-printf "%s\n" "$ac_cv_lib_bind___res_search" >&6; }
-if test "x$ac_cv_lib_bind___res_search" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_search" >&5
+$as_echo "$ac_cv_lib_bind___res_search" >&6; }
+if test "x$ac_cv_lib_bind___res_search" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -82270,10 +77353,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   else
@@ -82282,140 +77365,118 @@
   unset ac_cv_lib_socket_res_search
   unset ac_cv_lib_socket___res_search
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_search in -lsocket" >&5
-printf %s "checking for res_search in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_res_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lsocket" >&5
+$as_echo_n "checking for res_search in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_res_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_search (void);
+char res_search ();
 int
-main (void)
+main ()
 {
 return res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_res_search=yes
-else case e in #(
-  e) ac_cv_lib_socket_res_search=no ;;
-esac
+else
+  ac_cv_lib_socket_res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_search" >&5
-printf "%s\n" "$ac_cv_lib_socket_res_search" >&6; }
-if test "x$ac_cv_lib_socket_res_search" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_search" >&5
+$as_echo "$ac_cv_lib_socket_res_search" >&6; }
+if test "x$ac_cv_lib_socket_res_search" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lsocket" >&5
-printf %s "checking for __res_search in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___res_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lsocket" >&5
+$as_echo_n "checking for __res_search in -lsocket... " >&6; }
+if ${ac_cv_lib_socket___res_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_search (void);
+char __res_search ();
 int
-main (void)
+main ()
 {
 return __res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___res_search=yes
-else case e in #(
-  e) ac_cv_lib_socket___res_search=no ;;
-esac
+else
+  ac_cv_lib_socket___res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_search" >&5
-printf "%s\n" "$ac_cv_lib_socket___res_search" >&6; }
-if test "x$ac_cv_lib_socket___res_search" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_search" >&5
+$as_echo "$ac_cv_lib_socket___res_search" >&6; }
+if test "x$ac_cv_lib_socket___res_search" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -82433,10 +77494,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   else
@@ -82456,20 +77517,19 @@
   esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strptime() declaration fails" >&5
-printf %s "checking whether strptime() declaration fails... " >&6; }
-if test ${ac_cv_strptime_decl_fails+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime() declaration fails" >&5
+$as_echo_n "checking whether strptime() declaration fails... " >&6; }
+if ${ac_cv_strptime_decl_fails+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <time.h>
 
 int
-main (void)
+main ()
 {
 
 #ifndef HAVE_STRPTIME
@@ -82483,68 +77543,69 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
   ac_cv_strptime_decl_fails=no
 
-else case e in #(
-  e)
+else
+
   ac_cv_strptime_decl_fails=yes
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_strptime_decl_fails" >&5
-printf "%s\n" "$ac_cv_strptime_decl_fails" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_strptime_decl_fails" >&5
+$as_echo "$ac_cv_strptime_decl_fails" >&6; }
 if test "$ac_cv_strptime_decl_fails" = "yes"; then
 
-printf "%s\n" "#define HAVE_STRPTIME_DECL_FAILS 1" >>confdefs.h
+$as_echo "#define HAVE_STRPTIME_DECL_FAILS 1" >>confdefs.h
 
 fi
 
-ac_fn_check_decl "$LINENO" "arc4random_buf" "ac_cv_have_decl_arc4random_buf" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_arc4random_buf" = xyes
-then :
+ac_fn_c_check_decl "$LINENO" "arc4random_buf" "ac_cv_have_decl_arc4random_buf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_arc4random_buf" = xyes; then :
   ac_have_decl=1
-else case e in #(
-  e) ac_have_decl=0 ;;
-esac
+else
+  ac_have_decl=0
 fi
-printf "%s\n" "#define HAVE_DECL_ARC4RANDOM_BUF $ac_have_decl" >>confdefs.h
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ARC4RANDOM_BUF $ac_have_decl
+_ACEOF
 
 
-ac_fn_c_check_header_compile "$LINENO" "CommonCrypto/CommonRandom.h" "ac_cv_header_CommonCrypto_CommonRandom_h" "
+for ac_header in CommonCrypto/CommonRandom.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "CommonCrypto/CommonRandom.h" "ac_cv_header_CommonCrypto_CommonRandom_h" "
 	#include <sys/types.h>
 	#include <Availability.h>
 	#include <CommonCrypto/CommonCryptoError.h>
 
 "
-if test "x$ac_cv_header_CommonCrypto_CommonRandom_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_COMMONCRYPTO_COMMONRANDOM_H 1" >>confdefs.h
+if test "x$ac_cv_header_CommonCrypto_CommonRandom_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_COMMONCRYPTO_COMMONRANDOM_H 1
+_ACEOF
 
 fi
 
+done
+
 
 
 php_with_password_argon2=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Argon2 support" >&5
-printf %s "checking for Argon2 support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Argon2 support" >&5
+$as_echo_n "checking for Argon2 support... " >&6; }
 
 # Check whether --with-password-argon2 was given.
-if test ${with_password_argon2+y}
-then :
+if test "${with_password_argon2+set}" = set; then :
   withval=$with_password_argon2; PHP_PASSWORD_ARGON2=$withval
-else case e in #(
-  e)
+else
+
   PHP_PASSWORD_ARGON2=no
   test "$PHP_ENABLE_ALL" && PHP_PASSWORD_ARGON2=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -82570,8 +77631,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -82579,17 +77640,17 @@
 if test "$PHP_PASSWORD_ARGON2" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libargon2" >&5
-printf %s "checking for libargon2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libargon2" >&5
+$as_echo_n "checking for libargon2... " >&6; }
 
 if test -n "$ARGON2_CFLAGS"; then
     pkg_cv_ARGON2_CFLAGS="$ARGON2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libargon2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ARGON2_CFLAGS=`$PKG_CONFIG --cflags "libargon2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -82603,10 +77664,10 @@
     pkg_cv_ARGON2_LIBS="$ARGON2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libargon2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ARGON2_LIBS=`$PKG_CONFIG --libs "libargon2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -82620,8 +77681,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -82647,10 +77708,10 @@
 and ARGON2_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -82660,12 +77721,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ARGON2_CFLAGS=$pkg_cv_ARGON2_CFLAGS
 	ARGON2_LIBS=$pkg_cv_ARGON2_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -82791,25 +77852,30 @@
 
 
 
-printf "%s\n" "#define HAVE_ARGON2LIB 1" >>confdefs.h
+$as_echo "#define HAVE_ARGON2LIB 1" >>confdefs.h
 
 fi
 
-ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "
+for ac_header in net/if.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "
   #ifdef HAVE_SYS_SOCKET_H
   #include <sys/socket.h>
   #endif
   #include <net/if.h>
 
 "
-if test "x$ac_cv_header_net_if_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_NET_IF_H 1" >>confdefs.h
+if test "x$ac_cv_header_net_if_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NET_IF_H 1
+_ACEOF
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable getifaddrs" >&5
-printf %s "checking for usable getifaddrs... " >&6; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable getifaddrs" >&5
+$as_echo_n "checking for usable getifaddrs... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -82817,7 +77883,7 @@
   #include <ifaddrs.h>
 
 int
-main (void)
+main ()
 {
 
   struct ifaddrs *interfaces;
@@ -82829,24 +77895,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_have_getifaddrs=yes
-else case e in #(
-  e) ac_have_getifaddrs=no ;;
-esac
+else
+  ac_have_getifaddrs=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 if test "$ac_have_getifaddrs" = "yes" ; then
 
-printf "%s\n" "#define HAVE_GETIFADDRS 1" >>confdefs.h
+$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -83005,7 +78069,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_STANDARD 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_STANDARD 1
+_ACEOF
 
     fi
   fi
@@ -83186,18 +78252,16 @@
 
 php_enable_sysvmsg=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable System V IPC support" >&5
-printf %s "checking whether to enable System V IPC support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable System V IPC support" >&5
+$as_echo_n "checking whether to enable System V IPC support... " >&6; }
 # Check whether --enable-sysvmsg was given.
-if test ${enable_sysvmsg+y}
-then :
+if test "${enable_sysvmsg+set}" = set; then :
   enableval=$enable_sysvmsg; PHP_SYSVMSG=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SYSVMSG=no
   test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -83223,26 +78287,25 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SYSVMSG" != "no"; then
-  ac_fn_c_check_header_compile "$LINENO" "sys/msg.h" "ac_cv_header_sys_msg_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_msg_h" = xyes
-then :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/msg.h" "ac_cv_header_sys_msg_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_msg_h" = xyes; then :
+
+else
+  as_fn_error $? "Cannot enable System V IPC support, sys/msg.h is missing" "$LINENO" 5
 
-else case e in #(
-  e) as_fn_error $? "Cannot enable System V IPC support, sys/msg.h is missing" "$LINENO" 5
-   ;;
-esac
 fi
 
 
 
-printf "%s\n" "#define HAVE_SYSVMSG 1" >>confdefs.h
+
+$as_echo "#define HAVE_SYSVMSG 1" >>confdefs.h
 
 
   ext_builddir=ext/sysvmsg
@@ -83378,7 +78441,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SYSVMSG 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SYSVMSG 1
+_ACEOF
 
     fi
   fi
@@ -83507,18 +78572,16 @@
 
 php_enable_sysvsem=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable System V semaphore support" >&5
-printf %s "checking whether to enable System V semaphore support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable System V semaphore support" >&5
+$as_echo_n "checking whether to enable System V semaphore support... " >&6; }
 # Check whether --enable-sysvsem was given.
-if test ${enable_sysvsem+y}
-then :
+if test "${enable_sysvsem+set}" = set; then :
   enableval=$enable_sysvsem; PHP_SYSVSEM=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SYSVSEM=no
   test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -83544,8 +78607,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -83685,7 +78748,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SYSVSEM 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SYSVSEM 1
+_ACEOF
 
     fi
   fi
@@ -83807,15 +78872,14 @@
   fi
 
 
-printf "%s\n" "#define HAVE_SYSVSEM 1" >>confdefs.h
+$as_echo "#define HAVE_SYSVSEM 1" >>confdefs.h
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for union semun" >&5
-printf %s "checking for union semun... " >&6; }
-if test ${php_cv_semun+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for union semun" >&5
+$as_echo_n "checking for union semun... " >&6; }
+if ${php_cv_semun+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -83823,37 +78887,34 @@
 #include <sys/sem.h>
 
 int
-main (void)
+main ()
 {
 union semun x;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
      php_cv_semun=yes
 
-else case e in #(
-  e)
+else
+
      php_cv_semun=no
-    ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_semun" >&5
-printf "%s\n" "$php_cv_semun" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_semun" >&5
+$as_echo "$php_cv_semun" >&6; }
  if test "$php_cv_semun" = "yes"; then
 
-printf "%s\n" "#define HAVE_SEMUN 1" >>confdefs.h
+$as_echo "#define HAVE_SEMUN 1" >>confdefs.h
 
  else
 
-printf "%s\n" "#define HAVE_SEMUN 0" >>confdefs.h
+$as_echo "#define HAVE_SEMUN 0" >>confdefs.h
 
  fi
 fi
@@ -83864,18 +78925,16 @@
 
 php_enable_sysvshm=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable System V shared memory support" >&5
-printf %s "checking whether to enable System V shared memory support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable System V shared memory support" >&5
+$as_echo_n "checking whether to enable System V shared memory support... " >&6; }
 # Check whether --enable-sysvshm was given.
-if test ${enable_sysvshm+y}
-then :
+if test "${enable_sysvshm+set}" = set; then :
   enableval=$enable_sysvshm; PHP_SYSVSHM=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SYSVSHM=no
   test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -83901,15 +78960,15 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SYSVSHM" != "no"; then
 
-printf "%s\n" "#define HAVE_SYSVSHM 1" >>confdefs.h
+$as_echo "#define HAVE_SYSVSHM 1" >>confdefs.h
 
 
   ext_builddir=ext/sysvshm
@@ -84045,7 +79104,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SYSVSHM 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SYSVSHM 1
+_ACEOF
 
     fi
   fi
@@ -84174,19 +79235,17 @@
 
 php_with_tidy=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIDY support" >&5
-printf %s "checking for TIDY support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIDY support" >&5
+$as_echo_n "checking for TIDY support... " >&6; }
 
 # Check whether --with-tidy was given.
-if test ${with_tidy+y}
-then :
+if test "${with_tidy+set}" = set; then :
   withval=$with_tidy; PHP_TIDY=$withval
-else case e in #(
-  e)
+else
+
   PHP_TIDY=no
   test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -84212,8 +79271,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -84247,7 +79306,7 @@
   else
                 if test -f "$TIDY_INCDIR/tidybuffio.h"; then
 
-printf "%s\n" "#define HAVE_TIDYBUFFIO_H 1" >>confdefs.h
+$as_echo "#define HAVE_TIDYBUFFIO_H 1" >>confdefs.h
 
     fi
   fi
@@ -84255,11 +79314,11 @@
   TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
   if test "$TIDY_LIB_NAME" == 'tidyp'; then
 
-printf "%s\n" "#define HAVE_TIDYP_H 1" >>confdefs.h
+$as_echo "#define HAVE_TIDYP_H 1" >>confdefs.h
 
   else
 
-printf "%s\n" "#define HAVE_TIDY_H 1" >>confdefs.h
+$as_echo "#define HAVE_TIDY_H 1" >>confdefs.h
 
   fi
 
@@ -84369,64 +79428,56 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$TIDY_LIB_NAME""_tidyOptGetDoc" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -l$TIDY_LIB_NAME" >&5
-printf %s "checking for tidyOptGetDoc in -l$TIDY_LIB_NAME... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$TIDY_LIB_NAME''_tidyOptGetDoc" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -l$TIDY_LIB_NAME" >&5
+$as_echo_n "checking for tidyOptGetDoc in -l$TIDY_LIB_NAME... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$TIDY_LIB_NAME  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tidyOptGetDoc (void);
+char tidyOptGetDoc ();
 int
-main (void)
+main ()
 {
 return tidyOptGetDoc ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h
+$as_echo "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$TIDY_LIB_NAME_tidyOptGetDoc
@@ -84536,74 +79587,64 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -ltidy5" >&5
-printf %s "checking for tidyOptGetDoc in -ltidy5... " >&6; }
-if test ${ac_cv_lib_tidy5_tidyOptGetDoc+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -ltidy5" >&5
+$as_echo_n "checking for tidyOptGetDoc in -ltidy5... " >&6; }
+if ${ac_cv_lib_tidy5_tidyOptGetDoc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltidy5  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tidyOptGetDoc (void);
+char tidyOptGetDoc ();
 int
-main (void)
+main ()
 {
 return tidyOptGetDoc ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_tidy5_tidyOptGetDoc=yes
-else case e in #(
-  e) ac_cv_lib_tidy5_tidyOptGetDoc=no ;;
-esac
+else
+  ac_cv_lib_tidy5_tidyOptGetDoc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tidy5_tidyOptGetDoc" >&5
-printf "%s\n" "$ac_cv_lib_tidy5_tidyOptGetDoc" >&6; }
-if test "x$ac_cv_lib_tidy5_tidyOptGetDoc" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tidy5_tidyOptGetDoc" >&5
+$as_echo "$ac_cv_lib_tidy5_tidyOptGetDoc" >&6; }
+if test "x$ac_cv_lib_tidy5_tidyOptGetDoc" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
       TIDY_LIB_NAME=tidy5
 
-printf "%s\n" "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h
+$as_echo "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_tidy5_tidyOptGetDoc
 
-   ;;
-esac
+
 fi
 
 
-   ;;
-esac
+
 fi
 
 
@@ -84712,70 +79753,61 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$TIDY_LIB_NAME""_tidyReleaseDate" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tidyReleaseDate in -l$TIDY_LIB_NAME" >&5
-printf %s "checking for tidyReleaseDate in -l$TIDY_LIB_NAME... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$TIDY_LIB_NAME''_tidyReleaseDate" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tidyReleaseDate in -l$TIDY_LIB_NAME" >&5
+$as_echo_n "checking for tidyReleaseDate in -l$TIDY_LIB_NAME... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$TIDY_LIB_NAME  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tidyReleaseDate (void);
+char tidyReleaseDate ();
 int
-main (void)
+main ()
 {
 return tidyReleaseDate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_TIDYRELEASEDATE 1" >>confdefs.h
+$as_echo "#define HAVE_TIDYRELEASEDATE 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$TIDY_LIB_NAME_tidyReleaseDate
 
-   ;;
-esac
+
 fi
 
 
@@ -85043,7 +80075,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_TIDY 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_TIDY 1
+_ACEOF
 
     fi
   fi
@@ -85168,7 +80202,7 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD"
 
 
-printf "%s\n" "#define HAVE_TIDY 1" >>confdefs.h
+$as_echo "#define HAVE_TIDY 1" >>confdefs.h
 
 fi
 
@@ -85178,18 +80212,16 @@
 
 php_enable_tokenizer=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable tokenizer support" >&5
-printf %s "checking whether to enable tokenizer support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable tokenizer support" >&5
+$as_echo_n "checking whether to enable tokenizer support... " >&6; }
 # Check whether --enable-tokenizer was given.
-if test ${enable_tokenizer+y}
-then :
+if test "${enable_tokenizer+set}" = set; then :
   enableval=$enable_tokenizer; PHP_TOKENIZER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_TOKENIZER=yes
   test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -85215,8 +80247,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -85356,7 +80388,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_TOKENIZER 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_TOKENIZER 1
+_ACEOF
 
     fi
   fi
@@ -85491,18 +80525,16 @@
 
 php_enable_xml=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable XML support" >&5
-printf %s "checking whether to enable XML support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable XML support" >&5
+$as_echo_n "checking whether to enable XML support... " >&6; }
 # Check whether --enable-xml was given.
-if test ${enable_xml+y}
-then :
+if test "${enable_xml+set}" = set; then :
   enableval=$enable_xml; PHP_XML=$enableval
-else case e in #(
-  e)
+else
+
   PHP_XML=yes
   test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -85528,8 +80560,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -85537,25 +80569,23 @@
 
 php_with_expat=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with expat support" >&5
-printf %s "checking whether to build with expat support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with expat support" >&5
+$as_echo_n "checking whether to build with expat support... " >&6; }
 
 # Check whether --with-expat was given.
-if test ${with_expat+y}
-then :
+if test "${with_expat+set}" = set; then :
   withval=$with_expat; PHP_EXPAT=$withval
-else case e in #(
-  e)
+else
+
   PHP_EXPAT=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_EXPAT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -85571,17 +80601,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -85595,10 +80625,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -85612,8 +80642,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -85639,10 +80669,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -85652,12 +80682,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -85802,7 +80832,7 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
@@ -85832,17 +80862,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for expat" >&5
-printf %s "checking for expat... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for expat" >&5
+$as_echo_n "checking for expat... " >&6; }
 
 if test -n "$EXPAT_CFLAGS"; then
     pkg_cv_EXPAT_CFLAGS="$EXPAT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5
   ($PKG_CONFIG --exists --print-errors "expat") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXPAT_CFLAGS=`$PKG_CONFIG --cflags "expat" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -85856,10 +80886,10 @@
     pkg_cv_EXPAT_LIBS="$EXPAT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5
   ($PKG_CONFIG --exists --print-errors "expat") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXPAT_LIBS=`$PKG_CONFIG --libs "expat" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -85873,8 +80903,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -85900,10 +80930,10 @@
 and EXPAT_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -85913,12 +80943,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	EXPAT_CFLAGS=$pkg_cv_EXPAT_CFLAGS
 	EXPAT_LIBS=$pkg_cv_EXPAT_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -86063,7 +81093,7 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBEXPAT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBEXPAT 1" >>confdefs.h
 
 
   fi
@@ -86202,7 +81232,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_XML 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_XML 1
+_ACEOF
 
     fi
   fi
@@ -86345,7 +81377,7 @@
 
 
 
-printf "%s\n" "#define HAVE_XML 1" >>confdefs.h
+$as_echo "#define HAVE_XML 1" >>confdefs.h
 
 fi
 
@@ -86355,18 +81387,16 @@
 
 php_enable_xmlreader=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLReader support" >&5
-printf %s "checking whether to enable XMLReader support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLReader support" >&5
+$as_echo_n "checking whether to enable XMLReader support... " >&6; }
 # Check whether --enable-xmlreader was given.
-if test ${enable_xmlreader+y}
-then :
+if test "${enable_xmlreader+set}" = set; then :
   enableval=$enable_xmlreader; PHP_XMLREADER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_XMLREADER=yes
   test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -86392,8 +81422,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -86407,17 +81437,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -86431,10 +81461,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -86448,8 +81478,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -86475,10 +81505,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -86488,12 +81518,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -86638,12 +81668,12 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define HAVE_XMLREADER 1" >>confdefs.h
+$as_echo "#define HAVE_XMLREADER 1" >>confdefs.h
 
 
   ext_builddir=ext/xmlreader
@@ -86779,7 +81809,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_XMLREADER 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_XMLREADER 1
+_ACEOF
 
     fi
   fi
@@ -86932,18 +81964,16 @@
 
 php_enable_xmlwriter=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLWriter support" >&5
-printf %s "checking whether to enable XMLWriter support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLWriter support" >&5
+$as_echo_n "checking whether to enable XMLWriter support... " >&6; }
 # Check whether --enable-xmlwriter was given.
-if test ${enable_xmlwriter+y}
-then :
+if test "${enable_xmlwriter+set}" = set; then :
   enableval=$enable_xmlwriter; PHP_XMLWRITER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_XMLWRITER=yes
   test "$PHP_ENABLE_ALL" && PHP_XMLWRITER=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -86969,8 +81999,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -86984,17 +82014,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -87008,10 +82038,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -87025,8 +82055,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -87052,10 +82082,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -87065,12 +82095,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -87215,12 +82245,12 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define HAVE_XMLWRITER 1" >>confdefs.h
+$as_echo "#define HAVE_XMLWRITER 1" >>confdefs.h
 
 
   ext_builddir=ext/xmlwriter
@@ -87356,7 +82386,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_XMLWRITER 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_XMLWRITER 1
+_ACEOF
 
     fi
   fi
@@ -87490,19 +82522,17 @@
 
 php_with_xsl=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with XSL support" >&5
-printf %s "checking whether to build with XSL support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with XSL support" >&5
+$as_echo_n "checking whether to build with XSL support... " >&6; }
 
 # Check whether --with-xsl was given.
-if test ${with_xsl+y}
-then :
+if test "${with_xsl+set}" = set; then :
   withval=$with_xsl; PHP_XSL=$withval
-else case e in #(
-  e)
+else
+
   PHP_XSL=no
   test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -87528,8 +82558,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -87546,17 +82576,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxslt >= 1.1.0" >&5
-printf %s "checking for libxslt >= 1.1.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt >= 1.1.0" >&5
+$as_echo_n "checking for libxslt >= 1.1.0... " >&6; }
 
 if test -n "$XSL_CFLAGS"; then
     pkg_cv_XSL_CFLAGS="$XSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxslt >= 1.1.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XSL_CFLAGS=`$PKG_CONFIG --cflags "libxslt >= 1.1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -87570,10 +82600,10 @@
     pkg_cv_XSL_LIBS="$XSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxslt >= 1.1.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XSL_LIBS=`$PKG_CONFIG --libs "libxslt >= 1.1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -87587,8 +82617,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -87614,10 +82644,10 @@
 and XSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -87627,12 +82657,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	XSL_CFLAGS=$pkg_cv_XSL_CFLAGS
 	XSL_LIBS=$pkg_cv_XSL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -87778,17 +82808,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libexslt" >&5
-printf %s "checking for libexslt... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexslt" >&5
+$as_echo_n "checking for libexslt... " >&6; }
 
 if test -n "$EXSLT_CFLAGS"; then
     pkg_cv_EXSLT_CFLAGS="$EXSLT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libexslt") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXSLT_CFLAGS=`$PKG_CONFIG --cflags "libexslt" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -87802,10 +82832,10 @@
     pkg_cv_EXSLT_LIBS="$EXSLT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libexslt") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXSLT_LIBS=`$PKG_CONFIG --libs "libexslt" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -87819,8 +82849,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -87837,14 +82867,14 @@
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 else
 	EXSLT_CFLAGS=$pkg_cv_EXSLT_CFLAGS
 	EXSLT_LIBS=$pkg_cv_EXSLT_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
   for ac_i in $EXSLT_CFLAGS; do
@@ -87986,13 +83016,13 @@
   done
 
 
-printf "%s\n" "#define HAVE_XSL_EXSLT 1" >>confdefs.h
+$as_echo "#define HAVE_XSL_EXSLT 1" >>confdefs.h
 
 
 fi
 
 
-printf "%s\n" "#define HAVE_XSL 1" >>confdefs.h
+$as_echo "#define HAVE_XSL 1" >>confdefs.h
 
 
   ext_builddir=ext/xsl
@@ -88128,7 +83158,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_XSL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_XSL 1
+_ACEOF
 
     fi
   fi
@@ -88298,18 +83330,16 @@
 
 php_enable_zend_test=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable zend-test extension" >&5
-printf %s "checking whether to enable zend-test extension... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable zend-test extension" >&5
+$as_echo_n "checking whether to enable zend-test extension... " >&6; }
 # Check whether --enable-zend-test was given.
-if test ${enable_zend_test+y}
-then :
+if test "${enable_zend_test+set}" = set; then :
   enableval=$enable_zend_test; PHP_ZEND_TEST=$enableval
-else case e in #(
-  e)
+else
+
   PHP_ZEND_TEST=no
   test "$PHP_ENABLE_ALL" && PHP_ZEND_TEST=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -88335,8 +83365,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -88476,7 +83506,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_ZEND_TEST 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_ZEND_TEST 1
+_ACEOF
 
     fi
   fi
@@ -88605,19 +83637,17 @@
 
 php_with_zip=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip archive read/write support" >&5
-printf %s "checking for zip archive read/write support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip archive read/write support" >&5
+$as_echo_n "checking for zip archive read/write support... " >&6; }
 
 # Check whether --with-zip was given.
-if test ${with_zip+y}
-then :
+if test "${with_zip+set}" = set; then :
   withval=$with_zip; PHP_ZIP=$withval
-else case e in #(
-  e)
+else
+
   PHP_ZIP=no
   test "$PHP_ENABLE_ALL" && PHP_ZIP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -88643,8 +83673,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -88652,17 +83682,17 @@
 if test "$PHP_ZIP" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" >&5
-printf %s "checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" >&5
+$as_echo_n "checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0... " >&6; }
 
 if test -n "$LIBZIP_CFLAGS"; then
     pkg_cv_LIBZIP_CFLAGS="$LIBZIP_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBZIP_CFLAGS=`$PKG_CONFIG --cflags "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -88676,10 +83706,10 @@
     pkg_cv_LIBZIP_LIBS="$LIBZIP_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBZIP_LIBS=`$PKG_CONFIG --libs "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -88693,8 +83723,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -88720,10 +83750,10 @@
 and LIBZIP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -88733,12 +83763,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBZIP_CFLAGS=$pkg_cv_LIBZIP_CFLAGS
 	LIBZIP_LIBS=$pkg_cv_LIBZIP_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -88989,71 +84019,62 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_mtime in -lzip" >&5
-printf %s "checking for zip_file_set_mtime in -lzip... " >&6; }
-if test ${ac_cv_lib_zip_zip_file_set_mtime+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_mtime in -lzip" >&5
+$as_echo_n "checking for zip_file_set_mtime in -lzip... " >&6; }
+if ${ac_cv_lib_zip_zip_file_set_mtime+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char zip_file_set_mtime (void);
+char zip_file_set_mtime ();
 int
-main (void)
+main ()
 {
 return zip_file_set_mtime ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_zip_zip_file_set_mtime=yes
-else case e in #(
-  e) ac_cv_lib_zip_zip_file_set_mtime=no ;;
-esac
+else
+  ac_cv_lib_zip_zip_file_set_mtime=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_mtime" >&5
-printf "%s\n" "$ac_cv_lib_zip_zip_file_set_mtime" >&6; }
-if test "x$ac_cv_lib_zip_zip_file_set_mtime" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_mtime" >&5
+$as_echo "$ac_cv_lib_zip_zip_file_set_mtime" >&6; }
+if test "x$ac_cv_lib_zip_zip_file_set_mtime" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SET_MTIME 1" >>confdefs.h
+$as_echo "#define HAVE_SET_MTIME 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_zip_zip_file_set_mtime
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&5
-printf "%s\n" "$as_me: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&5
+$as_echo "$as_me: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&2;}
+
 
-   ;;
-esac
 fi
 
 
@@ -89164,71 +84185,62 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_encryption in -lzip" >&5
-printf %s "checking for zip_file_set_encryption in -lzip... " >&6; }
-if test ${ac_cv_lib_zip_zip_file_set_encryption+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_encryption in -lzip" >&5
+$as_echo_n "checking for zip_file_set_encryption in -lzip... " >&6; }
+if ${ac_cv_lib_zip_zip_file_set_encryption+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char zip_file_set_encryption (void);
+char zip_file_set_encryption ();
 int
-main (void)
+main ()
 {
 return zip_file_set_encryption ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_zip_zip_file_set_encryption=yes
-else case e in #(
-  e) ac_cv_lib_zip_zip_file_set_encryption=no ;;
-esac
+else
+  ac_cv_lib_zip_zip_file_set_encryption=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_encryption" >&5
-printf "%s\n" "$ac_cv_lib_zip_zip_file_set_encryption" >&6; }
-if test "x$ac_cv_lib_zip_zip_file_set_encryption" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_encryption" >&5
+$as_echo "$ac_cv_lib_zip_zip_file_set_encryption" >&6; }
+if test "x$ac_cv_lib_zip_zip_file_set_encryption" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_ENCRYPTION 1" >>confdefs.h
+$as_echo "#define HAVE_ENCRYPTION 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_zip_zip_file_set_encryption
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.2.0 needed for encryption support" >&5
-printf "%s\n" "$as_me: WARNING: Libzip >= 1.2.0 needed for encryption support" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.2.0 needed for encryption support" >&5
+$as_echo "$as_me: WARNING: Libzip >= 1.2.0 needed for encryption support" >&2;}
+
 
-   ;;
-esac
 fi
 
 
@@ -89339,69 +84351,60 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_libzip_version in -lzip" >&5
-printf %s "checking for zip_libzip_version in -lzip... " >&6; }
-if test ${ac_cv_lib_zip_zip_libzip_version+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_libzip_version in -lzip" >&5
+$as_echo_n "checking for zip_libzip_version in -lzip... " >&6; }
+if ${ac_cv_lib_zip_zip_libzip_version+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char zip_libzip_version (void);
+char zip_libzip_version ();
 int
-main (void)
+main ()
 {
 return zip_libzip_version ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_zip_zip_libzip_version=yes
-else case e in #(
-  e) ac_cv_lib_zip_zip_libzip_version=no ;;
-esac
+else
+  ac_cv_lib_zip_zip_libzip_version=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_libzip_version" >&5
-printf "%s\n" "$ac_cv_lib_zip_zip_libzip_version" >&6; }
-if test "x$ac_cv_lib_zip_zip_libzip_version" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_libzip_version" >&5
+$as_echo "$ac_cv_lib_zip_zip_libzip_version" >&6; }
+if test "x$ac_cv_lib_zip_zip_libzip_version" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_LIBZIP_VERSION 1" >>confdefs.h
+$as_echo "#define HAVE_LIBZIP_VERSION 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_zip_zip_libzip_version
 
 
-   ;;
-esac
+
 fi
 
 
@@ -89512,69 +84515,60 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_register_progress_callback_with_state in -lzip" >&5
-printf %s "checking for zip_register_progress_callback_with_state in -lzip... " >&6; }
-if test ${ac_cv_lib_zip_zip_register_progress_callback_with_state+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_register_progress_callback_with_state in -lzip" >&5
+$as_echo_n "checking for zip_register_progress_callback_with_state in -lzip... " >&6; }
+if ${ac_cv_lib_zip_zip_register_progress_callback_with_state+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char zip_register_progress_callback_with_state (void);
+char zip_register_progress_callback_with_state ();
 int
-main (void)
+main ()
 {
 return zip_register_progress_callback_with_state ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_zip_zip_register_progress_callback_with_state=yes
-else case e in #(
-  e) ac_cv_lib_zip_zip_register_progress_callback_with_state=no ;;
-esac
+else
+  ac_cv_lib_zip_zip_register_progress_callback_with_state=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_progress_callback_with_state" >&5
-printf "%s\n" "$ac_cv_lib_zip_zip_register_progress_callback_with_state" >&6; }
-if test "x$ac_cv_lib_zip_zip_register_progress_callback_with_state" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_progress_callback_with_state" >&5
+$as_echo "$ac_cv_lib_zip_zip_register_progress_callback_with_state" >&6; }
+if test "x$ac_cv_lib_zip_zip_register_progress_callback_with_state" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_PROGRESS_CALLBACK 1" >>confdefs.h
+$as_echo "#define HAVE_PROGRESS_CALLBACK 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_zip_zip_register_progress_callback_with_state
 
 
-   ;;
-esac
+
 fi
 
 
@@ -89685,69 +84679,60 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_register_cancel_callback_with_state in -lzip" >&5
-printf %s "checking for zip_register_cancel_callback_with_state in -lzip... " >&6; }
-if test ${ac_cv_lib_zip_zip_register_cancel_callback_with_state+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_register_cancel_callback_with_state in -lzip" >&5
+$as_echo_n "checking for zip_register_cancel_callback_with_state in -lzip... " >&6; }
+if ${ac_cv_lib_zip_zip_register_cancel_callback_with_state+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char zip_register_cancel_callback_with_state (void);
+char zip_register_cancel_callback_with_state ();
 int
-main (void)
+main ()
 {
 return zip_register_cancel_callback_with_state ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_zip_zip_register_cancel_callback_with_state=yes
-else case e in #(
-  e) ac_cv_lib_zip_zip_register_cancel_callback_with_state=no ;;
-esac
+else
+  ac_cv_lib_zip_zip_register_cancel_callback_with_state=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&5
-printf "%s\n" "$ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&6; }
-if test "x$ac_cv_lib_zip_zip_register_cancel_callback_with_state" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&5
+$as_echo "$ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&6; }
+if test "x$ac_cv_lib_zip_zip_register_cancel_callback_with_state" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_CANCEL_CALLBACK 1" >>confdefs.h
+$as_echo "#define HAVE_CANCEL_CALLBACK 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_zip_zip_register_cancel_callback_with_state
 
 
-   ;;
-esac
+
 fi
 
 
@@ -89858,74 +84843,65 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_compression_method_supported in -lzip" >&5
-printf %s "checking for zip_compression_method_supported in -lzip... " >&6; }
-if test ${ac_cv_lib_zip_zip_compression_method_supported+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_compression_method_supported in -lzip" >&5
+$as_echo_n "checking for zip_compression_method_supported in -lzip... " >&6; }
+if ${ac_cv_lib_zip_zip_compression_method_supported+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char zip_compression_method_supported (void);
+char zip_compression_method_supported ();
 int
-main (void)
+main ()
 {
 return zip_compression_method_supported ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_zip_zip_compression_method_supported=yes
-else case e in #(
-  e) ac_cv_lib_zip_zip_compression_method_supported=no ;;
-esac
+else
+  ac_cv_lib_zip_zip_compression_method_supported=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_compression_method_supported" >&5
-printf "%s\n" "$ac_cv_lib_zip_zip_compression_method_supported" >&6; }
-if test "x$ac_cv_lib_zip_zip_compression_method_supported" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_compression_method_supported" >&5
+$as_echo "$ac_cv_lib_zip_zip_compression_method_supported" >&6; }
+if test "x$ac_cv_lib_zip_zip_compression_method_supported" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_METHOD_SUPPORTED 1" >>confdefs.h
+$as_echo "#define HAVE_METHOD_SUPPORTED 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_zip_zip_compression_method_supported
 
 
-   ;;
-esac
+
 fi
 
 
 
-printf "%s\n" "#define HAVE_ZIP 1" >>confdefs.h
+$as_echo "#define HAVE_ZIP 1" >>confdefs.h
 
 
   PHP_ZIP_SOURCES="php_zip.c zip_stream.c"
@@ -90063,7 +85039,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_ZIP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_ZIP 1
+_ACEOF
 
     fi
   fi
@@ -90203,18 +85181,16 @@
 
 php_enable_mysqlnd=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable mysqlnd" >&5
-printf %s "checking whether to enable mysqlnd... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mysqlnd" >&5
+$as_echo_n "checking whether to enable mysqlnd... " >&6; }
 # Check whether --enable-mysqlnd was given.
-if test ${enable_mysqlnd+y}
-then :
+if test "${enable_mysqlnd+set}" = set; then :
   enableval=$enable_mysqlnd; PHP_MYSQLND=$enableval
-else case e in #(
-  e)
+else
+
   PHP_MYSQLND=no
   test "$PHP_ENABLE_ALL" && PHP_MYSQLND=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -90240,8 +85216,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -90249,24 +85225,22 @@
 
 php_enable_mysqlnd_compression_support=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to disable compressed protocol support in mysqlnd" >&5
-printf %s "checking whether to disable compressed protocol support in mysqlnd... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable compressed protocol support in mysqlnd" >&5
+$as_echo_n "checking whether to disable compressed protocol support in mysqlnd... " >&6; }
 # Check whether --enable-mysqlnd_compression_support was given.
-if test ${enable_mysqlnd_compression_support+y}
-then :
+if test "${enable_mysqlnd_compression_support+set}" = set; then :
   enableval=$enable_mysqlnd_compression_support; PHP_MYSQLND_COMPRESSION_SUPPORT=$enableval
-else case e in #(
-  e)
+else
+
   PHP_MYSQLND_COMPRESSION_SUPPORT=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_MYSQLND_COMPRESSION_SUPPORT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -90283,17 +85257,17 @@
   if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
-printf %s "checking for zlib... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
+$as_echo_n "checking for zlib... " >&6; }
 
 if test -n "$ZLIB_CFLAGS"; then
     pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "zlib" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -90307,10 +85281,10 @@
     pkg_cv_ZLIB_LIBS="$ZLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "zlib" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -90324,8 +85298,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -90351,10 +85325,10 @@
 and ZLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -90364,12 +85338,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
 	ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -90512,12 +85486,12 @@
   done
 
 
-printf "%s\n" "#define MYSQLND_COMPRESSION_ENABLED 1" >>confdefs.h
+$as_echo "#define MYSQLND_COMPRESSION_ENABLED 1" >>confdefs.h
 
   fi
 
 
-printf "%s\n" "#define MYSQLND_SSL_SUPPORTED 1" >>confdefs.h
+$as_echo "#define MYSQLND_SSL_SUPPORTED 1" >>confdefs.h
 
 
   test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
@@ -90528,17 +85502,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
-printf %s "checking for openssl >= 1.0.2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
+$as_echo_n "checking for openssl >= 1.0.2... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -90552,10 +85526,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -90569,8 +85543,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -90596,10 +85570,10 @@
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -90609,12 +85583,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	found_openssl=yes
 fi
 
@@ -90759,7 +85733,7 @@
   done
 
 
-printf "%s\n" "#define MYSQLND_HAVE_SSL 1" >>confdefs.h
+$as_echo "#define MYSQLND_HAVE_SSL 1" >>confdefs.h
 
 
   fi
@@ -90901,7 +85875,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_MYSQLND 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_MYSQLND 1
+_ACEOF
 
     fi
   fi
@@ -91060,84 +86036,76 @@
 
 case $host_alias in
   i345686-*-linux-* | x86_64-*-linux-*)
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking linker support for -zcommon-page-size=2097152" >&5
-printf %s "checking linker support for -zcommon-page-size=2097152... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linker support for -zcommon-page-size=2097152" >&5
+$as_echo_n "checking linker support for -zcommon-page-size=2097152... " >&6; }
     save_LDFLAGS=$LDFLAGS
     LDFLAGS="$LDFLAGS -Wl,-zcommon-page-size=2097152 -Wl,-zmax-page-size=2097152"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
   ac_cv_common_page_size=no
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_common_page_size=yes
-else case e in #(
-  e) ac_cv_common_page_size=no ;;
-esac
+else
+  ac_cv_common_page_size=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LDFLAGS=$save_LDFLAGS
     if test "$ac_cv_common_page_size" = "yes"; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM -Wl,-zcommon-page-size=2097152 -Wl,-zmax-page-size=2097152"
     else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking linker support for -zmax-page-size=2097152" >&5
-printf %s "checking linker support for -zmax-page-size=2097152... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker support for -zmax-page-size=2097152" >&5
+$as_echo_n "checking linker support for -zmax-page-size=2097152... " >&6; }
         save_LDFLAGS=$LDFLAGS
         LDFLAGS="$LDFLAGS -Wl,-zmax-page-size=2097152"
-        if test "$cross_compiling" = yes
-then :
+        if test "$cross_compiling" = yes; then :
   ac_cv_max_page_size=no
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_max_page_size=yes
-else case e in #(
-  e) ac_cv_max_page_size=no ;;
-esac
+else
+  ac_cv_max_page_size=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
         LDFLAGS=$save_LDFLAGS
         if test "$ac_cv_max_page_size" = "yes"; then
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM -Wl,-zmax-page-size=2097152"
         else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         fi
     fi
     ;;
@@ -91180,17 +86148,16 @@
 
 
 # Check whether --enable- was given.
-if test ${enable_+y}
-then :
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring PEAR${T_ME}" >&5
-printf "%s\n" "${T_MD}Configuring PEAR${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring PEAR${T_ME}" >&5
+$as_echo "${T_MD}Configuring PEAR${T_ME}" >&6; }
 
 
 if test -z "$with_pear" && test "$enable_pear" = "no"; then
@@ -91204,19 +86171,17 @@
 
 php_with_pear=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to install PEAR" >&5
-printf %s "checking whether to install PEAR... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install PEAR" >&5
+$as_echo_n "checking whether to install PEAR... " >&6; }
 
 # Check whether --with-pear was given.
-if test ${with_pear+y}
-then :
+if test "${with_pear+set}" = set; then :
   withval=$with_pear; PHP_PEAR=$withval
-else case e in #(
-  e)
+else
+
   PHP_PEAR=no
   test "$PHP_ENABLE_ALL" && PHP_PEAR=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -91242,8 +86207,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -91259,8 +86224,8 @@
     as_fn_error $? "$pear_error_msg" "$LINENO" 5
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The --with-pear option is deprecated" >&5
-printf "%s\n" "$as_me: WARNING: The --with-pear option is deprecated" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The --with-pear option is deprecated" >&5
+$as_echo "$as_me: WARNING: The --with-pear option is deprecated" >&2;}
 
   install_pear="install-pear"
   PEAR_INSTALLDIR=$PHP_PEAR
@@ -91282,28 +86247,25 @@
 
 
 # Check whether --enable-fiber-asm was given.
-if test ${enable_fiber_asm+y}
-then :
+if test "${enable_fiber_asm+set}" = set; then :
   enableval=$enable_fiber_asm; fiber_asm=$enableval
-else case e in #(
-  e) fiber_asm='yes' ;;
-esac
+else
+  fiber_asm='yes'
 fi
 
 
 
 # Check whether --enable- was given.
-if test ${enable_+y}
-then :
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring Zend${T_ME}" >&5
-printf "%s\n" "${T_MD}Configuring Zend${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring Zend${T_ME}" >&5
+$as_echo "${T_MD}Configuring Zend${T_ME}" >&6; }
 
 
 case $host_cpu in #(
@@ -91392,10 +86354,10 @@
 fi
 
 if test "$fiber_asm" = 'yes'; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fiber switching context" >&5
-printf %s "checking for fiber switching context... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fiber switching context" >&5
+$as_echo_n "checking for fiber switching context... " >&6; }
 
-printf "%s\n" "#define ZEND_FIBER_ASM 1" >>confdefs.h
+$as_echo "#define ZEND_FIBER_ASM 1" >>confdefs.h
 
 
 
@@ -91443,74 +86405,71 @@
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fiber_asm_file" >&5
-printf "%s\n" "$fiber_asm_file" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fiber_asm_file" >&5
+$as_echo "$fiber_asm_file" >&6; }
 else
   if test "$fiber_os" = 'mac'; then
 
-printf "%s\n" "#define _XOPEN_SOURCE 1" >>confdefs.h
+$as_echo "#define _XOPEN_SOURCE 1" >>confdefs.h
 
   fi
-  ac_fn_c_check_header_compile "$LINENO" "ucontext.h" "ac_cv_header_ucontext_h" "$ac_includes_default"
-if test "x$ac_cv_header_ucontext_h" = xyes
-then :
+  ac_fn_c_check_header_mongrel "$LINENO" "ucontext.h" "ac_cv_header_ucontext_h" "$ac_includes_default"
+if test "x$ac_cv_header_ucontext_h" = xyes; then :
 
 
-printf "%s\n" "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h
+$as_echo "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h
 
 
-else case e in #(
-  e)
+else
+
        as_fn_error $? "fibers not available on this platform" "$LINENO" 5
-   ;;
-esac
+
 fi
 
+
 fi
 
 
 
 
-ac_fn_c_check_header_compile "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "$ac_includes_default"
-if test "x$ac_cv_header_cpuid_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_CPUID_H 1" >>confdefs.h
+for ac_header in cpuid.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "$ac_includes_default"
+if test "x$ac_cv_header_cpuid_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CPUID_H 1
+_ACEOF
 
 fi
 
+done
 
 
 
-ac_fn_c_check_func "$LINENO" "getpid" "ac_cv_func_getpid"
-if test "x$ac_cv_func_getpid" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETPID 1" >>confdefs.h
 
-fi
-ac_fn_c_check_func "$LINENO" "kill" "ac_cv_func_kill"
-if test "x$ac_cv_func_kill" = xyes
-then :
-  printf "%s\n" "#define HAVE_KILL 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "sigsetjmp" "ac_cv_func_sigsetjmp"
-if test "x$ac_cv_func_sigsetjmp" = xyes
-then :
-  printf "%s\n" "#define HAVE_SIGSETJMP 1" >>confdefs.h
+for ac_func in getpid kill sigsetjmp
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable _FPU_SETCW" >&5
-printf %s "checking for usable _FPU_SETCW... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable _FPU_SETCW" >&5
+$as_echo_n "checking for usable _FPU_SETCW... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     #include <fpu_control.h>
 
 int
-main (void)
+main ()
 {
 
     fpu_control_t fpu_oldcw, fpu_cw;
@@ -91528,35 +86487,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cfp_have__fpu_setcw=yes
-else case e in #(
-  e) ac_cfp_have__fpu_setcw=no ;;
-esac
+else
+  ac_cfp_have__fpu_setcw=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have__fpu_setcw" = "yes" ; then
 
-printf "%s\n" "#define HAVE__FPU_SETCW 1" >>confdefs.h
+$as_echo "#define HAVE__FPU_SETCW 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable fpsetprec" >&5
-printf %s "checking for usable fpsetprec... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable fpsetprec" >&5
+$as_echo_n "checking for usable fpsetprec... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     #include <machine/ieeefp.h>
 
 int
-main (void)
+main ()
 {
 
     fp_prec_t fpu_oldprec;
@@ -91573,35 +86530,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cfp_have_fpsetprec=yes
-else case e in #(
-  e) ac_cfp_have_fpsetprec=no ;;
-esac
+else
+  ac_cfp_have_fpsetprec=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have_fpsetprec" = "yes" ; then
 
-printf "%s\n" "#define HAVE_FPSETPREC 1" >>confdefs.h
+$as_echo "#define HAVE_FPSETPREC 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp" >&5
-printf %s "checking for usable _controlfp... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp" >&5
+$as_echo_n "checking for usable _controlfp... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     #include <float.h>
 
 int
-main (void)
+main ()
 {
 
     unsigned int fpu_oldcw;
@@ -91618,35 +86573,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cfp_have__controlfp=yes
-else case e in #(
-  e) ac_cfp_have__controlfp=no ;;
-esac
+else
+  ac_cfp_have__controlfp=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have__controlfp" = "yes" ; then
 
-printf "%s\n" "#define HAVE__CONTROLFP 1" >>confdefs.h
+$as_echo "#define HAVE__CONTROLFP 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp_s" >&5
-printf %s "checking for usable _controlfp_s... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp_s" >&5
+$as_echo_n "checking for usable _controlfp_s... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
    #include <float.h>
 
 int
-main (void)
+main ()
 {
 
     unsigned int fpu_oldcw, fpu_cw;
@@ -91664,35 +86617,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cfp_have__controlfp_s=yes
-else case e in #(
-  e) ac_cfp_have__controlfp_s=no ;;
-esac
+else
+  ac_cfp_have__controlfp_s=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have__controlfp_s" = "yes" ; then
 
-printf "%s\n" "#define HAVE__CONTROLFP_S 1" >>confdefs.h
+$as_echo "#define HAVE__CONTROLFP_S 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether FPU control word can be manipulated by inline assembler" >&5
-printf %s "checking whether FPU control word can be manipulated by inline assembler... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FPU control word can be manipulated by inline assembler" >&5
+$as_echo_n "checking whether FPU control word can be manipulated by inline assembler... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     /* nothing */
 
 int
-main (void)
+main ()
 {
 
     unsigned int oldcw, cw;
@@ -91712,44 +86663,47 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cfp_have_fpu_inline_asm_x86=yes
-else case e in #(
-  e) ac_cfp_have_fpu_inline_asm_x86=no ;;
-esac
+else
+  ac_cfp_have_fpu_inline_asm_x86=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have_fpu_inline_asm_x86" = "yes" ; then
 
-printf "%s\n" "#define HAVE_FPU_INLINE_ASM_X86 1" >>confdefs.h
+$as_echo "#define HAVE_FPU_INLINE_ASM_X86 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
 
 fi
 
+done
+
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether dlsym() requires a leading underscore in symbol names" >&5
-printf %s "checking whether dlsym() requires a leading underscore in symbol names... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dlsym() requires a leading underscore in symbol names" >&5
+$as_echo_n "checking whether dlsym() requires a leading underscore in symbol names... " >&6; }
 if test "$cross_compiling" = yes; then :
 
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 91752 "configure"
+#line 86706 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -91812,32 +86766,32 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
  ;;
       x$lt_dlneed_uscore)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h
+$as_echo "#define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h
 
  ;;
       x$lt_dlunknown|x*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
  ;;
     esac
   else :
     # compilation failed
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
   fi
 fi
@@ -91846,19 +86800,19 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable thread-safety" >&5
-printf %s "checking whether to enable thread-safety... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_ZTS" >&5
-printf "%s\n" "$ZEND_ZTS" >&6; }
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend debugging" >&5
-printf %s "checking whether to enable Zend debugging... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_DEBUG" >&5
-printf "%s\n" "$ZEND_DEBUG" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable thread-safety" >&5
+$as_echo_n "checking whether to enable thread-safety... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_ZTS" >&5
+$as_echo "$ZEND_ZTS" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend debugging" >&5
+$as_echo_n "checking whether to enable Zend debugging... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_DEBUG" >&5
+$as_echo "$ZEND_DEBUG" >&6; }
 
 if test "$ZEND_DEBUG" = "yes"; then
 
-printf "%s\n" "#define ZEND_DEBUG 1" >>confdefs.h
+$as_echo "#define ZEND_DEBUG 1" >>confdefs.h
 
   echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"
   if test "$CFLAGS" = "-g -O2"; then
@@ -91866,296 +86820,254 @@
   fi
 else
 
-printf "%s\n" "#define ZEND_DEBUG 0" >>confdefs.h
+$as_echo "#define ZEND_DEBUG 0" >>confdefs.h
 
 fi
 
 test -n "$GCC" && CFLAGS="-Wall -Wextra -Wno-strict-aliasing -Wno-unused-parameter -Wno-sign-compare $CFLAGS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-clobbered" >&5
-printf %s "checking whether C compiler accepts -Wno-clobbered... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wno_clobbered+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-clobbered" >&5
+$as_echo_n "checking whether C compiler accepts -Wno-clobbered... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wno_clobbered+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wno-clobbered"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wno_clobbered=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wno_clobbered=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wno_clobbered=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_clobbered" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_clobbered" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wno_clobbered" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_clobbered" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wno_clobbered" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_clobbered" = xyes; then :
   CFLAGS="-Wno-clobbered $CFLAGS"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wimplicit-fallthrough=1" >&5
-printf %s "checking whether C compiler accepts -Wimplicit-fallthrough=1... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wimplicit-fallthrough=1" >&5
+$as_echo_n "checking whether C compiler accepts -Wimplicit-fallthrough=1... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wimplicit-fallthrough=1"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" = xyes; then :
   CFLAGS="$CFLAGS -Wimplicit-fallthrough=1"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wduplicated-cond" >&5
-printf %s "checking whether C compiler accepts -Wduplicated-cond... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wduplicated_cond+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wduplicated-cond" >&5
+$as_echo_n "checking whether C compiler accepts -Wduplicated-cond... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wduplicated_cond+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wduplicated-cond"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wduplicated_cond=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wduplicated_cond=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wduplicated_cond=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wduplicated_cond" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wduplicated_cond" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wduplicated_cond" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wduplicated_cond" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wduplicated_cond" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wduplicated_cond" = xyes; then :
   CFLAGS="-Wduplicated-cond $CFLAGS"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wlogical-op" >&5
-printf %s "checking whether C compiler accepts -Wlogical-op... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wlogical_op+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wlogical-op" >&5
+$as_echo_n "checking whether C compiler accepts -Wlogical-op... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wlogical_op+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wlogical-op"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wlogical_op=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wlogical_op=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wlogical_op=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wlogical_op" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wlogical_op" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wlogical_op" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wlogical_op" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wlogical_op" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wlogical_op" = xyes; then :
   CFLAGS="-Wlogical-op $CFLAGS"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wformat-truncation" >&5
-printf %s "checking whether C compiler accepts -Wformat-truncation... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wformat_truncation+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wformat-truncation" >&5
+$as_echo_n "checking whether C compiler accepts -Wformat-truncation... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wformat_truncation+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wformat-truncation"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wformat_truncation=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wformat_truncation=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wformat_truncation=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wformat_truncation" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wformat_truncation" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wformat_truncation" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wformat_truncation" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wformat_truncation" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wformat_truncation" = xyes; then :
   CFLAGS="-Wformat-truncation $CFLAGS"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wstrict-prototypes" >&5
-printf %s "checking whether C compiler accepts -Wstrict-prototypes... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wstrict_prototypes+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wstrict-prototypes" >&5
+$as_echo_n "checking whether C compiler accepts -Wstrict-prototypes... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wstrict_prototypes+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wstrict-prototypes"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wstrict_prototypes=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wstrict_prototypes=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wstrict_prototypes=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wstrict_prototypes" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wstrict_prototypes" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wstrict_prototypes" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wstrict_prototypes" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wstrict_prototypes" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wstrict_prototypes" = xyes; then :
   CFLAGS="-Wstrict-prototypes $CFLAGS"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-common" >&5
-printf %s "checking whether C compiler accepts -fno-common... " >&6; }
-if test ${ax_cv_check_cflags__Werror__fno_common+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-common" >&5
+$as_echo_n "checking whether C compiler accepts -fno-common... " >&6; }
+if ${ax_cv_check_cflags__Werror__fno_common+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -fno-common"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__fno_common=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__fno_common=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__fno_common=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fno_common" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__fno_common" >&6; }
-if test "x$ax_cv_check_cflags__Werror__fno_common" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fno_common" >&5
+$as_echo "$ax_cv_check_cflags__Werror__fno_common" >&6; }
+if test "x$ax_cv_check_cflags__Werror__fno_common" = xyes; then :
   CFLAGS="-fno-common $CFLAGS"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
@@ -92163,40 +87075,37 @@
 
 if test "$ZEND_ZTS" = "yes"; then
 
-printf "%s\n" "#define ZTS 1" >>confdefs.h
+$as_echo "#define ZTS 1" >>confdefs.h
 
   CFLAGS="$CFLAGS -DZTS"
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-printf %s "checking for inline... " >&6; }
-if test ${ac_cv_c_inline+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_c_inline=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
-static $ac_kw foo_t static_foo (void) {return 0; }
-$ac_kw foo_t foo (void) {return 0; }
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
 #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_inline=$ac_kw
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-printf "%s\n" "$ac_cv_c_inline" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -92214,37 +87123,36 @@
 esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system is Darwin" >&5
-printf %s "checking target system is Darwin... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system is Darwin" >&5
+$as_echo_n "checking target system is Darwin... " >&6; }
 if echo "$target" | grep "darwin" > /dev/null; then
 
-printf "%s\n" "#define DARWIN 1" >>confdefs.h
+$as_echo "#define DARWIN 1" >>confdefs.h
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MM alignment and log values" >&5
-printf %s "checking for MM alignment and log values... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MM alignment and log values" >&5
+$as_echo_n "checking for MM alignment and log values... " >&6; }
 
-if test "$cross_compiling" = yes
-then :
+if test "$cross_compiling" = yes; then :
 
 
-printf "%s\n" "#define ZEND_MM_ALIGNMENT 8" >>confdefs.h
+$as_echo "#define ZEND_MM_ALIGNMENT 8" >>confdefs.h
 
 
-printf "%s\n" "#define ZEND_MM_ALIGNMENT_LOG2 3" >>confdefs.h
+$as_echo "#define ZEND_MM_ALIGNMENT_LOG2 3" >>confdefs.h
 
 
-printf "%s\n" "#define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT 0" >>confdefs.h
+$as_echo "#define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT 0" >>confdefs.h
 
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -92281,85 +87189,88 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
   LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
   LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2`
   LIBZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT=`cat conftest.zend | cut -d ' ' -f 3`
 
-printf "%s\n" "#define ZEND_MM_ALIGNMENT $LIBZEND_MM_ALIGN" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define ZEND_MM_ALIGNMENT $LIBZEND_MM_ALIGN
+_ACEOF
 
 
-printf "%s\n" "#define ZEND_MM_ALIGNMENT_LOG2 $LIBZEND_MM_ALIGN_LOG2" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define ZEND_MM_ALIGNMENT_LOG2 $LIBZEND_MM_ALIGN_LOG2
+_ACEOF
 
 
-printf "%s\n" "#define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT $LIBZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT $LIBZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT
+_ACEOF
 
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
-printf "%s\n" "done" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
 
-ac_fn_c_check_func "$LINENO" "mremap" "ac_cv_func_mremap"
-if test "x$ac_cv_func_mremap" = xyes
-then :
-  printf "%s\n" "#define HAVE_MREMAP 1" >>confdefs.h
+for ac_func in mremap
+do :
+  ac_fn_c_check_func "$LINENO" "mremap" "ac_cv_func_mremap"
+if test "x$ac_cv_func_mremap" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MREMAP 1
+_ACEOF
 
 fi
+done
 
 
 # Check whether --enable-zend-signals was given.
-if test ${enable_zend_signals+y}
-then :
+if test "${enable_zend_signals+set}" = set; then :
   enableval=$enable_zend_signals; ZEND_SIGNALS=$enableval
-else case e in #(
-  e) ZEND_SIGNALS=yes ;;
-esac
+else
+  ZEND_SIGNALS=yes
 fi
 
 
-
-  for ac_func in sigaction
+for ac_func in sigaction
 do :
   ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
-if test "x$ac_cv_func_sigaction" = xyes
-then :
-  printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
+if test "x$ac_cv_func_sigaction" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGACTION 1
+_ACEOF
+
+else
 
-else case e in #(
-  e)
   ZEND_SIGNALS=no
- ;;
-esac
-fi
 
+fi
 done
+
 if test "$ZEND_SIGNALS" = "yes"; then
 
-printf "%s\n" "#define ZEND_SIGNALS 1" >>confdefs.h
+$as_echo "#define ZEND_SIGNALS 1" >>confdefs.h
 
 	CFLAGS="$CFLAGS -DZEND_SIGNALS"
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable zend signal handling" >&5
-printf %s "checking whether to enable zend signal handling... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_SIGNALS" >&5
-printf "%s\n" "$ZEND_SIGNALS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable zend signal handling" >&5
+$as_echo_n "checking whether to enable zend signal handling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_SIGNALS" >&5
+$as_echo "$ZEND_SIGNALS" >&6; }
 
 # Check whether --enable-zend-max-execution-timers was given.
-if test ${enable_zend_max_execution_timers+y}
-then :
+if test "${enable_zend_max_execution_timers+set}" = set; then :
   enableval=$enable_zend_max_execution_timers; ZEND_MAX_EXECUTION_TIMERS=$enableval
-else case e in #(
-  e) ZEND_MAX_EXECUTION_TIMERS='no' ;;
-esac
+else
+  ZEND_MAX_EXECUTION_TIMERS='no'
 fi
 
 
@@ -92376,27 +87287,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "timer_create" "ac_cv_func_timer_create"
-if test "x$ac_cv_func_timer_create" = xyes
-then :
+if test "x$ac_cv_func_timer_create" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__timer_create" "ac_cv_func___timer_create"
-if test "x$ac_cv_func___timer_create" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__timer_create" "ac_cv_func___timer_create"
+if test "x$ac_cv_func___timer_create" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_TIMER_CREATE 1" >>confdefs.h
+$as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h
 
     ac_cv_func_timer_create=yes
   ;;
@@ -92406,140 +87313,118 @@
   unset ac_cv_lib_rt_timer_create
   unset ac_cv_lib_rt___timer_create
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for timer_create in -lrt" >&5
-printf %s "checking for timer_create in -lrt... " >&6; }
-if test ${ac_cv_lib_rt_timer_create+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timer_create in -lrt" >&5
+$as_echo_n "checking for timer_create in -lrt... " >&6; }
+if ${ac_cv_lib_rt_timer_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char timer_create (void);
+char timer_create ();
 int
-main (void)
+main ()
 {
 return timer_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt_timer_create=yes
-else case e in #(
-  e) ac_cv_lib_rt_timer_create=no ;;
-esac
+else
+  ac_cv_lib_rt_timer_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_timer_create" >&5
-printf "%s\n" "$ac_cv_lib_rt_timer_create" >&6; }
-if test "x$ac_cv_lib_rt_timer_create" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_timer_create" >&5
+$as_echo "$ac_cv_lib_rt_timer_create" >&6; }
+if test "x$ac_cv_lib_rt_timer_create" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __timer_create in -lrt" >&5
-printf %s "checking for __timer_create in -lrt... " >&6; }
-if test ${ac_cv_lib_rt___timer_create+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __timer_create in -lrt" >&5
+$as_echo_n "checking for __timer_create in -lrt... " >&6; }
+if ${ac_cv_lib_rt___timer_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __timer_create (void);
+char __timer_create ();
 int
-main (void)
+main ()
 {
 return __timer_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt___timer_create=yes
-else case e in #(
-  e) ac_cv_lib_rt___timer_create=no ;;
-esac
+else
+  ac_cv_lib_rt___timer_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___timer_create" >&5
-printf "%s\n" "$ac_cv_lib_rt___timer_create" >&6; }
-if test "x$ac_cv_lib_rt___timer_create" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___timer_create" >&5
+$as_echo "$ac_cv_lib_rt___timer_create" >&6; }
+if test "x$ac_cv_lib_rt___timer_create" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lrt"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -92557,10 +87442,10 @@
 
 
 
-printf "%s\n" "#define HAVE_TIMER_CREATE 1" >>confdefs.h
+$as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRT 1" >>confdefs.h
 
     ac_cv_func_timer_create=yes
   else
@@ -92579,15 +87464,15 @@
 
 if test "$ZEND_MAX_EXECUTION_TIMERS" = "yes"; then
 
-printf "%s\n" "#define ZEND_MAX_EXECUTION_TIMERS 1" >>confdefs.h
+$as_echo "#define ZEND_MAX_EXECUTION_TIMERS 1" >>confdefs.h
 
   CFLAGS="$CFLAGS -DZEND_MAX_EXECUTION_TIMERS"
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable zend max execution timers" >&5
-printf %s "checking whether to enable zend max execution timers... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_MAX_EXECUTION_TIMERS" >&5
-printf "%s\n" "$ZEND_MAX_EXECUTION_TIMERS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable zend max execution timers" >&5
+$as_echo_n "checking whether to enable zend max execution timers... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_MAX_EXECUTION_TIMERS" >&5
+$as_echo "$ZEND_MAX_EXECUTION_TIMERS" >&6; }
 
 
 
@@ -92604,28 +87489,26 @@
 
 
 # Check whether --enable- was given.
-if test ${enable_+y}
-then :
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring TSRM${T_ME}" >&5
-printf "%s\n" "${T_MD}Configuring TSRM${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring TSRM${T_ME}" >&5
+$as_echo "${T_MD}Configuring TSRM${T_ME}" >&6; }
 
 if test "$PHP_THREAD_SAFETY" = "yes"; then
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
-printf %s "checking for pthreads_cflags... " >&6; }
-if test ${ac_cv_pthreads_cflags+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
+$as_echo_n "checking for pthreads_cflags... " >&6; }
+if ${ac_cv_pthreads_cflags+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
 ac_cv_pthreads_cflags=
 if test "$pthreads_working" != "yes"; then
   for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do
@@ -92650,19 +87533,17 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
   pthreads_checked=yes
 
-else case e in #(
-  e)
+else
+
   pthreads_checked=no
 
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -92671,19 +87552,17 @@
     fi
   done
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
-printf "%s\n" "$ac_cv_pthreads_cflags" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
+$as_echo "$ac_cv_pthreads_cflags" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
+$as_echo_n "checking for pthreads_lib... " >&6; }
+if ${ac_cv_pthreads_lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
-printf %s "checking for pthreads_lib... " >&6; }
-if test ${ac_cv_pthreads_lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
 ac_cv_pthreads_lib=
 if test "$pthreads_working" != "yes"; then
  for lib in pthread pthreads c_r; do
@@ -92708,19 +87587,17 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
   pthreads_checked=yes
 
-else case e in #(
-  e)
+else
+
   pthreads_checked=no
 
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -92729,11 +87606,10 @@
     fi
   done
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
-printf "%s\n" "$ac_cv_pthreads_lib" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
+$as_echo "$ac_cv_pthreads_lib" >&6; }
 
 if test "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then
   pthreads_working="yes"
@@ -92745,13 +87621,13 @@
 fi
 
 
-printf "%s\n" "#define PTHREADS 1" >>confdefs.h
+$as_echo "#define PTHREADS 1" >>confdefs.h
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for POSIX threads" >&5
-printf %s "checking for POSIX threads... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX threads" >&5
+$as_echo_n "checking for POSIX threads... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -92766,9 +87642,9 @@
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
 # Double any \ or $.
-# By default was 's,x,x', remove it if useless.
+# By default was `s,x,x', remove it if useless.
 ac_script='s/\\$/&&/g;s/;s,x,x,$//'
-program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 
 test "$prefix" = "NONE" && prefix=/usr/local
@@ -92909,29 +87785,41 @@
 UNAME=`uname -a | xargs`
 PHP_UNAME=${PHP_UNAME:-$UNAME}
 
-printf "%s\n" "#define PHP_UNAME \"$PHP_UNAME\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_UNAME "$PHP_UNAME"
+_ACEOF
 
 PHP_OS=`uname | xargs`
 
-printf "%s\n" "#define PHP_OS \"$PHP_OS\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_OS "$PHP_OS"
+_ACEOF
 
 PHP_BUILD_SYSTEM=${PHP_BUILD_SYSTEM:-$PHP_UNAME}
 
-printf "%s\n" "#define PHP_BUILD_SYSTEM \"$PHP_BUILD_SYSTEM\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_BUILD_SYSTEM "$PHP_BUILD_SYSTEM"
+_ACEOF
 
 if test -n "${PHP_BUILD_PROVIDER}"; then
 
-printf "%s\n" "#define PHP_BUILD_PROVIDER \"$PHP_BUILD_PROVIDER\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_BUILD_PROVIDER "$PHP_BUILD_PROVIDER"
+_ACEOF
 
 fi
 if test -n "${PHP_BUILD_COMPILER}"; then
 
-printf "%s\n" "#define PHP_BUILD_COMPILER \"$PHP_BUILD_COMPILER\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_BUILD_COMPILER "$PHP_BUILD_COMPILER"
+_ACEOF
 
 fi
 if test -n "${PHP_BUILD_ARCH}"; then
 
-printf "%s\n" "#define PHP_BUILD_ARCH \"$PHP_BUILD_ARCH\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_BUILD_ARCH "$PHP_BUILD_ARCH"
+_ACEOF
 
 fi
 
@@ -93212,197 +88100,172 @@
 fi
 
 if test "$PHP_MEMORY_SANITIZER" = "yes"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=memory -fsanitize-memory-track-origins" >&5
-printf %s "checking whether C compiler accepts -fsanitize=memory -fsanitize-memory-track-origins... " >&6; }
-if test ${ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=memory -fsanitize-memory-track-origins" >&5
+$as_echo_n "checking whether C compiler accepts -fsanitize=memory -fsanitize-memory-track-origins... " >&6; }
+if ${ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fsanitize=memory -fsanitize-memory-track-origins"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins=yes
-else case e in #(
-  e) ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins=no ;;
-esac
+else
+  ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&5
-printf "%s\n" "$ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&6; }
-if test "x$ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&5
+$as_echo "$ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&6; }
+if test "x$ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" = xyes; then :
 
     CFLAGS="$CFLAGS -fsanitize=memory -fsanitize-memory-track-origins"
     CXXFLAGS="$CXXFLAGS -fsanitize=memory -fsanitize-memory-track-origins"
 
-else case e in #(
-  e) as_fn_error $? "MemorySanitizer is not available" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "MemorySanitizer is not available" "$LINENO" 5
 fi
 
 fi
 
 if test "$PHP_ADDRESS_SANITIZER" = "yes"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=address" >&5
-printf %s "checking whether C compiler accepts -fsanitize=address... " >&6; }
-if test ${ax_cv_check_cflags___fsanitize_address+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=address" >&5
+$as_echo_n "checking whether C compiler accepts -fsanitize=address... " >&6; }
+if ${ax_cv_check_cflags___fsanitize_address+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fsanitize=address"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags___fsanitize_address=yes
-else case e in #(
-  e) ax_cv_check_cflags___fsanitize_address=no ;;
-esac
+else
+  ax_cv_check_cflags___fsanitize_address=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_address" >&5
-printf "%s\n" "$ax_cv_check_cflags___fsanitize_address" >&6; }
-if test "x$ax_cv_check_cflags___fsanitize_address" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_address" >&5
+$as_echo "$ax_cv_check_cflags___fsanitize_address" >&6; }
+if test "x$ax_cv_check_cflags___fsanitize_address" = xyes; then :
 
     CFLAGS="$CFLAGS -fsanitize=address -DZEND_TRACK_ARENA_ALLOC"
     CXXFLAGS="$CXXFLAGS -fsanitize=address -DZEND_TRACK_ARENA_ALLOC"
 
-else case e in #(
-  e) as_fn_error $? "AddressSanitizer is not available" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "AddressSanitizer is not available" "$LINENO" 5
 fi
 
 fi
 
 if test "$PHP_UNDEFINED_SANITIZER" = "yes"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=undefined" >&5
-printf %s "checking whether C compiler accepts -fsanitize=undefined... " >&6; }
-if test ${ax_cv_check_cflags___fsanitize_undefined+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=undefined" >&5
+$as_echo_n "checking whether C compiler accepts -fsanitize=undefined... " >&6; }
+if ${ax_cv_check_cflags___fsanitize_undefined+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fsanitize=undefined"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags___fsanitize_undefined=yes
-else case e in #(
-  e) ax_cv_check_cflags___fsanitize_undefined=no ;;
-esac
+else
+  ax_cv_check_cflags___fsanitize_undefined=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_undefined" >&5
-printf "%s\n" "$ax_cv_check_cflags___fsanitize_undefined" >&6; }
-if test "x$ax_cv_check_cflags___fsanitize_undefined" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_undefined" >&5
+$as_echo "$ax_cv_check_cflags___fsanitize_undefined" >&6; }
+if test "x$ax_cv_check_cflags___fsanitize_undefined" = xyes; then :
 
     CFLAGS="$CFLAGS -fsanitize=undefined -fno-sanitize-recover=undefined"
     CXXFLAGS="$CXXFLAGS -fsanitize=undefined -fno-sanitize-recover=undefined"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-sanitize=object-size" >&5
-printf %s "checking whether C compiler accepts -fno-sanitize=object-size... " >&6; }
-if test ${ax_cv_check_cflags___fno_sanitize_object_size+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-sanitize=object-size" >&5
+$as_echo_n "checking whether C compiler accepts -fno-sanitize=object-size... " >&6; }
+if ${ax_cv_check_cflags___fno_sanitize_object_size+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fno-sanitize=object-size"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags___fno_sanitize_object_size=yes
-else case e in #(
-  e) ax_cv_check_cflags___fno_sanitize_object_size=no ;;
-esac
+else
+  ax_cv_check_cflags___fno_sanitize_object_size=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_sanitize_object_size" >&5
-printf "%s\n" "$ax_cv_check_cflags___fno_sanitize_object_size" >&6; }
-if test "x$ax_cv_check_cflags___fno_sanitize_object_size" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_sanitize_object_size" >&5
+$as_echo "$ax_cv_check_cflags___fno_sanitize_object_size" >&6; }
+if test "x$ax_cv_check_cflags___fno_sanitize_object_size" = xyes; then :
 
                   CFLAGS="$CFLAGS -fno-sanitize=object-size"
       CXXFLAGS="$CFLAGS -fno-sanitize=object-size"
 
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
             OLD_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -fno-sanitize-recover=undefined"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to add -fno-sanitize=function" >&5
-printf %s "checking whether to add -fno-sanitize=function... " >&6; }
-if test ${php_cv_ubsan_no_function+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-    if test "$cross_compiling" = yes
-then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to add -fno-sanitize=function" >&5
+$as_echo_n "checking whether to add -fno-sanitize=function... " >&6; }
+if ${php_cv_ubsan_no_function+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    if test "$cross_compiling" = yes; then :
   php_cv_ubsan_no_function=no
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 void foo(char *string) {}
@@ -93412,31 +88275,26 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   php_cv_ubsan_no_function=no
-else case e in #(
-  e) php_cv_ubsan_no_function=yes ;;
-esac
+else
+  php_cv_ubsan_no_function=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_ubsan_no_function" >&5
-printf "%s\n" "$php_cv_ubsan_no_function" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_ubsan_no_function" >&5
+$as_echo "$php_cv_ubsan_no_function" >&6; }
     CFLAGS="$OLD_CFLAGS"
     if test "$php_cv_ubsan_no_function" = yes; then
       CFLAGS="$CFLAGS -fno-sanitize=function"
       CXXFLAGS="$CFLAGS -fno-sanitize=function"
     fi
 
-else case e in #(
-  e) as_fn_error $? "UndefinedBehaviorSanitizer is not available" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "UndefinedBehaviorSanitizer is not available" "$LINENO" 5
 fi
 
 fi
@@ -93451,17 +88309,16 @@
 
 
 # Check whether --enable- was given.
-if test ${enable_+y}
-then :
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring libtool${T_ME}" >&5
-printf "%s\n" "${T_MD}Configuring libtool${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring libtool${T_ME}" >&5
+$as_echo "${T_MD}Configuring libtool${T_ME}" >&6; }
 
 
 AR_FLAGS=cr
@@ -93469,8 +88326,7 @@
 
 
 # Check whether --enable-shared was given.
-if test ${enable_shared+y}
-then :
+if test "${enable_shared+set}" = set; then :
   enableval=$enable_shared;     p=${PACKAGE-default}
     case $enableval in
     yes) enable_shared=yes ;;
@@ -93488,15 +88344,13 @@
       IFS="$lt_save_ifs"
       ;;
     esac
-else case e in #(
-  e) enable_shared=yes ;;
-esac
+else
+  enable_shared=yes
 fi
 
 
 # Check whether --enable-static was given.
-if test ${enable_static+y}
-then :
+if test "${enable_static+set}" = set; then :
   enableval=$enable_static;     p=${PACKAGE-default}
     case $enableval in
     yes) enable_static=yes ;;
@@ -93514,15 +88368,13 @@
       IFS="$lt_save_ifs"
       ;;
     esac
-else case e in #(
-  e) enable_static=yes ;;
-esac
+else
+  enable_static=yes
 fi
 
 
 # Check whether --enable-fast-install was given.
-if test ${enable_fast_install+y}
-then :
+if test "${enable_fast_install+set}" = set; then :
   enableval=$enable_fast_install;     p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;
@@ -93540,19 +88392,17 @@
       IFS="$lt_save_ifs"
       ;;
     esac
-else case e in #(
-  e) enable_fast_install=yes ;;
-esac
+else
+  enable_fast_install=yes
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-printf %s "checking for a sed that does not truncate output... " >&6; }
-if test ${lt_cv_path_SED+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) # Loop through the user's path and test for sed and gsed.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${lt_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # Loop through the user's path and test for sed and gsed.
 # Then use that list of sed's as ones to test for truncation.
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -93597,29 +88447,26 @@
     fi
   done
 done
- ;;
-esac
+
 fi
 
 SED=$lt_cv_path_SED
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
-printf "%s\n" "$SED" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+$as_echo "$SED" >&6; }
 
 
 # Check whether --with-gnu-ld was given.
-if test ${with_gnu_ld+y}
-then :
+if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else case e in #(
-  e) with_gnu_ld=no ;;
-esac
+else
+  with_gnu_ld=no
 fi
 
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-printf %s "checking for ld used by $CC... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -93648,17 +88495,16 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-printf %s "checking for GNU ld... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-printf %s "checking for non-GNU ld... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test ${lt_cv_path_LD+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -z "$LD"; then
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
     IFS="$lt_save_ifs"
@@ -93681,26 +88527,24 @@
   IFS="$lt_save_ifs"
 else
   lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi ;;
-esac
+fi
 fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
-if test ${lt_cv_prog_gnu_ld+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) # I'd rather use --version here, but apparently some GNU lds only accept -v.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -93708,25 +88552,22 @@
 *)
   lt_cv_prog_gnu_ld=no
   ;;
-esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-printf %s "checking for $LD option to reload object files... " >&6; }
-if test ${lt_cv_ld_reload_flag+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_ld_reload_flag='-r' ;;
-esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -93743,13 +88584,12 @@
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5
-printf %s "checking for BSD-compatible nm... " >&6; }
-if test ${lt_cv_path_NM+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$NM"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5
+$as_echo_n "checking for BSD-compatible nm... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
@@ -93791,20 +88631,18 @@
     IFS="$lt_save_ifs"
   done
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi ;;
-esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-printf "%s\n" "$lt_cv_path_NM" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
 NM="$lt_cv_path_NM"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-printf %s "checking how to recognize dependent libraries... " >&6; }
-if test ${lt_cv_deplibs_check_method+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_file_magic_cmd='$MAGIC_CMD'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
 lt_cv_deplibs_check_method='unknown'
 # Need to set the preceding variable on all platforms that support
@@ -93983,11 +88821,10 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -94017,7 +88854,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *ELF-32*)
@@ -94032,11 +88869,11 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 94035 "configure"' > conftest.$ac_ext
+  echo '#line 88872 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
    if test "$lt_cv_prog_gnu_ld" = yes; then
     case `/usr/bin/file conftest.$ac_objext` in
@@ -94074,7 +88911,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
@@ -94130,13 +88967,12 @@
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-printf %s "checking whether the C compiler needs -belf... " >&6; }
-if test ${lt_cv_cc_needs_belf+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_ext=c
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -94146,32 +88982,29 @@
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_cc_needs_belf=yes
-else case e in #(
-  e) lt_cv_cc_needs_belf=no ;;
-esac
+else
+  lt_cv_cc_needs_belf=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -94183,7 +89016,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
@@ -94217,35 +89050,38 @@
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-printf %s "checking how to run the C++ preprocessor... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if test ${ac_cv_prog_CXXCPP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)     # Double quotes because $CXX needs to be expanded
-    for CXXCPP in "$CXX -E" cpp /lib/cpp
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
     do
       ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -94255,56 +89091,56 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
   break
 fi
 
     done
     ac_cv_prog_CXXCPP=$CXXCPP
-   ;;
-esac
+
 fi
   CXXCPP=$ac_cv_prog_CXXCPP
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-printf "%s\n" "$CXXCPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -94314,30 +89150,26 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
 
-else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=cpp
@@ -94351,13 +89183,12 @@
 
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 # find the maximum length of command line arguments
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-printf %s "checking the maximum length of command line arguments... " >&6; }
-if test ${lt_cv_sys_max_cmd_len+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)   i=0
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
   teststring="ABCD"
 
   case $build_os in
@@ -94460,16 +89291,15 @@
     fi
     ;;
   esac
- ;;
-esac
+
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
 fi
 
 
@@ -94477,13 +89307,12 @@
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-printf %s "checking command to parse $NM output from $compiler object... " >&6; }
-if test ${lt_cv_sys_global_symbol_pipe+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
 # These are sane defaults that work on at least a few old systems.
 # They come from Ultrix.  What could be older than Ultrix?!! ;)
 
@@ -94586,14 +89415,14 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -94648,7 +89477,7 @@
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
@@ -94676,28 +89505,26 @@
     lt_cv_sys_global_symbol_pipe=
   fi
 done
- ;;
-esac
+
 fi
 
 if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-printf %s "checking for objdir... " >&6; }
-if test ${lt_cv_objdir+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) rm -f .libs 2>/dev/null
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
 if test -d .libs; then
   lt_cv_objdir=.libs
@@ -94705,11 +89532,10 @@
   # MS-DOS does not allow filenames that begin with a dot.
   lt_cv_objdir=_libs
 fi
-rmdir .libs 2>/dev/null ;;
-esac
+rmdir .libs 2>/dev/null
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-printf "%s\n" "$lt_cv_objdir" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
@@ -94760,44 +89586,38 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_AR+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$AR"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -94806,44 +89626,38 @@
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_AR+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_AR"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -94851,8 +89665,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -94864,44 +89678,38 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_RANLIB+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$RANLIB"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -94910,44 +89718,38 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_RANLIB+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_RANLIB"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -94955,8 +89757,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -94968,44 +89770,38 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_STRIP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$STRIP"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -95014,44 +89810,38 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_STRIP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_STRIP"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -95059,8 +89849,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -95123,13 +89913,12 @@
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-printf %s "checking for ${ac_tool_prefix}file... " >&6; }
-if test ${lt_cv_path_MAGIC_CMD+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $MAGIC_CMD in
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
 \\/* |  ?:\\/*)
   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
   ;;
@@ -95172,28 +89961,26 @@
   IFS="$lt_save_ifs"
   MAGIC_CMD="$lt_save_MAGIC_CMD"
   ;;
-esac ;;
 esac
 fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-printf %s "checking for file... " >&6; }
-if test ${lt_cv_path_MAGIC_CMD+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $MAGIC_CMD in
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
 \\/* |  ?:\\/*)
   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
   ;;
@@ -95236,17 +90023,16 @@
   IFS="$lt_save_ifs"
   MAGIC_CMD="$lt_save_MAGIC_CMD"
   ;;
-esac ;;
 esac
 fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   else
@@ -95264,44 +90050,38 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_DSYMUTIL+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$DSYMUTIL"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-printf "%s\n" "$DSYMUTIL" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -95310,44 +90090,38 @@
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_DSYMUTIL"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
   ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -95355,8 +90129,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -95368,44 +90142,38 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_NMEDIT+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$NMEDIT"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-printf "%s\n" "$NMEDIT" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -95414,44 +90182,38 @@
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_NMEDIT+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_NMEDIT"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
   ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-printf "%s\n" "$ac_ct_NMEDIT" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -95459,8 +90221,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -95470,13 +90232,12 @@
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-printf %s "checking for -single_module linker flag... " >&6; }
-if test ${lt_cv_apple_cc_single_mod+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_apple_cc_single_mod=no
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
       if test -z "${LT_MULTI_MODULE}"; then
    # By default we will add the -single_module flag. You can override
    # by either setting the environment variable LT_MULTI_MODULE
@@ -95490,24 +90251,22 @@
      rm -rf libconftest.dylib*
    fi
    rm conftest.c
-      fi ;;
-esac
+      fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-printf %s "checking for -exported_symbols_list linker flag... " >&6; }
-if test ${lt_cv_ld_exported_symbols_list+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_ld_exported_symbols_list=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
       echo "_main" > conftest.sym
       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
 
 cat > conftest.$ac_ext <<EOF
-#line 95510 "configure"
+#line 90269 "configure"
 #include "confdefs.h"
 int main(void) {
 ; return 0; }
@@ -95515,7 +90274,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  lt_cv_ld_exported_symbols_list=yes
   rm -rf conftest*
@@ -95527,11 +90286,10 @@
 fi
 rm -f conftest*
    LDFLAGS="$save_LDFLAGS"
-     ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     case $host_os in
     rhapsody* | darwin1.0123)
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -95572,8 +90330,7 @@
 enable_win32_dll=no
 
 # Check whether --enable-libtool-lock was given.
-if test ${enable_libtool_lock+y}
-then :
+if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
 fi
 
@@ -95581,12 +90338,10 @@
 
 
 # Check whether --with-pic was given.
-if test ${with_pic+y}
-then :
+if test "${with_pic+set}" = set; then :
   withval=$with_pic; pic_mode="$withval"
-else case e in #(
-  e) pic_mode=default ;;
-esac
+else
+  pic_mode=default
 fi
 
 test -z "$pic_mode" && pic_mode=default
@@ -95650,13 +90405,12 @@
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test ${lt_cv_prog_compiler_rtti_exceptions+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_prog_compiler_rtti_exceptions=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
@@ -95669,11 +90423,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:95672: $lt_compile\"" >&5)
+   (eval echo "\"configure:90426: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:95676: \$? = $ac_status" >&5
+   echo "configure:90430: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -95684,11 +90438,10 @@
      fi
    fi
    $rm conftest*
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -95702,8 +90455,8 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-printf %s "checking for $compiler option to produce PIC... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -95942,21 +90695,20 @@
     esac
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-printf "%s\n" "$lt_prog_compiler_pic" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test ${lt_cv_prog_compiler_pic_works+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_prog_compiler_pic_works=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
@@ -95969,11 +90721,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:95972: $lt_compile\"" >&5)
+   (eval echo "\"configure:90724: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:95976: \$? = $ac_status" >&5
+   echo "configure:90728: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -95984,11 +90736,10 @@
      fi
    fi
    $rm conftest*
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
@@ -96015,13 +90766,12 @@
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test ${lt_cv_prog_compiler_static_works+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_prog_compiler_static_works=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -96042,11 +90792,10 @@
    fi
    $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
@@ -96055,13 +90804,12 @@
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test ${lt_cv_prog_compiler_c_o+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_prog_compiler_c_o=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
@@ -96077,11 +90825,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:96080: $lt_compile\"" >&5)
+   (eval echo "\"configure:90828: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "configure:96084: \$? = $ac_status" >&5
+   echo "configure:90832: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -96101,37 +90849,36 @@
    cd ..
    rmdir conftest
    $rm conftest*
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-printf %s "checking if we can lock with hard links... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag=
@@ -96542,7 +91289,7 @@
        # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 96545 "configure"
+#line 91292 "configure"
 #include "confdefs.h"
 int main(void) {
 ; return 0; }
@@ -96550,7 +91297,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
@@ -96584,7 +91331,7 @@
 	 # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 96587 "configure"
+#line 91334 "configure"
 #include "confdefs.h"
 int main(void) {
 ; return 0; }
@@ -96592,7 +91339,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
@@ -97058,8 +91805,8 @@
     esac
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-printf "%s\n" "$ld_shlibs" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
 #
@@ -97079,15 +91826,15 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-printf %s "checking whether -lc should be explicitly linked in... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -97105,7 +91852,7 @@
         if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
         then
 	  archive_cmds_need_lc=no
@@ -97117,16 +91864,16 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-printf "%s\n" "$archive_cmds_need_lc" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-printf %s "checking dynamic linker characteristics... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -97734,25 +92481,21 @@
   dynamic_linker=no
   ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-if test ${lt_cv_sys_lib_search_path_spec+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ;;
-esac
+if ${lt_cv_sys_lib_search_path_spec+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test ${lt_cv_sys_lib_dlsearch_path_spec+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ;;
-esac
+if ${lt_cv_sys_lib_dlsearch_path_spec+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
 
 sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
@@ -97762,8 +92505,8 @@
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-printf %s "checking how to hardcode library paths into programs... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var" || \
@@ -97787,8 +92530,8 @@
   # directories.
   hardcode_action=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-printf "%s\n" "$hardcode_action" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -97801,13 +92544,13 @@
 
 striplib=
 old_striplib=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-printf %s "checking whether stripping libraries is possible... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
@@ -97815,16 +92558,16 @@
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
          old_striplib="$STRIP -S"
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
        else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
        ;;
    *)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     ;;
   esac
 fi
@@ -97856,281 +92599,233 @@
 
   darwin*)
   # if libdl is installed we need to link against it
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-printf %s "checking for dlopen in -ldl... " >&6; }
-if test ${ac_cv_lib_dl_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dlopen (void);
+char dlopen ();
 int
-main (void)
+main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
-else case e in #(
-  e) ac_cv_lib_dl_dlopen=no ;;
-esac
+else
+  ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else case e in #(
-  e)
+else
+
     lt_cv_dlopen="dyld"
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
-     ;;
-esac
+
 fi
 
    ;;
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes
-then :
+if test "x$ac_cv_func_shl_load" = xyes; then :
   lt_cv_dlopen="shl_load"
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-printf %s "checking for shl_load in -ldld... " >&6; }
-if test ${ac_cv_lib_dld_shl_load+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char shl_load (void);
+char shl_load ();
 int
-main (void)
+main ()
 {
 return shl_load ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_shl_load=yes
-else case e in #(
-  e) ac_cv_lib_dld_shl_load=no ;;
-esac
+else
+  ac_cv_lib_dld_shl_load=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else case e in #(
-  e) ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes
-then :
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen"
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-printf %s "checking for dlopen in -ldl... " >&6; }
-if test ${ac_cv_lib_dl_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dlopen (void);
+char dlopen ();
 int
-main (void)
+main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
-else case e in #(
-  e) ac_cv_lib_dl_dlopen=no ;;
-esac
+else
+  ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-printf %s "checking for dlopen in -lsvld... " >&6; }
-if test ${ac_cv_lib_svld_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dlopen (void);
+char dlopen ();
 int
-main (void)
+main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_svld_dlopen=yes
-else case e in #(
-  e) ac_cv_lib_svld_dlopen=no ;;
-esac
+else
+  ac_cv_lib_svld_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-printf %s "checking for dld_link in -ldld... " >&6; }
-if test ${ac_cv_lib_dld_dld_link+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dld_link (void);
+char dld_link ();
 int
-main (void)
+main ()
 {
 return dld_link ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_dld_link=yes
-else case e in #(
-  e) ac_cv_lib_dld_dld_link=no ;;
-esac
+else
+  ac_cv_lib_dld_dld_link=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
-	       ;;
-esac
+
 fi
 
-	     ;;
-esac
+
 fi
 
-	   ;;
-esac
+
 fi
 
-	 ;;
-esac
+
 fi
 
-       ;;
-esac
+
 fi
 
     ;;
@@ -98153,19 +92848,18 @@
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-printf %s "checking whether a program can dlopen itself... " >&6; }
-if test ${lt_cv_dlopen_self+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) 	  if test "$cross_compiling" = yes; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 98168 "configure"
+#line 92862 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -98228,7 +92922,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -98244,27 +92938,25 @@
 fi
 rm -fr conftest*
 
-     ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-printf "%s\n" "$lt_cv_dlopen_self" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
-if test ${lt_cv_dlopen_self_static+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) 	  if test "$cross_compiling" = yes; then :
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 98267 "configure"
+#line 92959 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -98327,7 +93019,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -98343,11 +93035,10 @@
 fi
 rm -fr conftest*
 
-       ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -98369,13 +93060,13 @@
 
 
 # Report which library types will actually be built
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-printf %s "checking if libtool supports shared libraries... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-printf "%s\n" "$can_build_shared" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-printf %s "checking whether to build shared libraries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -98395,15 +93086,15 @@
   fi
     ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-printf "%s\n" "$enable_shared" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-printf %s "checking whether to build static libraries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-printf "%s\n" "$enable_static" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -98496,9 +93187,9 @@
 cfgfile="${ofile}T"
   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
   $rm -f "$cfgfile"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result:
 creating $ofile" >&5
-printf "%s\n" "
+$as_echo "
 creating $ofile" >&6; }
 
   cat <<__EOF__ >> "$cfgfile"
@@ -98904,26 +93595,25 @@
 
 
 # Check whether --with-tags was given.
-if test ${with_tags+y}
-then :
+if test "${with_tags+set}" = set; then :
   withval=$with_tags; tagnames="$withval"
 fi
 
 
 if test -f "$ltmain" && test -n "$tagnames"; then
   if test ! -f "${ofile}"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: output file '$ofile' does not exist" >&5
-printf "%s\n" "$as_me: WARNING: output file '$ofile' does not exist" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: output file '$ofile' does not exist" >&5
+$as_echo "$as_me: WARNING: output file '$ofile' does not exist" >&2;}
   fi
 
   if test -z "$LTCC"; then
     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
     if test -z "$LTCC"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: output file '$ofile' does not look like a libtool script" >&5
-printf "%s\n" "$as_me: WARNING: output file '$ofile' does not look like a libtool script" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: output file '$ofile' does not look like a libtool script" >&5
+$as_echo "$as_me: WARNING: output file '$ofile' does not look like a libtool script" >&2;}
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using 'LTCC=$LTCC', extracted from '$ofile'" >&5
-printf "%s\n" "$as_me: WARNING: using 'LTCC=$LTCC', extracted from '$ofile'" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using 'LTCC=$LTCC', extracted from '$ofile'" >&5
+$as_echo "$as_me: WARNING: using 'LTCC=$LTCC', extracted from '$ofile'" >&2;}
     fi
   fi
   if test -z "$LTCFLAGS"; then
@@ -99079,19 +93769,17 @@
 
 
 # Check whether --with-gnu-ld was given.
-if test ${with_gnu_ld+y}
-then :
+if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else case e in #(
-  e) with_gnu_ld=no ;;
-esac
+else
+  with_gnu_ld=no
 fi
 
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-printf %s "checking for ld used by $CC... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -99120,17 +93808,16 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-printf %s "checking for GNU ld... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-printf %s "checking for non-GNU ld... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test ${lt_cv_path_LD+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -z "$LD"; then
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
     IFS="$lt_save_ifs"
@@ -99153,26 +93840,24 @@
   IFS="$lt_save_ifs"
 else
   lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi ;;
-esac
+fi
 fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
-if test ${lt_cv_prog_gnu_ld+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) # I'd rather use --version here, but apparently some GNU lds only accept -v.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -99180,11 +93865,10 @@
 *)
   lt_cv_prog_gnu_ld=no
   ;;
-esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -99234,8 +93918,8 @@
 fi
 
 # PORTME: fill in a description of your system's C++ link characteristics
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 ld_shlibs_CXX=yes
 case $host_os in
   aix3*)
@@ -99333,7 +94017,7 @@
       # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 99336 "configure"
+#line 94020 "configure"
 #include "confdefs.h"
 int main(void) {
 ; return 0; }
@@ -99341,7 +94025,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
@@ -99376,7 +94060,7 @@
 	# Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 99379 "configure"
+#line 94063 "configure"
 #include "confdefs.h"
 int main(void) {
 ; return 0; }
@@ -99384,7 +94068,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
@@ -100132,8 +94816,8 @@
     ld_shlibs_CXX=no
     ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-printf "%s\n" "$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 GCC_CXX="$GXX"
@@ -100156,7 +94840,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
@@ -100312,8 +94996,8 @@
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-printf %s "checking for $compiler option to produce PIC... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -100602,21 +95286,20 @@
     esac
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
-printf "%s\n" "$lt_prog_compiler_pic_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if test ${lt_cv_prog_compiler_pic_works_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_prog_compiler_pic_works_CXX=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
@@ -100629,11 +95312,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:100632: $lt_compile\"" >&5)
+   (eval echo "\"configure:95315: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:100636: \$? = $ac_status" >&5
+   echo "configure:95319: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -100644,11 +95327,10 @@
      fi
    fi
    $rm conftest*
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
@@ -100675,13 +95357,12 @@
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test ${lt_cv_prog_compiler_static_works_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_prog_compiler_static_works_CXX=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -100702,11 +95383,10 @@
    fi
    $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
     :
@@ -100715,13 +95395,12 @@
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test ${lt_cv_prog_compiler_c_o_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_prog_compiler_c_o_CXX=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
@@ -100737,11 +95416,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:100740: $lt_compile\"" >&5)
+   (eval echo "\"configure:95419: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "configure:100744: \$? = $ac_status" >&5
+   echo "configure:95423: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -100761,37 +95440,36 @@
    cd ..
    rmdir conftest
    $rm conftest*
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-printf %s "checking if we can lock with hard links... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
@@ -100816,8 +95494,8 @@
   esac
   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__FID_.*'
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-printf "%s\n" "$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 #
@@ -100837,15 +95515,15 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-printf %s "checking whether -lc should be explicitly linked in... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -100863,7 +95541,7 @@
         if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
         then
 	  archive_cmds_need_lc_CXX=no
@@ -100875,16 +95553,16 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
-printf "%s\n" "$archive_cmds_need_lc_CXX" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-printf %s "checking dynamic linker characteristics... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -101440,25 +96118,21 @@
   dynamic_linker=no
   ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-if test ${lt_cv_sys_lib_search_path_spec+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ;;
-esac
+if ${lt_cv_sys_lib_search_path_spec+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test ${lt_cv_sys_lib_dlsearch_path_spec+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ;;
-esac
+if ${lt_cv_sys_lib_dlsearch_path_spec+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
 
 sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
@@ -101468,8 +96142,8 @@
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-printf %s "checking how to hardcode library paths into programs... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" || \
    test -n "$runpath_var_CXX" || \
@@ -101493,8 +96167,8 @@
   # directories.
   hardcode_action_CXX=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
-printf "%s\n" "$hardcode_action_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
 
 if test "$hardcode_action_CXX" = relink; then
   # Fast installation is not supported
@@ -102006,10 +96680,10 @@
 CC=$old_CC
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Generating files${T_ME}" >&5
-printf "%s\n" "${T_MD}Generating files${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Generating files${T_ME}" >&5
+$as_echo "${T_MD}Generating files${T_ME}" >&6; }
 
 
 CXXFLAGS_CLEAN=$CXXFLAGS
@@ -102500,7 +97174,7 @@
 
 
 
-printf "%s\n" "#define HAVE_BUILD_DEFS_H 1" >>confdefs.h
+$as_echo "#define HAVE_BUILD_DEFS_H 1" >>confdefs.h
 
 
 $php_shtool mkdir -p pear
@@ -102529,8 +97203,8 @@
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
-# 'ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* 'ac_cv_foo' will be assigned the
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
 # following values.
 
 _ACEOF
@@ -102546,8 +97220,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -102560,14 +97234,14 @@
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # 'set' does not quote correctly, so add quotes: double-quote
+      # `set' does not quote correctly, so add quotes: double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\$_$as_cr_alnum*_cv__$as_cr_alnum*\$=\$.*\$/\\1='\\2'/p"
       ;; #(
     *)
-      # 'set' quotes correctly as required by POSIX, so do not add quotes.
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^_$as_cr_alnum*_cv__$as_cr_alnum*=/p"
       ;;
     esac |
@@ -102577,15 +97251,15 @@
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^$^=*$=$.*{}.*$$/test ${\1+y} || &/
+     s/^$^=*$=$.*{}.*$$/test "${\1+set}" = set || &/
      t end
      s/^$^=*$=$.*$$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -102599,8 +97273,8 @@
       fi
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -102617,7 +97291,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -102629,8 +97303,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: patching main/php_config.h.in" >&5
-printf "%s\n" "$as_me: patching main/php_config.h.in" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: patching main/php_config.h.in" >&5
+$as_echo "$as_me: patching main/php_config.h.in" >&6;}
 
   $SED -e 's/^#undef PACKAGE_^ */\/\* & \*\//g' < $srcdir/main/php_config.h.in \
     > $srcdir/main/php_config.h.in.tmp && mv $srcdir/main/php_config.h.in.tmp $srcdir/main/php_config.h.in
@@ -102640,8 +97314,8 @@
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -102664,65 +97338,63 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else case e in #(
-  e) case `(set -o) 2>/dev/null` in #(
+else
+  case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
-esac ;;
 esac
 fi
 
 
-
-# Reset variables that may have inherited troublesome values from
-# the environment.
-
-# IFS needs to be set, to space, tab, and newline, in precisely that order.
-# (If _AS_PATH_WALK were called with IFS unset, it would have the
-# side effect of setting IFS to empty, thus disabling word splitting.)
-# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-IFS=" ""	$as_nl"
-
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# Ensure predictable behavior from utilities with locale-dependent output.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# We cannot yet rely on "unset" to work, but we need these variables
-# to be unset--not just set to an empty or harmless value--now, to
-# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
-# also avoids known problems related to "unset" and subshell syntax
-# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
-for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
-do eval test \${$as_var+y} \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-
-# Ensure that fds 0, 1, and 2 are open.
-if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
-if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
-if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\$.*\$"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\$.*\$$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
+      esac;
+      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
 
 # The user is always right.
-if ${PATH_SEPARATOR+false} :; then
+if test "${PATH_SEPARATOR+set}" != set; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -102731,6 +97403,13 @@
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -102739,27 +97418,43 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
   done
 IFS=$as_save_IFS
 
      ;;
 esac
-# We did not find ourselves, most probably we were run as 'sh COMMAND'
+# We did not find ourselves, most probably we were run as `sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR LINENO LOG_FD
@@ -102772,9 +97467,9 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -102805,25 +97500,22 @@
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
-
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
-then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else case e in #(
-  e) as_fn_append ()
+else
+  as_fn_append ()
   {
     eval $1=\$$1\$2
-  } ;;
-esac
+  }
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -102831,18 +97523,16 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
-then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else case e in #(
-  e) as_fn_arith ()
+else
+  as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
-  } ;;
-esac
+  }
 fi # as_fn_arith
 
 
@@ -102869,7 +97559,7 @@
 $as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
 	 X"$0" : 'X$//$$' \| \
 	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/$^/^/*$\/*$/{
 	    s//\1/
 	    q
@@ -102891,10 +97581,6 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -102908,12 +97594,6 @@
   ECHO_N='-n';;
 esac
 
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO("message") and AS_ECHO_N("message"), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -102925,9 +97605,9 @@
   if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
     # ... but there are two gotchas:
-    # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
-    # In both cases, we have to default to 'cp -pR'.
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -102955,7 +97635,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -102964,7 +97644,7 @@
 	 X"$as_dir" : 'X$//$^/' \| \
 	 X"$as_dir" : 'X$//$$' \| \
 	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -103008,12 +97688,10 @@
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
-as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g"
-as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
-as_sed_sh="y%*+%pp%;s%^_$as_cr_alnum%_%g"
-as_tr_sh="eval sed '$as_sed_sh'" # deprecated
+as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
 
 
 exec 6>&1
@@ -103028,8 +97706,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PHP $as_me 8.2.23, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+This file was extended by PHP $as_me 8.2.28, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -103061,7 +97739,7 @@
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-'$as_me' instantiates files and other configuration actions
+\`$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
 and actions are specified as TAGs, all are instantiated by default.
 
@@ -103092,16 +97770,14 @@
 PHP home page: <https://www.php.net>."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config='$ac_cs_config_escaped'
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
 ac_cs_version="\\
-PHP config.status 8.2.23
-configured by $0, generated by GNU Autoconf 2.72,
+PHP config.status 8.2.28
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -103138,15 +97814,15 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -103154,23 +97830,23 @@
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: '$1'
-Try '$0 --help' for more information.";;
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: '$1'
-Try '$0 --help' for more information." ;;
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
@@ -103191,7 +97867,7 @@
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -103205,7 +97881,7 @@
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  printf "%s\n" "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
@@ -103227,10 +97903,10 @@
 
 if test -n "\$REDO_ALL"; then
   echo "creating main/internal_functions.c"
-  AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
+  AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
 
   echo "creating main/internal_functions_cli.c"
-  AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
+  AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
 
     if test "$PHP_SAPI" = "apache2handler"; then
       if test "$APACHE_VERSION" -ge 2004001; then
@@ -103279,7 +97955,7 @@
     "$ALL_OUTPUT_FILES") CONFIG_FILES="$CONFIG_FILES $ALL_OUTPUT_FILES" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
-  *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -103289,9 +97965,9 @@
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
-  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
-  test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -103299,7 +97975,7 @@
 # creating and moving files from /tmp can sometimes cause problems.
 # Hook for its removal unless debugging.
 # Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to '$tmp'.
+# after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
   tmp= ac_tmp=
@@ -103323,7 +97999,7 @@
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with './config.status config.h'.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
 
@@ -103481,13 +98157,13 @@
 
 # Set up the scripts for CONFIG_HEADERS section.
 # No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with './config.status Makefile'.
+# This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
 cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
-# Transform confdefs.h into an awk script 'defines.awk', embedded as
+# Transform confdefs.h into an awk script `defines.awk', embedded as
 # here-document in config.status, that substitutes the proper values into
 # config.h.in to produce config.h.
 
@@ -103597,7 +98273,7 @@
   esac
   case $ac_mode$ac_tag in
   :FHL*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :FH-) ac_tag=-:-;;
   :FH*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -103619,33 +98295,33 @@
       -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain ':'.
+	 # because $ac_f cannot contain `:'.
 	 test -f "$ac_f" ||
 	   case $ac_f in
 	   \\/$*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
-    # Let's still pretend it is 'configure' which instantiates (i.e., don't
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  printf "%s\n" "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
+	  $as_echo "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`$as_echo "$configure_input" |
        sed 's/\\\\&|/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -103662,7 +98338,7 @@
 	 X"$ac_file" : 'X$//$^/' \| \
 	 X"$ac_file" : 'X$//$$' \| \
 	 X"$ac_file" : 'X$/$' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	    s//\1/
 	    q
@@ -103686,9 +98362,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.\\/||'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -103741,8 +98417,8 @@
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -103755,7 +98431,7 @@
 esac
 _ACEOF
 
-# Neutralize VPATH when '$srcdir' = '.'.
+# Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -103784,9 +98460,9 @@
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^	 *datarootdir	 *:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -103802,27 +98478,27 @@
   #
   if test x"$ac_file" != x-; then
     {
-      printf "%s\n" "/* $configure_input  */" >&1 \
+      $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    printf "%s\n" "/* $configure_input  */" >&1 \
+    $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
 
-  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -103878,8 +98554,7 @@
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
-

php-8.2.23.tar.xz/configure.ac -> php-8.2.28.tar.xz/configure.ac Changed

@@ -17,7 +17,7 @@
 dnl ----------------------------------------------------------------------------
 
 AC_PREREQ(2.68)
-AC_INIT(PHP,8.2.23,https://github.com/php/php-src/issues,php,https://www.php.net)
+AC_INIT(PHP,8.2.28,https://github.com/php/php-src/issues,php,https://www.php.net)
 AC_CONFIG_SRCDIR(main/php_version.h)
 AC_CONFIG_AUX_DIR(build)
 AC_PRESERVE_HELP_ORDER
@@ -262,7 +262,7 @@
 
 dnl Detect musl libc
 AC_MSG_CHECKING(whether we are using musl libc)
-if command -v ldd >/dev/null && ldd --version 2>&1 | grep -q ^musl
+if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1
 then
   AC_MSG_RESULT(yes)
   AC_DEFINE(__MUSL__, 1, Define when using musl libc)
@@ -738,11 +738,25 @@
 PHP_TIME_R_TYPE
 PHP_CHECK_IN_ADDR_T
 
-AC_CACHE_CHECK(for aarch64 CRC32 API, ac_cv_func___crc32d,
-AC_LINK_IFELSE(AC_LANG_PROGRAM(#include <arm_acle.h>,__crc32d(0, 0);),ac_cv_func___crc32d=yes,ac_cv_func___crc32d="no"))
-if test "$ac_cv_func___crc32d" = "yes"; then
-  AC_DEFINE(HAVE_AARCH64_CRC32, 1, Define when aarch64 CRC32 API is available.)
-fi
+AC_CACHE_CHECK(for aarch64 CRC32 API, ac_cv_func___crc32d,
+AC_LINK_IFELSE(AC_LANG_PROGRAM(
+#include <arm_acle.h>
+# if defined(__GNUC__)
+#  if!defined(__clang__)
+#   pragma GCC push_options
+#   pragma GCC target ("+nothing+crc")
+#  elif defined(__APPLE__)
+#   pragma clang attribute push(__attribute__((target("crc"))), apply_to=function)
+#  else
+#   pragma clang attribute push(__attribute__((target("+nothing+crc"))), apply_to=function)
+#  endif
+# endif
+, __crc32d(0, 0);),
+ac_cv_func___crc32d=yes,
+ac_cv_func___crc32d=no))
+AS_VAR_IF(ac_cv_func___crc32d, yes,
+  AC_DEFINE(HAVE_AARCH64_CRC32, 1,
+    Define to 1 when aarch64 CRC32 API is available.))
 
 dnl Check for asm goto support.
 AC_CACHE_CHECK(for asm goto, ac_cv__asm_goto,
@@ -831,10 +845,7 @@
   PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/build/Makefile.gcov, $abs_srcdir)
 
   dnl Remove all optimization flags from CFLAGS.
-  changequote({,})
-  CFLAGS=`echo "$CFLAGS" | "${SED}" -e 's/-O0-9s*//g'`
-  CXXFLAGS=`echo "$CXXFLAGS" | "${SED}" -e 's/-O0-9s*//g'`
-  changequote(,)
+  PHP_REMOVE_OPTIMIZATION_FLAGS
 
   dnl Add the special gcc flags.
   CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
@@ -851,10 +862,7 @@
 if test "$PHP_DEBUG" = "yes"; then
   PHP_DEBUG=1
   ZEND_DEBUG=yes
-  changequote({,})
-  CFLAGS=`echo "$CFLAGS" | "${SED}" -e 's/-O0-9s*//g'`
-  CXXFLAGS=`echo "$CXXFLAGS" | "${SED}" -e 's/-O0-9s*//g'`
-  changequote(,)
+  PHP_REMOVE_OPTIMIZATION_FLAGS
   dnl Add -O0 only if GCC or ICC is used.
   if test "$GCC" = "yes" || test "$ICC" = "yes"; then
     CFLAGS="$CFLAGS -O0"
@@ -1792,10 +1800,10 @@
 dnl Run this only when generating all the files.
 if test -n "\$REDO_ALL"; then
   echo "creating main/internal_functions.c"
-  AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
+  AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_STATIC" > main/internal_functions.c
 
   echo "creating main/internal_functions_cli.c"
-  AWK="$AWK" sh $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
+  AWK="$AWK" $SHELL $srcdir/build/genif.sh $srcdir/main/internal_functions.c.in "$EXT_CLI_STATIC" > main/internal_functions_cli.c
 
     if test "$PHP_SAPI" = "apache2handler"; then
       if test "$APACHE_VERSION" -ge 2004001; then

php-8.2.23.tar.xz/ext/calendar/cal_unix.c -> php-8.2.28.tar.xz/ext/calendar/cal_unix.c Changed

php-8.2.23.tar.xz/ext/calendar/dow.c -> php-8.2.28.tar.xz/ext/calendar/dow.c Changed

php-8.2.23.tar.xz/ext/calendar/easter.c -> php-8.2.28.tar.xz/ext/calendar/easter.c Changed

php-8.2.23.tar.xz/ext/calendar/gregor.c -> php-8.2.28.tar.xz/ext/calendar/gregor.c Changed

php-8.2.23.tar.xz/ext/calendar/jewish.c -> php-8.2.28.tar.xz/ext/calendar/jewish.c Changed

@@ -433,16 +433,31 @@
 								   zend_long *pMoladHalakim)
 {
 	register zend_ulong r1, r2, d1, d2;
+	zend_long chk;
 
 	/* Start with the time of the first molad after creation. */
 	r1 = NEW_MOON_OF_CREATION;
+	chk = (zend_long)metonicCycle;
+
+	if (chk > (ZEND_LONG_MAX - NEW_MOON_OF_CREATION) / (HALAKIM_PER_METONIC_CYCLE & 0xFFFF)) {
+		*pMoladDay = 0;
+		*pMoladHalakim = 0;
+		return;
+	}
 
 	/* Calculate metonicCycle * HALAKIM_PER_METONIC_CYCLE.  The upper 32
 	 * bits of the result will be in r2 and the lower 16 bits will be
 	 * in r1. */
-	r1 += metonicCycle * (HALAKIM_PER_METONIC_CYCLE & 0xFFFF);
+	r1 += chk * (HALAKIM_PER_METONIC_CYCLE & 0xFFFF);
+
+	if (chk > (ZEND_LONG_MAX - (r1 >> 16)) / ((HALAKIM_PER_METONIC_CYCLE >> 16) & 0xFFFF)) {
+		*pMoladDay = 0;
+		*pMoladHalakim = 0;
+		return;
+	}
+
 	r2 = r1 >> 16;
-	r2 += metonicCycle * ((HALAKIM_PER_METONIC_CYCLE >> 16) & 0xFFFF);
+	r2 += chk * ((HALAKIM_PER_METONIC_CYCLE >> 16) & 0xFFFF);
 
 	/* Calculate r2r1 / HALAKIM_PER_DAY.  The remainder will be in r1, the
 	 * upper 16 bits of the quotient will be in d2 and the lower 16 bits

php-8.2.28.tar.xz/ext/calendar/tests/gh16228.phpt Added

php-8.2.28.tar.xz/ext/calendar/tests/gh16231.phpt Added

php-8.2.28.tar.xz/ext/calendar/tests/gh16234.phpt Added

php-8.2.28.tar.xz/ext/calendar/tests/gh16235.phpt Added

php-8.2.28.tar.xz/ext/calendar/tests/gh16258.phpt Added

php-8.2.28.tar.xz/ext/calendar/tests/gh16834.phpt Added

php-8.2.23.tar.xz/ext/com_dotnet/com_typeinfo.c -> php-8.2.28.tar.xz/ext/com_dotnet/com_typeinfo.c Changed

php-8.2.23.tar.xz/ext/com_dotnet/com_variant.c -> php-8.2.28.tar.xz/ext/com_dotnet/com_variant.c Changed

php-8.2.28.tar.xz/ext/com_dotnet/tests/gh16991.phpt Added

php-8.2.28.tar.xz/ext/com_dotnet/tests/variant_variation.phpt Added

php-8.2.23.tar.xz/ext/curl/interface.c -> php-8.2.28.tar.xz/ext/curl/interface.c Changed

@@ -1381,7 +1381,7 @@
 				postval = Z_STR_P(prop);
 
 				if (php_check_open_basedir(ZSTR_VAL(postval))) {
-					return FAILURE;
+					goto out_string;
 				}
 
 				prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "mime", sizeof("mime")-1, 0, &rv);
@@ -1407,15 +1407,18 @@
 					seekfunc = NULL;
 				}
 
+				part = curl_mime_addpart(mime);
+				if (part == NULL) {
+					if (stream) {
+						php_stream_close(stream);
+					}
+					goto out_string;
+				}
+
 				cb_arg = emalloc(sizeof *cb_arg);
 				cb_arg->filename = zend_string_copy(postval);
 				cb_arg->stream = stream;
 
-				part = curl_mime_addpart(mime);
-				if (part == NULL) {
-					zend_string_release_ex(string_key, 0);
-					return FAILURE;
-				}
 				if ((form_error = curl_mime_name(part, ZSTR_VAL(string_key))) != CURLE_OK
 					|| (form_error = curl_mime_data_cb(part, filesize, read_cb, seekfunc, free_cb, cb_arg)) != CURLE_OK
 					|| (form_error = curl_mime_filename(part, filename ? filename : ZSTR_VAL(postval))) != CURLE_OK
@@ -1449,8 +1452,7 @@
 
 			prop = zend_read_property(curl_CURLStringFile_class, Z_OBJ_P(current), "postname", sizeof("postname")-1, 0, &rv);
 			if (EG(exception)) {
-				zend_string_release_ex(string_key, 0);
-				return FAILURE;
+				goto out_string;
 			}
 			ZVAL_DEREF(prop);
 			ZEND_ASSERT(Z_TYPE_P(prop) == IS_STRING);
@@ -1459,8 +1461,7 @@
 
 			prop = zend_read_property(curl_CURLStringFile_class, Z_OBJ_P(current), "mime", sizeof("mime")-1, 0, &rv);
 			if (EG(exception)) {
-				zend_string_release_ex(string_key, 0);
-				return FAILURE;
+				goto out_string;
 			}
 			ZVAL_DEREF(prop);
 			ZEND_ASSERT(Z_TYPE_P(prop) == IS_STRING);
@@ -1469,8 +1470,7 @@
 
 			prop = zend_read_property(curl_CURLStringFile_class, Z_OBJ_P(current), "data", sizeof("data")-1, 0, &rv);
 			if (EG(exception)) {
-				zend_string_release_ex(string_key, 0);
-				return FAILURE;
+				goto out_string;
 			}
 			ZVAL_DEREF(prop);
 			ZEND_ASSERT(Z_TYPE_P(prop) == IS_STRING);
@@ -1483,8 +1483,7 @@
 
 			part = curl_mime_addpart(mime);
 			if (part == NULL) {
-				zend_string_release_ex(string_key, 0);
-				return FAILURE;
+				goto out_string;
 			}
 			if ((form_error = curl_mime_name(part, ZSTR_VAL(string_key))) != CURLE_OK
 				|| (form_error = curl_mime_data(part, ZSTR_VAL(postval), ZSTR_LEN(postval))) != CURLE_OK
@@ -1540,7 +1539,7 @@
 
 	SAVE_CURL_ERROR(ch, error);
 	if (error != CURLE_OK) {
-		return FAILURE;
+		goto out_mime;
 	}
 
 	if ((*ch->clone) == 1) {
@@ -1556,6 +1555,16 @@
 
 	SAVE_CURL_ERROR(ch, error);
 	return error == CURLE_OK ? SUCCESS : FAILURE;
+
+out_string:
+	zend_string_release_ex(string_key, false);
+out_mime:
+#if LIBCURL_VERSION_NUM >= 0x073800 /* 7.56.0 */
+	curl_mime_free(mime);
+#else
+	curl_formfree(first);
+#endif
+	return FAILURE;
 }
 /* }}} */

php-8.2.23.tar.xz/ext/curl/multi.c -> php-8.2.28.tar.xz/ext/curl/multi.c Changed

@@ -97,12 +97,14 @@
 
 	_php_curl_cleanup_handle(ch);
 
-	Z_ADDREF_P(z_ch);
-	zend_llist_add_element(&mh->easyh, z_ch);
-
 	error = curl_multi_add_handle(mh->multi, ch->cp);
 	SAVE_CURLM_ERROR(mh, error);
 
+	if (error == CURLM_OK) {
+		Z_ADDREF_P(z_ch);
+		zend_llist_add_element(&mh->easyh, z_ch);
+	}
+
 	RETURN_LONG((zend_long) error);
 }
 /* }}} */
@@ -164,9 +166,11 @@
 	error = curl_multi_remove_handle(mh->multi, ch->cp);
 	SAVE_CURLM_ERROR(mh, error);
 
-	RETVAL_LONG((zend_long) error);
-	zend_llist_del_element(&mh->easyh, z_ch, (int (*)(void *, void *))curl_compare_objects);
+	if (error == CURLM_OK) {
+		zend_llist_del_element(&mh->easyh, z_ch, (int (*)(void *, void *))curl_compare_objects);
+	}
 
+	RETURN_LONG((zend_long) error);
 }
 /* }}} */
 
@@ -187,7 +191,15 @@
 
 	mh = Z_CURL_MULTI_P(z_mh);
 
-	error = curl_multi_wait(mh->multi, NULL, 0, (unsigned long) (timeout * 1000.0), &numfds);
+	if (!(timeout >= 0.0 && timeout <= ((double)INT_MAX / 1000.0))) {
+		php_error_docref(NULL, E_WARNING, "timeout must be between 0 and %d", (int)ceilf((double)INT_MAX / 1000));
+#ifdef CURLM_BAD_FUNCTION_ARGUMENT
+		SAVE_CURLM_ERROR(mh, CURLM_BAD_FUNCTION_ARGUMENT);
+#endif
+		RETURN_LONG(-1);
+	}
+
+	error = curl_multi_wait(mh->multi, NULL, 0, (int) (timeout * 1000.0), &numfds);
 	if (CURLM_OK != error) {
 		SAVE_CURLM_ERROR(mh, error);
 		RETURN_LONG(-1);

php-8.2.23.tar.xz/ext/curl/tests/bug48203_multi.phpt -> php-8.2.28.tar.xz/ext/curl/tests/bug48203_multi.phpt Changed

php-8.2.23.tar.xz/ext/curl/tests/bug71523.phpt -> php-8.2.28.tar.xz/ext/curl/tests/bug71523.phpt Changed

php-8.2.23.tar.xz/ext/curl/tests/curl_basic_018.phpt -> php-8.2.28.tar.xz/ext/curl/tests/curl_basic_018.phpt Changed

php-8.2.23.tar.xz/ext/curl/tests/curl_basic_022.phpt -> php-8.2.28.tar.xz/ext/curl/tests/curl_basic_022.phpt Changed

php-8.2.28.tar.xz/ext/curl/tests/curl_multi_add_handle_lifecycle.phpt Added

php-8.2.23.tar.xz/ext/curl/tests/curl_multi_getcontent_basic3.phpt -> php-8.2.28.tar.xz/ext/curl/tests/curl_multi_getcontent_basic3.phpt Changed

php-8.2.28.tar.xz/ext/curl/tests/gh15547.phpt Added

php-8.2.23.tar.xz/ext/date/lib/parse_date.c -> php-8.2.28.tar.xz/ext/date/lib/parse_date.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 1.0.3 on Thu Nov 23 16:02:28 2023 */
+/* Generated by re2c 1.0.3 on Wed Sep 11 17:29:29 2024 */
 #line 1 "ext/date/lib/parse_date.re"
 /*
  * The MIT License (MIT)
@@ -549,22 +549,26 @@
 	timelib_sll tmp_nr = 0;
 	int len = 0;
 
-	str = timelib_calloc(1, max_length + 2); // for sign and \0
-	str_ptr = str;
+	/* Skip over non-numeric chars */
 
 	while (((**ptr < '0') || (**ptr > '9')) && (**ptr != '+') && (**ptr != '-')) {
 		if (**ptr == '\0') {
 			add_error(s, TIMELIB_ERR_UNEXPECTED_DATA, "Found unexpected data");
-			timelib_free(str);
 			return 0;
 		}
 		++*ptr;
 	}
-
-	if ((**ptr == '+') || (**ptr == '-')) {
-		*str_ptr = **ptr;
+	
+	/* Allocate string to feed to strtoll(): sign + length + '\0' */
+	str = timelib_calloc(1, max_length + 2);
+	str0 = '+'; /* First position is the sign */
+	str_ptr = str + 1;
+
+	while ((**ptr == '+') || (**ptr == '-')) {
+		if (**ptr == '-') {
+			str0 = str0 == '+' ? '-' : '+';
+		}
 		++*ptr;
-		++str_ptr;
 	}
 
 	while (((**ptr < '0') || (**ptr > '9'))) {
@@ -715,7 +719,7 @@
 
 static void add_with_overflow(Scanner *s, timelib_sll *e, timelib_sll amount, int multiplier)
 {
-#if defined(__has_builtin) && __has_builtin(__builtin_saddll_overflow)
+#if TIMELIB_HAVE_BUILTIN_SADDLL_OVERFLOW
 	if (__builtin_saddll_overflow(*e, amount * multiplier, e)) {
 		add_error(s, TIMELIB_ERR_NUMBER_OUT_OF_RANGE, "Number out of range");
 	}
@@ -1014,11 +1018,11 @@
 std:
 	s->tok = cursor;
 	s->len = 0;
-#line 1147 "ext/date/lib/parse_date.re"
+#line 1151 "ext/date/lib/parse_date.re"
 
 
 
-#line 1022 "<stdout>"
+#line 1026 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
@@ -1199,23 +1203,23 @@
 	YYDEBUG(2, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(3, *YYCURSOR);
-#line 1980 "ext/date/lib/parse_date.re"
+#line 1984 "ext/date/lib/parse_date.re"
 	{
 		s->pos = cursor; s->line++;
 		goto std;
 	}
-#line 1208 "<stdout>"
+#line 1212 "<stdout>"
 yy4:
 	YYDEBUG(4, *YYCURSOR);
 	++YYCURSOR;
 yy5:
 	YYDEBUG(5, *YYCURSOR);
-#line 1986 "ext/date/lib/parse_date.re"
+#line 1990 "ext/date/lib/parse_date.re"
 	{
 		add_error(s, TIMELIB_ERR_UNEXPECTED_CHARACTER, "Unexpected character");
 		goto std;
 	}
-#line 1219 "<stdout>"
+#line 1223 "<stdout>"
 yy6:
 	YYDEBUG(6, *YYCURSOR);
 	yyaccept = 0;
@@ -1230,11 +1234,11 @@
 	if (yych <= '9') goto yy58;
 yy8:
 	YYDEBUG(8, *YYCURSOR);
-#line 1975 "ext/date/lib/parse_date.re"
+#line 1979 "ext/date/lib/parse_date.re"
 	{
 		goto std;
 	}
-#line 1238 "<stdout>"
+#line 1242 "<stdout>"
 yy9:
 	YYDEBUG(9, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -1268,11 +1272,11 @@
 	YYDEBUG(11, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(12, *YYCURSOR);
-#line 1970 "ext/date/lib/parse_date.re"
+#line 1974 "ext/date/lib/parse_date.re"
 	{
 		goto std;
 	}
-#line 1276 "<stdout>"
+#line 1280 "<stdout>"
 yy13:
 	YYDEBUG(13, *YYCURSOR);
 	yyaccept = 1;
@@ -1773,7 +1777,7 @@
 	}
 yy20:
 	YYDEBUG(20, *YYCURSOR);
-#line 1885 "ext/date/lib/parse_date.re"
+#line 1889 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("tzcorrection | tz");
@@ -1787,7 +1791,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_TIMEZONE;
 	}
-#line 1791 "<stdout>"
+#line 1795 "<stdout>"
 yy21:
 	YYDEBUG(21, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -3592,7 +3596,7 @@
 	}
 yy81:
 	YYDEBUG(81, *YYCURSOR);
-#line 1632 "ext/date/lib/parse_date.re"
+#line 1636 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("datenoyearrev");
 		TIMELIB_INIT;
@@ -3603,7 +3607,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 3607 "<stdout>"
+#line 3611 "<stdout>"
 yy82:
 	YYDEBUG(82, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -4118,7 +4122,7 @@
 	}
 	if (yych == '.') goto yy289;
 	YYDEBUG(114, *YYCURSOR);
-#line 1207 "ext/date/lib/parse_date.re"
+#line 1211 "ext/date/lib/parse_date.re"
 	{
 		timelib_ull i;
 
@@ -4143,7 +4147,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 4147 "<stdout>"
+#line 4151 "<stdout>"
 yy115:
 	YYDEBUG(115, *YYCURSOR);
 	++YYCURSOR;
@@ -5869,7 +5873,7 @@
 	}
 yy177:
 	YYDEBUG(177, *YYCURSOR);
-#line 1373 "ext/date/lib/parse_date.re"
+#line 1377 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("timetiny24 | timeshort24 | timelong24 | iso8601long");
@@ -5896,7 +5900,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
-#line 5900 "<stdout>"
+#line 5904 "<stdout>"
 yy178:
 	YYDEBUG(178, *YYCURSOR);
 	yyaccept = 4;
@@ -6925,7 +6929,7 @@
 	}
 yy224:
 	YYDEBUG(224, *YYCURSOR);
-#line 1467 "ext/date/lib/parse_date.re"
+#line 1471 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("americanshort | american");
@@ -6940,7 +6944,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_AMERICAN;
 	}
-#line 6944 "<stdout>"
+#line 6948 "<stdout>"
 yy225:
 	YYDEBUG(225, *YYCURSOR);
 	yyaccept = 5;
@@ -7183,7 +7187,7 @@
 	if (yych <= '9') goto yy431;
 yy251:
 	YYDEBUG(251, *YYCURSOR);
-#line 1549 "ext/date/lib/parse_date.re"
+#line 1553 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datefull");
@@ -7197,7 +7201,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL;
 	}
-#line 7201 "<stdout>"
+#line 7205 "<stdout>"
 yy252:
 	YYDEBUG(252, *YYCURSOR);
 	yyaccept = 3;
@@ -7311,7 +7315,7 @@
 	if (yych == 'e') goto yy440;
 yy260:
 	YYDEBUG(260, *YYCURSOR);
-#line 1954 "ext/date/lib/parse_date.re"
+#line 1958 "ext/date/lib/parse_date.re"
 	{
 		timelib_ull i;
 		DEBUG_OUTPUT("relative");
@@ -7326,7 +7330,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 7330 "<stdout>"
+#line 7334 "<stdout>"
 yy261:
 	YYDEBUG(261, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -7772,7 +7776,7 @@
 	if (yych <= '9') goto yy471;
 yy290:
 	YYDEBUG(290, *YYCURSOR);
-#line 1233 "ext/date/lib/parse_date.re"
+#line 1237 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		timelib_ull us;
@@ -7811,7 +7815,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 7815 "<stdout>"
+#line 7819 "<stdout>"
 yy291:
 	YYDEBUG(291, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -7836,7 +7840,7 @@
 	}
 yy293:
 	YYDEBUG(293, *YYCURSOR);
-#line 1795 "ext/date/lib/parse_date.re"
+#line 1799 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("ago");
 		TIMELIB_INIT;
@@ -7856,7 +7860,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_AGO;
 	}
-#line 7860 "<stdout>"
+#line 7864 "<stdout>"
 yy294:
 	YYDEBUG(294, *YYCURSOR);
 	yyaccept = 7;
@@ -7895,7 +7899,7 @@
 	}
 yy295:
 	YYDEBUG(295, *YYCURSOR);
-#line 1875 "ext/date/lib/parse_date.re"
+#line 1879 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("monthtext");
 		TIMELIB_INIT;
@@ -7904,7 +7908,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 7908 "<stdout>"
+#line 7912 "<stdout>"
 yy296:
 	YYDEBUG(296, *YYCURSOR);
 	yyaccept = 7;
@@ -8479,7 +8483,7 @@
 	}
 yy315:
 	YYDEBUG(315, *YYCURSOR);
-#line 1816 "ext/date/lib/parse_date.re"
+#line 1820 "ext/date/lib/parse_date.re"
 	{
 		const timelib_relunit* relunit;
 		DEBUG_OUTPUT("daytext");
@@ -8496,7 +8500,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEKDAY;
 	}
-#line 8500 "<stdout>"
+#line 8504 "<stdout>"
 yy316:
 	YYDEBUG(316, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -8764,7 +8768,7 @@
 	}
 yy325:
 	YYDEBUG(325, *YYCURSOR);
-#line 1618 "ext/date/lib/parse_date.re"
+#line 1622 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datetextual | datenoyear");
@@ -8777,7 +8781,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 8781 "<stdout>"
+#line 8785 "<stdout>"
 yy326:
 	YYDEBUG(326, *YYCURSOR);
 	yyaccept = 10;
@@ -9471,7 +9475,7 @@
 	}
 yy351:
 	YYDEBUG(351, *YYCURSOR);
-#line 1164 "ext/date/lib/parse_date.re"
+#line 1168 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("now");
 		TIMELIB_INIT;
@@ -9479,7 +9483,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 9483 "<stdout>"
+#line 9487 "<stdout>"
 yy352:
 	YYDEBUG(352, *YYCURSOR);
 	yyaccept = 2;
@@ -10982,7 +10986,7 @@
 	}
 yy420:
 	YYDEBUG(420, *YYCURSOR);
-#line 1401 "ext/date/lib/parse_date.re"
+#line 1405 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("gnunocolon");
 		TIMELIB_INIT;
@@ -11004,7 +11008,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_GNU_NOCOLON;
 	}
-#line 11008 "<stdout>"
+#line 11012 "<stdout>"
 yy421:
 	YYDEBUG(421, *YYCURSOR);
 	yyaccept = 13;
@@ -11085,7 +11089,7 @@
 	}
 yy422:
 	YYDEBUG(422, *YYCURSOR);
-#line 1786 "ext/date/lib/parse_date.re"
+#line 1790 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("year4");
 		TIMELIB_INIT;
@@ -11093,7 +11097,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
-#line 11097 "<stdout>"
+#line 11101 "<stdout>"
 yy423:
 	YYDEBUG(423, *YYCURSOR);
 	yyaccept = 3;
@@ -11700,7 +11704,7 @@
 	YYDEBUG(456, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(457, *YYCURSOR);
-#line 1335 "ext/date/lib/parse_date.re"
+#line 1339 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("timetiny12 | timeshort12 | timelong12");
 		TIMELIB_INIT;
@@ -11717,7 +11721,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME12;
 	}
-#line 11721 "<stdout>"
+#line 11725 "<stdout>"
 yy458:
 	YYDEBUG(458, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13044,7 +13048,7 @@
 	}
 yy526:
 	YYDEBUG(526, *YYCURSOR);
-#line 1173 "ext/date/lib/parse_date.re"
+#line 1177 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("noon");
 		TIMELIB_INIT;
@@ -13055,7 +13059,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 13059 "<stdout>"
+#line 13063 "<stdout>"
 yy527:
 	YYDEBUG(527, *YYCURSOR);
 	yyaccept = 2;
@@ -14101,7 +14105,7 @@
 	}
 yy567:
 	YYDEBUG(567, *YYCURSOR);
-#line 1535 "ext/date/lib/parse_date.re"
+#line 1539 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("gnudateshort");
@@ -14114,7 +14118,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 14118 "<stdout>"
+#line 14122 "<stdout>"
 yy568:
 	YYDEBUG(568, *YYCURSOR);
 	yyaccept = 15;
@@ -14565,7 +14569,7 @@
 	}
 yy600:
 	YYDEBUG(600, *YYCURSOR);
-#line 1604 "ext/date/lib/parse_date.re"
+#line 1608 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datenodayrev");
@@ -14578,7 +14582,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NO_DAY;
 	}
-#line 14582 "<stdout>"
+#line 14586 "<stdout>"
 yy601:
 	YYDEBUG(601, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -15953,7 +15957,7 @@
 	YYDEBUG(696, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(697, *YYCURSOR);
-#line 1590 "ext/date/lib/parse_date.re"
+#line 1594 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datenoday");
@@ -15966,7 +15970,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NO_DAY;
 	}
-#line 15970 "<stdout>"
+#line 15974 "<stdout>"
 yy698:
 	YYDEBUG(698, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -16527,7 +16531,7 @@
 	}
 yy722:
 	YYDEBUG(722, *YYCURSOR);
-#line 1185 "ext/date/lib/parse_date.re"
+#line 1189 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("midnight | today");
 		TIMELIB_INIT;
@@ -16536,7 +16540,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 16540 "<stdout>"
+#line 16544 "<stdout>"
 yy723:
 	YYDEBUG(723, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -16846,7 +16850,7 @@
 	if (yych <= '9') goto yy897;
 yy739:
 	YYDEBUG(739, *YYCURSOR);
-#line 1576 "ext/date/lib/parse_date.re"
+#line 1580 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pointed date YY");
@@ -16859,7 +16863,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
-#line 16863 "<stdout>"
+#line 16867 "<stdout>"
 yy740:
 	YYDEBUG(740, *YYCURSOR);
 	yyaccept = 15;
@@ -16971,7 +16975,7 @@
 	}
 yy752:
 	YYDEBUG(752, *YYCURSOR);
-#line 1521 "ext/date/lib/parse_date.re"
+#line 1525 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("gnudateshorter");
@@ -16984,7 +16988,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 16988 "<stdout>"
+#line 16992 "<stdout>"
 yy753:
 	YYDEBUG(753, *YYCURSOR);
 	yyaccept = 18;
@@ -17233,7 +17237,7 @@
 	}
 yy777:
 	YYDEBUG(777, *YYCURSOR);
-#line 1447 "ext/date/lib/parse_date.re"
+#line 1451 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("iso8601nocolon");
@@ -17252,7 +17256,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_NOCOLON;
 	}
-#line 17256 "<stdout>"
+#line 17260 "<stdout>"
 yy778:
 	YYDEBUG(778, *YYCURSOR);
 	yyaccept = 19;
@@ -18480,7 +18484,7 @@
 	}
 yy849:
 	YYDEBUG(849, *YYCURSOR);
-#line 1924 "ext/date/lib/parse_date.re"
+#line 1928 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz");
@@ -18509,7 +18513,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_SHORTDATE_WITH_TIME;
 	}
-#line 18513 "<stdout>"
+#line 18517 "<stdout>"
 yy850:
 	YYDEBUG(850, *YYCURSOR);
 	yyaccept = 20;
@@ -19553,7 +19557,7 @@
 	}
 yy926:
 	YYDEBUG(926, *YYCURSOR);
-#line 1682 "ext/date/lib/parse_date.re"
+#line 1686 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgydotd");
@@ -19566,7 +19570,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_YEARDAY;
 	}
-#line 19570 "<stdout>"
+#line 19574 "<stdout>"
 yy927:
 	YYDEBUG(927, *YYCURSOR);
 	yyaccept = 21;
@@ -19820,7 +19824,7 @@
 	if (yych <= '7') goto yy1059;
 yy942:
 	YYDEBUG(942, *YYCURSOR);
-#line 1715 "ext/date/lib/parse_date.re"
+#line 1719 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll w, d;
 		DEBUG_OUTPUT("isoweek");
@@ -19838,7 +19842,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
-#line 19842 "<stdout>"
+#line 19846 "<stdout>"
 yy943:
 	YYDEBUG(943, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -20314,7 +20318,7 @@
 	if (yych == 'e') goto yy1094;
 yy982:
 	YYDEBUG(982, *YYCURSOR);
-#line 1858 "ext/date/lib/parse_date.re"
+#line 1862 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -20330,7 +20334,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 20334 "<stdout>"
+#line 20338 "<stdout>"
 yy983:
 	YYDEBUG(983, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -20677,7 +20681,7 @@
 	YYDEBUG(1020, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1021, *YYCURSOR);
-#line 1564 "ext/date/lib/parse_date.re"
+#line 1568 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("pointed date YYYY");
 		TIMELIB_INIT;
@@ -20688,7 +20692,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
-#line 20692 "<stdout>"
+#line 20696 "<stdout>"
 yy1022:
 	YYDEBUG(1022, *YYCURSOR);
 	++YYCURSOR;
@@ -20717,7 +20721,7 @@
 	}
 yy1025:
 	YYDEBUG(1025, *YYCURSOR);
-#line 1495 "ext/date/lib/parse_date.re"
+#line 1499 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("iso8601date2");
@@ -20730,7 +20734,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 20734 "<stdout>"
+#line 20738 "<stdout>"
 yy1026:
 	YYDEBUG(1026, *YYCURSOR);
 	yyaccept = 15;
@@ -20950,7 +20954,7 @@
 	}
 yy1043:
 	YYDEBUG(1043, *YYCURSOR);
-#line 1483 "ext/date/lib/parse_date.re"
+#line 1487 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash");
 		TIMELIB_INIT;
@@ -20961,7 +20965,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 20965 "<stdout>"
+#line 20969 "<stdout>"
 yy1044:
 	YYDEBUG(1044, *YYCURSOR);
 	yyaccept = 26;
@@ -21076,7 +21080,7 @@
 	}
 yy1048:
 	YYDEBUG(1048, *YYCURSOR);
-#line 1644 "ext/date/lib/parse_date.re"
+#line 1648 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("datenocolon");
 		TIMELIB_INIT;
@@ -21087,7 +21091,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NOCOLON;
 	}
-#line 21091 "<stdout>"
+#line 21095 "<stdout>"
 yy1049:
 	YYDEBUG(1049, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -21157,7 +21161,7 @@
 	YYDEBUG(1059, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1060, *YYCURSOR);
-#line 1696 "ext/date/lib/parse_date.re"
+#line 1700 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll w, d;
 		DEBUG_OUTPUT("isoweekday");
@@ -21175,7 +21179,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
-#line 21179 "<stdout>"
+#line 21183 "<stdout>"
 yy1061:
 	YYDEBUG(1061, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -21238,7 +21242,7 @@
 	if (yych <= '9') goto yy1143;
 yy1070:
 	YYDEBUG(1070, *YYCURSOR);
-#line 1734 "ext/date/lib/parse_date.re"
+#line 1738 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgtextshort");
@@ -21251,7 +21255,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
-#line 21255 "<stdout>"
+#line 21259 "<stdout>"
 yy1071:
 	YYDEBUG(1071, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -21724,7 +21728,7 @@
 	++YYCURSOR;
 yy1107:
 	YYDEBUG(1107, *YYCURSOR);
-#line 1195 "ext/date/lib/parse_date.re"
+#line 1199 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("tomorrow");
 		TIMELIB_INIT;
@@ -21735,7 +21739,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 21739 "<stdout>"
+#line 21743 "<stdout>"
 yy1108:
 	YYDEBUG(1108, *YYCURSOR);
 	yyaccept = 28;
@@ -22072,7 +22076,7 @@
 	YYDEBUG(1140, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1141, *YYCURSOR);
-#line 1748 "ext/date/lib/parse_date.re"
+#line 1752 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgtextreverse");
@@ -22085,7 +22089,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
-#line 22089 "<stdout>"
+#line 22093 "<stdout>"
 yy1142:
 	YYDEBUG(1142, *YYCURSOR);
 	++YYCURSOR;
@@ -22129,7 +22133,7 @@
 	}
 yy1145:
 	YYDEBUG(1145, *YYCURSOR);
-#line 1290 "ext/date/lib/parse_date.re"
+#line 1294 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("backof | frontof");
 		TIMELIB_INIT;
@@ -22151,7 +22155,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_LF_DAY_OF_MONTH;
 	}
-#line 22155 "<stdout>"
+#line 22159 "<stdout>"
 yy1146:
 	YYDEBUG(1146, *YYCURSOR);
 	yyaccept = 29;
@@ -22475,7 +22479,7 @@
 	}
 yy1172:
 	YYDEBUG(1172, *YYCURSOR);
-#line 1834 "ext/date/lib/parse_date.re"
+#line 1838 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -22498,7 +22502,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 22502 "<stdout>"
+#line 22506 "<stdout>"
 yy1173:
 	YYDEBUG(1173, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -22510,7 +22514,7 @@
 	++YYCURSOR;
 yy1175:
 	YYDEBUG(1175, *YYCURSOR);
-#line 1152 "ext/date/lib/parse_date.re"
+#line 1156 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("yesterday");
 		TIMELIB_INIT;
@@ -22521,7 +22525,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 22525 "<stdout>"
+#line 22529 "<stdout>"
 yy1176:
 	YYDEBUG(1176, *YYCURSOR);
 	yyaccept = 31;
@@ -23014,7 +23018,7 @@
 	YYDEBUG(1222, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1223, *YYCURSOR);
-#line 1900 "ext/date/lib/parse_date.re"
+#line 1904 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12");
 		TIMELIB_INIT;
@@ -23037,7 +23041,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_SHORTDATE_WITH_TIME;
 	}
-#line 23041 "<stdout>"
+#line 23045 "<stdout>"
 yy1224:
 	YYDEBUG(1224, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -23539,7 +23543,7 @@
 	YYDEBUG(1268, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1269, *YYCURSOR);
-#line 1313 "ext/date/lib/parse_date.re"
+#line 1317 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int         behavior = 0;
@@ -23560,7 +23564,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEK_DAY_OF_MONTH;
 	}
-#line 23564 "<stdout>"
+#line 23568 "<stdout>"
 yy1270:
 	YYDEBUG(1270, *YYCURSOR);
 	yyaccept = 24;
@@ -23607,7 +23611,7 @@
 	YYDEBUG(1273, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1274, *YYCURSOR);
-#line 1273 "ext/date/lib/parse_date.re"
+#line 1277 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("firstdayof | lastdayof");
 		TIMELIB_INIT;
@@ -23623,12 +23627,12 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_LF_DAY_OF_MONTH;
 	}
-#line 23627 "<stdout>"
+#line 23631 "<stdout>"
 yy1275:
 	YYDEBUG(1275, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1276, *YYCURSOR);
-#line 1509 "ext/date/lib/parse_date.re"
+#line 1513 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("iso8601datex");
 		TIMELIB_INIT;
@@ -23639,7 +23643,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 23643 "<stdout>"
+#line 23647 "<stdout>"
 yy1277:
 	YYDEBUG(1277, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -23742,7 +23746,7 @@
 	YYDEBUG(1290, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1291, *YYCURSOR);
-#line 1353 "ext/date/lib/parse_date.re"
+#line 1357 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("mssqltime");
 		TIMELIB_INIT;
@@ -23761,7 +23765,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
-#line 23765 "<stdout>"
+#line 23769 "<stdout>"
 yy1292:
 	YYDEBUG(1292, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -24185,7 +24189,7 @@
 	if (yych <= '9') goto yy1331;
 yy1329:
 	YYDEBUG(1329, *YYCURSOR);
-#line 1656 "ext/date/lib/parse_date.re"
+#line 1660 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx | exif");
@@ -24210,7 +24214,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_XMLRPC_SOAP;
 	}
-#line 24214 "<stdout>"
+#line 24218 "<stdout>"
 yy1330:
 	YYDEBUG(1330, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -24580,7 +24584,7 @@
 	if (yych <= ':') goto yy1383;
 yy1375:
 	YYDEBUG(1375, *YYCURSOR);
-#line 1762 "ext/date/lib/parse_date.re"
+#line 1766 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("clf");
@@ -24603,7 +24607,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
-#line 24607 "<stdout>"
+#line 24611 "<stdout>"
 yy1376:
 	YYDEBUG(1376, *YYCURSOR);
 	yyaccept = 33;
@@ -24835,7 +24839,7 @@
 	if (yych == ':') goto yy1286;
 	goto yy1329;
 }
-#line 1990 "ext/date/lib/parse_date.re"
+#line 1994 "ext/date/lib/parse_date.re"
 
 }

php-8.2.23.tar.xz/ext/date/lib/parse_date.re -> php-8.2.28.tar.xz/ext/date/lib/parse_date.re Changed

@@ -547,22 +547,26 @@
 	timelib_sll tmp_nr = 0;
 	int len = 0;
 
-	str = timelib_calloc(1, max_length + 2); // for sign and \0
-	str_ptr = str;
+	/* Skip over non-numeric chars */
 
 	while (((**ptr < '0') || (**ptr > '9')) && (**ptr != '+') && (**ptr != '-')) {
 		if (**ptr == '\0') {
 			add_error(s, TIMELIB_ERR_UNEXPECTED_DATA, "Found unexpected data");
-			timelib_free(str);
 			return 0;
 		}
 		++*ptr;
 	}
+	
+	/* Allocate string to feed to strtoll(): sign + length + '\0' */
+	str = timelib_calloc(1, max_length + 2);
+	str0 = '+'; /* First position is the sign */
+	str_ptr = str + 1;
 
-	if ((**ptr == '+') || (**ptr == '-')) {
-		*str_ptr = **ptr;
+	while ((**ptr == '+') || (**ptr == '-')) {
+		if (**ptr == '-') {
+			str0 = str0 == '+' ? '-' : '+';
+		}
 		++*ptr;
-		++str_ptr;
 	}
 
 	while (((**ptr < '0') || (**ptr > '9'))) {
@@ -713,7 +717,7 @@
 
 static void add_with_overflow(Scanner *s, timelib_sll *e, timelib_sll amount, int multiplier)
 {
-#if defined(__has_builtin) && __has_builtin(__builtin_saddll_overflow)
+#if TIMELIB_HAVE_BUILTIN_SADDLL_OVERFLOW
 	if (__builtin_saddll_overflow(*e, amount * multiplier, e)) {
 		add_error(s, TIMELIB_ERR_NUMBER_OUT_OF_RANGE, "Number out of range");
 	}

php-8.2.23.tar.xz/ext/date/lib/parse_iso_intervals.c -> php-8.2.28.tar.xz/ext/date/lib/parse_iso_intervals.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 0.15.3 on Wed Sep 14 16:32:05 2022 */
+/* Generated by re2c 1.0.3 on Wed Sep 11 17:29:40 2024 */
 #line 1 "ext/date/lib/parse_iso_intervals.re"
 /*
  * The MIT License (MIT)
@@ -223,54 +223,72 @@
 	yych = *YYCURSOR;
 	if (yych <= ',') {
 		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy9;
-			if (yych <= 0x08) goto yy11;
-			if (yych <= '\t') goto yy7;
-			goto yy9;
+			if (yych <= 0x00) goto yy2;
+			if (yych <= 0x08) goto yy4;
+			if (yych <= '\t') goto yy6;
 		} else {
-			if (yych == ' ') goto yy7;
-			if (yych <= '+') goto yy11;
-			goto yy7;
+			if (yych == ' ') goto yy6;
+			if (yych <= '+') goto yy4;
+			goto yy6;
 		}
 	} else {
 		if (yych <= 'O') {
-			if (yych <= '-') goto yy11;
-			if (yych <= '/') goto yy7;
-			if (yych <= '9') goto yy4;
-			goto yy11;
+			if (yych <= '-') goto yy4;
+			if (yych <= '/') goto yy6;
+			if (yych <= '9') goto yy8;
+			goto yy4;
 		} else {
-			if (yych <= 'P') goto yy5;
-			if (yych != 'R') goto yy11;
+			if (yych <= 'P') goto yy9;
+			if (yych == 'R') goto yy11;
+			goto yy4;
 		}
 	}
+yy2:
 	YYDEBUG(2, *YYCURSOR);
 	++YYCURSOR;
-	if ((yych = *YYCURSOR) <= '/') goto yy3;
-	if (yych <= '9') goto yy98;
-yy3:
 	YYDEBUG(3, *YYCURSOR);
-#line 317 "ext/date/lib/parse_iso_intervals.re"
+#line 311 "ext/date/lib/parse_iso_intervals.re"
 	{
-		add_error(s, "Unexpected character");
+		s->pos = cursor; s->line++;
 		goto std;
 	}
-#line 258 "<stdout>"
+#line 256 "<stdout>"
 yy4:
 	YYDEBUG(4, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy3;
-	if (yych <= '9') goto yy59;
-	goto yy3;
+	++YYCURSOR;
 yy5:
 	YYDEBUG(5, *YYCURSOR);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy6;
-	if (yych <= '9') goto yy12;
-	if (yych == 'T') goto yy14;
+#line 317 "ext/date/lib/parse_iso_intervals.re"
+	{
+		add_error(s, "Unexpected character");
+		goto std;
+	}
+#line 267 "<stdout>"
 yy6:
 	YYDEBUG(6, *YYCURSOR);
+	++YYCURSOR;
+	YYDEBUG(7, *YYCURSOR);
+#line 306 "ext/date/lib/parse_iso_intervals.re"
+	{
+		goto std;
+	}
+#line 276 "<stdout>"
+yy8:
+	YYDEBUG(8, *YYCURSOR);
+	yyaccept = 0;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') goto yy5;
+	if (yych <= '9') goto yy12;
+	goto yy5;
+yy9:
+	YYDEBUG(9, *YYCURSOR);
+	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') goto yy10;
+	if (yych <= '9') goto yy14;
+	if (yych == 'T') goto yy15;
+yy10:
+	YYDEBUG(10, *YYCURSOR);
 #line 244 "ext/date/lib/parse_iso_intervals.re"
 	{
 		timelib_sll nr;
@@ -312,189 +330,197 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_PERIOD;
 	}
-#line 316 "<stdout>"
-yy7:
-	YYDEBUG(7, *YYCURSOR);
-	++YYCURSOR;
-	YYDEBUG(8, *YYCURSOR);
-#line 306 "ext/date/lib/parse_iso_intervals.re"
-	{
-		goto std;
-	}
-#line 325 "<stdout>"
-yy9:
-	YYDEBUG(9, *YYCURSOR);
-	++YYCURSOR;
-	YYDEBUG(10, *YYCURSOR);
-#line 311 "ext/date/lib/parse_iso_intervals.re"
-	{
-		s->pos = cursor; s->line++;
-		goto std;
-	}
-#line 335 "<stdout>"
+#line 334 "<stdout>"
 yy11:
 	YYDEBUG(11, *YYCURSOR);
 	yych = *++YYCURSOR;
-	goto yy3;
+	if (yybm0+yych & 128) {
+		goto yy16;
+	}
+	goto yy5;
 yy12:
 	YYDEBUG(12, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= 'L') {
-		if (yych <= '9') {
-			if (yych >= '0') goto yy25;
-		} else {
-			if (yych == 'D') goto yy24;
-		}
-	} else {
-		if (yych <= 'W') {
-			if (yych <= 'M') goto yy27;
-			if (yych >= 'W') goto yy26;
-		} else {
-			if (yych == 'Y') goto yy28;
-		}
-	}
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy19;
 yy13:
 	YYDEBUG(13, *YYCURSOR);
 	YYCURSOR = YYMARKER;
 	if (yyaccept == 0) {
-		goto yy3;
+		goto yy5;
 	} else {
-		goto yy6;
+		goto yy10;
 	}
 yy14:
 	YYDEBUG(14, *YYCURSOR);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm0+yych & 128) {
-		goto yy15;
+	yych = *++YYCURSOR;
+	if (yych <= 'L') {
+		if (yych <= '9') {
+			if (yych <= '/') goto yy13;
+			goto yy20;
+		} else {
+			if (yych == 'D') goto yy21;
+			goto yy13;
+		}
+	} else {
+		if (yych <= 'W') {
+			if (yych <= 'M') goto yy22;
+			if (yych <= 'V') goto yy13;
+			goto yy23;
+		} else {
+			if (yych == 'Y') goto yy24;
+			goto yy13;
+		}
 	}
-	goto yy6;
 yy15:
 	YYDEBUG(15, *YYCURSOR);
+	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') goto yy10;
+	if (yych <= '9') goto yy25;
+	goto yy10;
+yy16:
+	YYDEBUG(16, *YYCURSOR);
 	++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	YYDEBUG(16, *YYCURSOR);
+	YYDEBUG(17, *YYCURSOR);
 	if (yybm0+yych & 128) {
-		goto yy15;
+		goto yy16;
 	}
+	YYDEBUG(18, *YYCURSOR);
+#line 209 "ext/date/lib/parse_iso_intervals.re"
+	{
+		DEBUG_OUTPUT("recurrences");
+		TIMELIB_INIT;
+		ptr++;
+		s->recurrences = timelib_get_unsigned_nr(&ptr, 9);
+		TIMELIB_DEINIT;
+		s->have_recurrences = 1;
+		return TIMELIB_PERIOD;
+	}
+#line 403 "<stdout>"
+yy19:
+	YYDEBUG(19, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy27;
+	goto yy13;
+yy20:
+	YYDEBUG(20, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if (yych <= 'L') {
-		if (yych == 'H') goto yy19;
-		goto yy13;
+		if (yych <= '9') {
+			if (yych <= '/') goto yy13;
+			goto yy28;
+		} else {
+			if (yych != 'D') goto yy13;
+		}
 	} else {
-		if (yych <= 'M') goto yy18;
-		if (yych != 'S') goto yy13;
+		if (yych <= 'W') {
+			if (yych <= 'M') goto yy22;
+			if (yych <= 'V') goto yy13;
+			goto yy23;
+		} else {
+			if (yych == 'Y') goto yy24;
+			goto yy13;
+		}
 	}
-yy17:
-	YYDEBUG(17, *YYCURSOR);
+yy21:
+	YYDEBUG(21, *YYCURSOR);
 	yych = *++YYCURSOR;
-	goto yy6;
-yy18:
-	YYDEBUG(18, *YYCURSOR);
+	if (yych == 'T') goto yy15;
+	goto yy10;
+yy22:
+	YYDEBUG(22, *YYCURSOR);
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy6;
-	if (yych <= '9') goto yy22;
-	goto yy6;
-yy19:
-	YYDEBUG(19, *YYCURSOR);
+	if (yych <= '/') goto yy10;
+	if (yych <= '9') goto yy29;
+	if (yych == 'T') goto yy15;
+	goto yy10;
+yy23:
+	YYDEBUG(23, *YYCURSOR);
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy6;
-	if (yych >= ':') goto yy6;
-yy20:
-	YYDEBUG(20, *YYCURSOR);
+	if (yych <= '/') goto yy10;
+	if (yych <= '9') goto yy31;
+	if (yych == 'T') goto yy15;
+	goto yy10;
+yy24:
+	YYDEBUG(24, *YYCURSOR);
+	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') goto yy10;
+	if (yych <= '9') goto yy33;
+	if (yych == 'T') goto yy15;
+	goto yy10;
+yy25:
+	YYDEBUG(25, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	YYDEBUG(21, *YYCURSOR);
-	if (yych <= 'L') {
+	YYDEBUG(26, *YYCURSOR);
+	if (yych <= 'H') {
 		if (yych <= '/') goto yy13;
-		if (yych <= '9') goto yy20;
+		if (yych <= '9') goto yy25;
+		if (yych <= 'G') goto yy13;
+		goto yy35;
+	} else {
+		if (yych <= 'M') {
+			if (yych <= 'L') goto yy13;
+			goto yy36;
+		} else {
+			if (yych == 'S') goto yy37;
+			goto yy13;
+		}
+	}
+yy27:
+	YYDEBUG(27, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') {
+		if (yych == '-') goto yy38;
 		goto yy13;
 	} else {
-		if (yych <= 'M') goto yy18;
-		if (yych == 'S') goto yy17;
+		if (yych <= '0') goto yy39;
+		if (yych <= '1') goto yy40;
 		goto yy13;
 	}
-yy22:
-	YYDEBUG(22, *YYCURSOR);
-	++YYCURSOR;
-	if (YYLIMIT <= YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	YYDEBUG(23, *YYCURSOR);
-	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy22;
-	if (yych == 'S') goto yy17;
-	goto yy13;
-yy24:
-	YYDEBUG(24, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy14;
-	goto yy6;
-yy25:
-	YYDEBUG(25, *YYCURSOR);
+yy28:
+	YYDEBUG(28, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= 'L') {
 		if (yych <= '9') {
 			if (yych <= '/') goto yy13;
-			goto yy35;
+			goto yy41;
 		} else {
-			if (yych == 'D') goto yy24;
+			if (yych == 'D') goto yy21;
 			goto yy13;
 		}
 	} else {
 		if (yych <= 'W') {
-			if (yych <= 'M') goto yy27;
+			if (yych <= 'M') goto yy22;
 			if (yych <= 'V') goto yy13;
+			goto yy23;
 		} else {
-			if (yych == 'Y') goto yy28;
+			if (yych == 'Y') goto yy24;
 			goto yy13;
 		}
 	}
-yy26:
-	YYDEBUG(26, *YYCURSOR);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy6;
-	if (yych <= '9') goto yy33;
-	if (yych == 'T') goto yy14;
-	goto yy6;
-yy27:
-	YYDEBUG(27, *YYCURSOR);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy6;
-	if (yych <= '9') goto yy31;
-	if (yych == 'T') goto yy14;
-	goto yy6;
-yy28:
-	YYDEBUG(28, *YYCURSOR);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy6;
-	if (yych <= '9') goto yy29;
-	if (yych == 'T') goto yy14;
-	goto yy6;
 yy29:
 	YYDEBUG(29, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	YYDEBUG(30, *YYCURSOR);
-	if (yych <= 'D') {
+	if (yych <= 'C') {
 		if (yych <= '/') goto yy13;
 		if (yych <= '9') goto yy29;
-		if (yych <= 'C') goto yy13;
-		goto yy24;
+		goto yy13;
 	} else {
-		if (yych <= 'M') {
-			if (yych <= 'L') goto yy13;
-			goto yy27;
-		} else {
-			if (yych == 'W') goto yy26;
-			goto yy13;
-		}
+		if (yych <= 'D') goto yy21;
+		if (yych == 'W') goto yy23;
+		goto yy13;
 	}
 yy31:
 	YYDEBUG(31, *YYCURSOR);
@@ -502,313 +528,372 @@
 	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	YYDEBUG(32, *YYCURSOR);
-	if (yych <= 'C') {
-		if (yych <= '/') goto yy13;
-		if (yych <= '9') goto yy31;
-		goto yy13;
-	} else {
-		if (yych <= 'D') goto yy24;
-		if (yych == 'W') goto yy26;
-		goto yy13;
-	}
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy31;
+	if (yych == 'D') goto yy21;
+	goto yy13;
 yy33:
 	YYDEBUG(33, *YYCURSOR);
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	YYDEBUG(34, *YYCURSOR);
-	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy33;
-	if (yych == 'D') goto yy24;
-	goto yy13;
-yy35:
-	YYDEBUG(35, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= 'L') {
-		if (yych <= '9') {
-			if (yych <= '/') goto yy13;
-		} else {
-			if (yych == 'D') goto yy24;
-			goto yy13;
-		}
+	if (yych <= 'D') {
+		if (yych <= '/') goto yy13;
+		if (yych <= '9') goto yy33;
+		if (yych <= 'C') goto yy13;
+		goto yy21;
 	} else {
-		if (yych <= 'W') {
-			if (yych <= 'M') goto yy27;
-			if (yych <= 'V') goto yy13;
-			goto yy26;
+		if (yych <= 'M') {
+			if (yych <= 'L') goto yy13;
+			goto yy22;
 		} else {
-			if (yych == 'Y') goto yy28;
+			if (yych == 'W') goto yy23;
 			goto yy13;
 		}
 	}
+yy35:
+	YYDEBUG(35, *YYCURSOR);
+	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') goto yy10;
+	if (yych <= '9') goto yy42;
+	goto yy10;
+yy36:
 	YYDEBUG(36, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych != '-') goto yy39;
+	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= '/') goto yy10;
+	if (yych <= '9') goto yy44;
+	goto yy10;
+yy37:
 	YYDEBUG(37, *YYCURSOR);
+	++YYCURSOR;
+	goto yy10;
+yy38:
+	YYDEBUG(38, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '0') goto yy40;
-	if (yych <= '1') goto yy41;
+	if (yych <= '0') goto yy46;
+	if (yych <= '1') goto yy47;
 	goto yy13;
-yy38:
-	YYDEBUG(38, *YYCURSOR);
-	++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
-	yych = *YYCURSOR;
 yy39:
 	YYDEBUG(39, *YYCURSOR);
-	if (yych <= 'L') {
-		if (yych <= '9') {
-			if (yych <= '/') goto yy13;
-			goto yy38;
-		} else {
-			if (yych == 'D') goto yy24;
-			goto yy13;
-		}
-	} else {
-		if (yych <= 'W') {
-			if (yych <= 'M') goto yy27;
-			if (yych <= 'V') goto yy13;
-			goto yy26;
-		} else {
-			if (yych == 'Y') goto yy28;
-			goto yy13;
-		}
-	}
+	yych = *++YYCURSOR;
+	if (yych <= '0') goto yy13;
+	if (yych <= '9') goto yy48;
+	goto yy13;
 yy40:
 	YYDEBUG(40, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy42;
+	if (yych <= '2') goto yy48;
 	goto yy13;
 yy41:
 	YYDEBUG(41, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '3') goto yy13;
+	if (yych == '-') goto yy49;
+	goto yy51;
 yy42:
 	YYDEBUG(42, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych != '-') goto yy13;
+	++YYCURSOR;
+	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	yych = *YYCURSOR;
 	YYDEBUG(43, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych <= '0') goto yy44;
-	if (yych <= '2') goto yy45;
-	if (yych <= '3') goto yy46;
-	goto yy13;
+	if (yych <= 'L') {
+		if (yych <= '/') goto yy13;
+		if (yych <= '9') goto yy42;
+		goto yy13;
+	} else {
+		if (yych <= 'M') goto yy36;
+		if (yych == 'S') goto yy37;
+		goto yy13;
+	}
 yy44:
 	YYDEBUG(44, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy47;
-	goto yy13;
-yy45:
+	++YYCURSOR;
+	if (YYLIMIT <= YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
 	YYDEBUG(45, *YYCURSOR);
-	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy47;
+	if (yych <= '9') goto yy44;
+	if (yych == 'S') goto yy37;
 	goto yy13;
 yy46:
 	YYDEBUG(46, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '2') goto yy13;
+	if (yych <= '0') goto yy13;
+	if (yych <= '9') goto yy52;
+	goto yy13;
 yy47:
 	YYDEBUG(47, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != 'T') goto yy13;
+	if (yych <= '/') goto yy13;
+	if (yych <= '2') goto yy52;
+	goto yy13;
+yy48:
 	YYDEBUG(48, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '1') goto yy49;
-	if (yych <= '2') goto yy50;
+	if (yych <= '0') goto yy53;
+	if (yych <= '2') goto yy54;
+	if (yych <= '3') goto yy55;
 	goto yy13;
 yy49:
 	YYDEBUG(49, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy51;
+	if (yych <= '0') goto yy56;
+	if (yych <= '1') goto yy57;
 	goto yy13;
 yy50:
 	YYDEBUG(50, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '5') goto yy13;
+	++YYCURSOR;
+	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+	yych = *YYCURSOR;
 yy51:
 	YYDEBUG(51, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych != ':') goto yy13;
+	if (yych <= 'L') {
+		if (yych <= '9') {
+			if (yych <= '/') goto yy13;
+			goto yy50;
+		} else {
+			if (yych == 'D') goto yy21;
+			goto yy13;
+		}
+	} else {
+		if (yych <= 'W') {
+			if (yych <= 'M') goto yy22;
+			if (yych <= 'V') goto yy13;
+			goto yy23;
+		} else {
+			if (yych == 'Y') goto yy24;
+			goto yy13;
+		}
+	}
+yy52:
 	YYDEBUG(52, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '6') goto yy13;
+	if (yych == '-') goto yy58;
+	goto yy13;
+yy53:
 	YYDEBUG(53, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= ':') goto yy13;
+	if (yych <= '0') goto yy13;
+	if (yych <= '9') goto yy59;
+	goto yy13;
+yy54:
 	YYDEBUG(54, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != ':') goto yy13;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy59;
+	goto yy13;
+yy55:
 	YYDEBUG(55, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych >= '6') goto yy13;
+	if (yych <= '1') goto yy59;
+	goto yy13;
+yy56:
 	YYDEBUG(56, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych >= ':') goto yy13;
+	if (yych <= '9') goto yy60;
+	goto yy13;
+yy57:
 	YYDEBUG(57, *YYCURSOR);
-	++YYCURSOR;
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy13;
+	if (yych <= '2') goto yy60;
+	goto yy13;
+yy58:
 	YYDEBUG(58, *YYCURSOR);
-#line 286 "ext/date/lib/parse_iso_intervals.re"
-	{
-		DEBUG_OUTPUT("combinedrep");
-		TIMELIB_INIT;
-		s->period->y = timelib_get_unsigned_nr(&ptr, 4);
-		ptr++;
-		s->period->m = timelib_get_unsigned_nr(&ptr, 2);
-		ptr++;
-		s->period->d = timelib_get_unsigned_nr(&ptr, 2);
-		ptr++;
-		s->period->h = timelib_get_unsigned_nr(&ptr, 2);
-		ptr++;
-		s->period->i = timelib_get_unsigned_nr(&ptr, 2);
-		ptr++;
-		s->period->s = timelib_get_unsigned_nr(&ptr, 2);
-		s->have_period = 1;
-		TIMELIB_DEINIT;
-		return TIMELIB_PERIOD;
-	}
-#line 684 "<stdout>"
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy13;
+	if (yych <= '0') goto yy61;
+	if (yych <= '2') goto yy62;
+	if (yych <= '3') goto yy63;
+	goto yy13;
 yy59:
 	YYDEBUG(59, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= ':') goto yy13;
+	if (yych == 'T') goto yy64;
+	goto yy13;
+yy60:
 	YYDEBUG(60, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= ':') goto yy13;
+	if (yych == '-') goto yy65;
+	goto yy13;
+yy61:
 	YYDEBUG(61, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') {
-		if (yych == '-') goto yy64;
-		goto yy13;
-	} else {
-		if (yych <= '0') goto yy62;
-		if (yych <= '1') goto yy63;
-		goto yy13;
-	}
+	if (yych <= '0') goto yy13;
+	if (yych <= '9') goto yy66;
+	goto yy13;
 yy62:
 	YYDEBUG(62, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '0') goto yy13;
-	if (yych <= '9') goto yy85;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy66;
 	goto yy13;
 yy63:
 	YYDEBUG(63, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '2') goto yy85;
+	if (yych <= '1') goto yy66;
 	goto yy13;
 yy64:
 	YYDEBUG(64, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '0') goto yy65;
-	if (yych <= '1') goto yy66;
+	if (yych <= '1') goto yy67;
+	if (yych <= '2') goto yy68;
 	goto yy13;
 yy65:
 	YYDEBUG(65, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '0') goto yy13;
-	if (yych <= '9') goto yy67;
+	if (yych <= '/') goto yy13;
+	if (yych <= '2') goto yy69;
+	if (yych <= '3') goto yy70;
 	goto yy13;
 yy66:
 	YYDEBUG(66, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '3') goto yy13;
+	if (yych == 'T') goto yy71;
+	goto yy13;
 yy67:
 	YYDEBUG(67, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != '-') goto yy13;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy72;
+	goto yy13;
+yy68:
 	YYDEBUG(68, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '0') goto yy69;
-	if (yych <= '2') goto yy70;
-	if (yych <= '3') goto yy71;
+	if (yych <= '4') goto yy72;
 	goto yy13;
 yy69:
 	YYDEBUG(69, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '0') goto yy13;
-	if (yych <= '9') goto yy72;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy73;
 	goto yy13;
 yy70:
 	YYDEBUG(70, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy72;
+	if (yych <= '1') goto yy73;
 	goto yy13;
 yy71:
 	YYDEBUG(71, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych >= '2') goto yy13;
+	if (yych <= '1') goto yy74;
+	if (yych <= '2') goto yy75;
+	goto yy13;
 yy72:
 	YYDEBUG(72, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != 'T') goto yy13;
+	if (yych <= '/') goto yy13;
+	if (yych <= '5') goto yy76;
+	goto yy13;
+yy73:
 	YYDEBUG(73, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych <= '1') goto yy74;
-	if (yych <= '2') goto yy75;
+	if (yych == 'T') goto yy77;
 	goto yy13;
 yy74:
 	YYDEBUG(74, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy76;
+	if (yych <= '9') goto yy78;
 	goto yy13;
 yy75:
 	YYDEBUG(75, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych >= '5') goto yy13;
+	if (yych <= '4') goto yy78;
+	goto yy13;
 yy76:
 	YYDEBUG(76, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != ':') goto yy13;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy79;
+	goto yy13;
+yy77:
 	YYDEBUG(77, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych >= '6') goto yy13;
+	if (yych <= '1') goto yy80;
+	if (yych <= '2') goto yy81;
+	goto yy13;
+yy78:
 	YYDEBUG(78, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= ':') goto yy13;
+	if (yych == ':') goto yy82;
+	goto yy13;
+yy79:
 	YYDEBUG(79, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != ':') goto yy13;
+	if (yych <= '/') goto yy13;
+	if (yych <= '5') goto yy83;
+	goto yy13;
+yy80:
 	YYDEBUG(80, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych >= '6') goto yy13;
+	if (yych <= '9') goto yy84;
+	goto yy13;
+yy81:
 	YYDEBUG(81, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych >= ':') goto yy13;
+	if (yych <= '4') goto yy84;
+	goto yy13;
+yy82:
 	YYDEBUG(82, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != 'Z') goto yy13;
+	if (yych <= '/') goto yy13;
+	if (yych <= '5') goto yy85;
+	goto yy13;
 yy83:
 	YYDEBUG(83, *YYCURSOR);
-	++YYCURSOR;
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy86;
+	goto yy13;
+yy84:
 	YYDEBUG(84, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == ':') goto yy87;
+	goto yy13;
+yy85:
+	YYDEBUG(85, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy13;
+	if (yych <= '9') goto yy88;
+	goto yy13;
+yy86:
+	YYDEBUG(86, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == 'Z') goto yy89;
+	goto yy13;
+yy87:
+	YYDEBUG(87, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy13;
+	if (yych <= '5') goto yy91;
+	goto yy13;
+yy88:
+	YYDEBUG(88, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == ':') goto yy79;
+	goto yy13;
+yy89:
+	YYDEBUG(89, *YYCURSOR);
+	++YYCURSOR;
+	YYDEBUG(90, *YYCURSOR);
 #line 220 "ext/date/lib/parse_iso_intervals.re"
 	{
 		timelib_time *current;
@@ -832,54 +917,15 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 836 "<stdout>"
-yy85:
-	YYDEBUG(85, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych <= '0') goto yy86;
-	if (yych <= '2') goto yy87;
-	if (yych <= '3') goto yy88;
-	goto yy13;
-yy86:
-	YYDEBUG(86, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '0') goto yy13;
-	if (yych <= '9') goto yy89;
-	goto yy13;
-yy87:
-	YYDEBUG(87, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy89;
-	goto yy13;
-yy88:
-	YYDEBUG(88, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '2') goto yy13;
-yy89:
-	YYDEBUG(89, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych != 'T') goto yy13;
-	YYDEBUG(90, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych <= '1') goto yy91;
-	if (yych <= '2') goto yy92;
-	goto yy13;
+#line 921 "<stdout>"
 yy91:
 	YYDEBUG(91, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
-	if (yych <= '9') goto yy93;
-	goto yy13;
-yy92:
+	if (yych >= ':') goto yy13;
 	YYDEBUG(92, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '5') goto yy13;
-yy93:
+	if (yych != ':') goto yy13;
 	YYDEBUG(93, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy13;
@@ -889,38 +935,28 @@
 	if (yych <= '/') goto yy13;
 	if (yych >= ':') goto yy13;
 	YYDEBUG(95, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= '6') goto yy13;
-	YYDEBUG(96, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy13;
-	if (yych >= ':') goto yy13;
-	YYDEBUG(97, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'Z') goto yy83;
-	goto yy13;
-yy98:
-	YYDEBUG(98, *YYCURSOR);
 	++YYCURSOR;
-	if (YYLIMIT <= YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	YYDEBUG(99, *YYCURSOR);
-	if (yych <= '/') goto yy100;
-	if (yych <= '9') goto yy98;
-yy100:
-	YYDEBUG(100, *YYCURSOR);
-#line 209 "ext/date/lib/parse_iso_intervals.re"
+	YYDEBUG(96, *YYCURSOR);
+#line 286 "ext/date/lib/parse_iso_intervals.re"
 	{
-		DEBUG_OUTPUT("recurrences");
+		DEBUG_OUTPUT("combinedrep");
 		TIMELIB_INIT;
+		s->period->y = timelib_get_unsigned_nr(&ptr, 4);
 		ptr++;
-		s->recurrences = timelib_get_unsigned_nr(&ptr, 9);
+		s->period->m = timelib_get_unsigned_nr(&ptr, 2);
+		ptr++;
+		s->period->d = timelib_get_unsigned_nr(&ptr, 2);
+		ptr++;
+		s->period->h = timelib_get_unsigned_nr(&ptr, 2);
+		ptr++;
+		s->period->i = timelib_get_unsigned_nr(&ptr, 2);
+		ptr++;
+		s->period->s = timelib_get_unsigned_nr(&ptr, 2);
+		s->have_period = 1;
 		TIMELIB_DEINIT;
-		s->have_recurrences = 1;
 		return TIMELIB_PERIOD;
 	}
-#line 924 "<stdout>"
+#line 960 "<stdout>"
 }
 #line 321 "ext/date/lib/parse_iso_intervals.re"
 
@@ -931,6 +967,7 @@
 
 #define YYMAXFILL 20
 
+
 void timelib_strtointerval(const char *s, size_t len,
                            timelib_time **begin, timelib_time **end,
 						   timelib_rel_time **period, int *recurrences,

php-8.2.23.tar.xz/ext/date/lib/timelib.h -> php-8.2.28.tar.xz/ext/date/lib/timelib.h Changed

php-8.2.23.tar.xz/ext/date/lib/timelib_private.h -> php-8.2.28.tar.xz/ext/date/lib/timelib_private.h Changed

php-8.2.23.tar.xz/ext/date/lib/timezonedb.h -> php-8.2.28.tar.xz/ext/date/lib/timezonedb.h Changed

@@ -83,529 +83,529 @@
 	{ (char*) "America/Atka"                      , 0x007720 },
 	{ (char*) "America/Bahia"                     , 0x007AF5 },
 	{ (char*) "America/Bahia_Banderas"            , 0x007DB0 },
-	{ (char*) "America/Barbados"                  , 0x0080A5 },
-	{ (char*) "America/Belem"                     , 0x0081C7 },
-	{ (char*) "America/Belize"                    , 0x00836F },
-	{ (char*) "America/Blanc-Sablon"              , 0x008790 },
-	{ (char*) "America/Boa_Vista"                 , 0x008885 },
-	{ (char*) "America/Bogota"                    , 0x008A46 },
-	{ (char*) "America/Boise"                     , 0x008B05 },
-	{ (char*) "America/Buenos_Aires"              , 0x008F18 },
-	{ (char*) "America/Cambridge_Bay"             , 0x0091E8 },
-	{ (char*) "America/Campo_Grande"              , 0x00957B },
-	{ (char*) "America/Cancun"                    , 0x009951 },
-	{ (char*) "America/Caracas"                   , 0x009B7A },
-	{ (char*) "America/Catamarca"                 , 0x009C44 },
-	{ (char*) "America/Cayenne"                   , 0x009F14 },
-	{ (char*) "America/Cayman"                    , 0x009FB7 },
-	{ (char*) "America/Chicago"                   , 0x00A058 },
-	{ (char*) "America/Chihuahua"                 , 0x00A752 },
-	{ (char*) "America/Ciudad_Juarez"             , 0x00AA27 },
-	{ (char*) "America/Coral_Harbour"             , 0x00AD1D },
-	{ (char*) "America/Cordoba"                   , 0x00ADBE },
-	{ (char*) "America/Costa_Rica"                , 0x00B08E },
-	{ (char*) "America/Creston"                   , 0x00B182 },
-	{ (char*) "America/Cuiaba"                    , 0x00B23E },
-	{ (char*) "America/Curacao"                   , 0x00B5FB },
-	{ (char*) "America/Danmarkshavn"              , 0x00B69E },
-	{ (char*) "America/Dawson"                    , 0x00B883 },
-	{ (char*) "America/Dawson_Creek"              , 0x00BCA6 },
-	{ (char*) "America/Denver"                    , 0x00BF7D },
-	{ (char*) "America/Detroit"                   , 0x00C3B0 },
-	{ (char*) "America/Dominica"                  , 0x00C758 },
-	{ (char*) "America/Edmonton"                  , 0x00C7E6 },
-	{ (char*) "America/Eirunepe"                  , 0x00CBDE },
-	{ (char*) "America/El_Salvador"               , 0x00CDAD },
-	{ (char*) "America/Ensenada"                  , 0x00CE69 },
-	{ (char*) "America/Fort_Nelson"               , 0x00D276 },
-	{ (char*) "America/Fort_Wayne"                , 0x00D83E },
-	{ (char*) "America/Fortaleza"                 , 0x00DA5D },
-	{ (char*) "America/Glace_Bay"                 , 0x00DC73 },
-	{ (char*) "America/Godthab"                   , 0x00E00A },
-	{ (char*) "America/Goose_Bay"                 , 0x00E3DB },
-	{ (char*) "America/Grand_Turk"                , 0x00EA33 },
-	{ (char*) "America/Grenada"                   , 0x00ED94 },
-	{ (char*) "America/Guadeloupe"                , 0x00EE22 },
-	{ (char*) "America/Guatemala"                 , 0x00EEB0 },
-	{ (char*) "America/Guayaquil"                 , 0x00EF90 },
-	{ (char*) "America/Guyana"                    , 0x00F061 },
-	{ (char*) "America/Halifax"                   , 0x00F122 },
-	{ (char*) "America/Havana"                    , 0x00F7D4 },
-	{ (char*) "America/Hermosillo"                , 0x00FC3D },
-	{ (char*) "America/Indiana/Indianapolis"      , 0x00FD6D },
-	{ (char*) "America/Indiana/Knox"              , 0x00FFA5 },
-	{ (char*) "America/Indiana/Marengo"           , 0x0103BE },
-	{ (char*) "America/Indiana/Petersburg"        , 0x010618 },
-	{ (char*) "America/Indiana/Tell_City"         , 0x0108E2 },
-	{ (char*) "America/Indiana/Vevay"             , 0x010B0C },
-	{ (char*) "America/Indiana/Vincennes"         , 0x010CA3 },
-	{ (char*) "America/Indiana/Winamac"           , 0x010EF9 },
-	{ (char*) "America/Indianapolis"              , 0x011176 },
-	{ (char*) "America/Inuvik"                    , 0x011395 },
-	{ (char*) "America/Iqaluit"                   , 0x0116E6 },
-	{ (char*) "America/Jamaica"                   , 0x011A62 },
-	{ (char*) "America/Jujuy"                     , 0x011BC1 },
-	{ (char*) "America/Juneau"                    , 0x011E7F },
-	{ (char*) "America/Kentucky/Louisville"       , 0x012265 },
-	{ (char*) "America/Kentucky/Monticello"       , 0x012769 },
-	{ (char*) "America/Knox_IN"                   , 0x012B55 },
-	{ (char*) "America/Kralendijk"                , 0x012F59 },
-	{ (char*) "America/La_Paz"                    , 0x013016 },
-	{ (char*) "America/Lima"                      , 0x0130CC },
-	{ (char*) "America/Los_Angeles"               , 0x0131F3 },
-	{ (char*) "America/Louisville"                , 0x013714 },
-	{ (char*) "America/Lower_Princes"             , 0x013BFA },
-	{ (char*) "America/Maceio"                    , 0x013CB7 },
-	{ (char*) "America/Managua"                   , 0x013EC9 },
-	{ (char*) "America/Manaus"                    , 0x013FFC },
-	{ (char*) "America/Marigot"                   , 0x0141B3 },
-	{ (char*) "America/Martinique"                , 0x014270 },
-	{ (char*) "America/Matamoros"                 , 0x01432E },
-	{ (char*) "America/Mazatlan"                  , 0x01451B },
-	{ (char*) "America/Mendoza"                   , 0x014827 },
-	{ (char*) "America/Menominee"                 , 0x014AF7 },
-	{ (char*) "America/Merida"                    , 0x014EB7 },
-	{ (char*) "America/Metlakatla"                , 0x015162 },
-	{ (char*) "America/Mexico_City"               , 0x0153CF },
-	{ (char*) "America/Miquelon"                  , 0x0156EE },
-	{ (char*) "America/Moncton"                   , 0x015920 },
-	{ (char*) "America/Monterrey"                 , 0x015F19 },
-	{ (char*) "America/Montevideo"                , 0x0161DF },
-	{ (char*) "America/Montreal"                  , 0x0165B4 },
-	{ (char*) "America/Montserrat"                , 0x016C75 },
-	{ (char*) "America/Nassau"                    , 0x016D03 },
-	{ (char*) "America/New_York"                  , 0x0170FD },
-	{ (char*) "America/Nipigon"                   , 0x0177ED },
-	{ (char*) "America/Nome"                      , 0x017EAE },
-	{ (char*) "America/Noronha"                   , 0x018296 },
-	{ (char*) "America/North_Dakota/Beulah"       , 0x018496 },
-	{ (char*) "America/North_Dakota/Center"       , 0x0188CA },
-	{ (char*) "America/North_Dakota/New_Salem"    , 0x018CC9 },
-	{ (char*) "America/Nuuk"                      , 0x0190CE },
-	{ (char*) "America/Ojinaga"                   , 0x0194B0 },
-	{ (char*) "America/Panama"                    , 0x0197A6 },
-	{ (char*) "America/Pangnirtung"               , 0x019847 },
-	{ (char*) "America/Paramaribo"                , 0x019BAA },
-	{ (char*) "America/Phoenix"                   , 0x019C71 },
-	{ (char*) "America/Port-au-Prince"            , 0x019D85 },
-	{ (char*) "America/Port_of_Spain"             , 0x019FC6 },
-	{ (char*) "America/Porto_Acre"                , 0x01A054 },
-	{ (char*) "America/Porto_Velho"               , 0x01A202 },
-	{ (char*) "America/Puerto_Rico"               , 0x01A3A0 },
-	{ (char*) "America/Punta_Arenas"              , 0x01A45D },
-	{ (char*) "America/Rainy_River"               , 0x01A93F },
-	{ (char*) "America/Rankin_Inlet"              , 0x01AE59 },
-	{ (char*) "America/Recife"                    , 0x01B1A2 },
-	{ (char*) "America/Regina"                    , 0x01B39C },
-	{ (char*) "America/Resolute"                  , 0x01B63B },
-	{ (char*) "America/Rio_Branco"                , 0x01B985 },
-	{ (char*) "America/Rosario"                   , 0x01BB37 },
-	{ (char*) "America/Santa_Isabel"              , 0x01BE07 },
-	{ (char*) "America/Santarem"                  , 0x01C214 },
-	{ (char*) "America/Santiago"                  , 0x01C3C4 },
-	{ (char*) "America/Santo_Domingo"             , 0x01C927 },
-	{ (char*) "America/Sao_Paulo"                 , 0x01CA70 },
-	{ (char*) "America/Scoresbysund"              , 0x01CE6A },
-	{ (char*) "America/Shiprock"                  , 0x01D26B },
-	{ (char*) "America/Sitka"                     , 0x01D689 },
-	{ (char*) "America/St_Barthelemy"             , 0x01DA64 },
-	{ (char*) "America/St_Johns"                  , 0x01DB21 },
-	{ (char*) "America/St_Kitts"                  , 0x01E29E },
-	{ (char*) "America/St_Lucia"                  , 0x01E32C },
-	{ (char*) "America/St_Thomas"                 , 0x01E3CD },
-	{ (char*) "America/St_Vincent"                , 0x01E45B },
-	{ (char*) "America/Swift_Current"             , 0x01E4FC },
-	{ (char*) "America/Tegucigalpa"               , 0x01E68A },
-	{ (char*) "America/Thule"                     , 0x01E758 },
-	{ (char*) "America/Thunder_Bay"               , 0x01E939 },
-	{ (char*) "America/Tijuana"                   , 0x01EFFA },
-	{ (char*) "America/Toronto"                   , 0x01F416 },
-	{ (char*) "America/Tortola"                   , 0x01FAF5 },
-	{ (char*) "America/Vancouver"                 , 0x01FB83 },
-	{ (char*) "America/Virgin"                    , 0x0200DA },
-	{ (char*) "America/Whitehorse"                , 0x020197 },
-	{ (char*) "America/Winnipeg"                  , 0x0205BA },
-	{ (char*) "America/Yakutat"                   , 0x020AF1 },
-	{ (char*) "America/Yellowknife"               , 0x020EBF },
-	{ (char*) "Antarctica/Casey"                  , 0x021295 },
-	{ (char*) "Antarctica/Davis"                  , 0x0213C5 },
-	{ (char*) "Antarctica/DumontDUrville"         , 0x02149B },
-	{ (char*) "Antarctica/Macquarie"              , 0x02154F },
-	{ (char*) "Antarctica/Mawson"                 , 0x02193B },
-	{ (char*) "Antarctica/McMurdo"                , 0x0219E5 },
-	{ (char*) "Antarctica/Palmer"                 , 0x021D17 },
-	{ (char*) "Antarctica/Rothera"                , 0x0220A0 },
-	{ (char*) "Antarctica/South_Pole"             , 0x022137 },
-	{ (char*) "Antarctica/Syowa"                  , 0x022556 },
-	{ (char*) "Antarctica/Troll"                  , 0x0225EC },
-	{ (char*) "Antarctica/Vostok"                 , 0x02269B },
-	{ (char*) "Arctic/Longyearbyen"               , 0x022757 },
-	{ (char*) "Asia/Aden"                         , 0x022A24 },
-	{ (char*) "Asia/Almaty"                       , 0x022AB5 },
-	{ (char*) "Asia/Amman"                        , 0x022D3D },
-	{ (char*) "Asia/Anadyr"                       , 0x0230E9 },
-	{ (char*) "Asia/Aqtau"                        , 0x0233EF },
-	{ (char*) "Asia/Aqtobe"                       , 0x02366E },
-	{ (char*) "Asia/Ashgabat"                     , 0x0238EE },
-	{ (char*) "Asia/Ashkhabad"                    , 0x023A71 },
-	{ (char*) "Asia/Atyrau"                       , 0x023BF4 },
-	{ (char*) "Asia/Baghdad"                      , 0x023E7D },
-	{ (char*) "Asia/Bahrain"                      , 0x0240FF },
-	{ (char*) "Asia/Baku"                         , 0x0241B8 },
-	{ (char*) "Asia/Bangkok"                      , 0x0244AC },
-	{ (char*) "Asia/Barnaul"                      , 0x024550 },
-	{ (char*) "Asia/Beirut"                       , 0x02485B },
-	{ (char*) "Asia/Bishkek"                      , 0x024B43 },
-	{ (char*) "Asia/Brunei"                       , 0x024DB9 },
-	{ (char*) "Asia/Calcutta"                     , 0x024E5F },
-	{ (char*) "Asia/Chita"                        , 0x024F47 },
-	{ (char*) "Asia/Choibalsan"                   , 0x025255 },
-	{ (char*) "Asia/Chongqing"                    , 0x0254DE },
-	{ (char*) "Asia/Chungking"                    , 0x025673 },
-	{ (char*) "Asia/Colombo"                      , 0x025808 },
-	{ (char*) "Asia/Dacca"                        , 0x02590B },
-	{ (char*) "Asia/Damascus"                     , 0x0259FE },
-	{ (char*) "Asia/Dhaka"                        , 0x025EDC },
-	{ (char*) "Asia/Dili"                         , 0x025FCF },
-	{ (char*) "Asia/Dubai"                        , 0x026085 },
-	{ (char*) "Asia/Dushanbe"                     , 0x026116 },
-	{ (char*) "Asia/Famagusta"                    , 0x026290 },
-	{ (char*) "Asia/Gaza"                         , 0x026657 },
-	{ (char*) "Asia/Harbin"                       , 0x0271F3 },
-	{ (char*) "Asia/Hebron"                       , 0x027388 },
-	{ (char*) "Asia/Ho_Chi_Minh"                  , 0x027F35 },
-	{ (char*) "Asia/Hong_Kong"                    , 0x02802D },
-	{ (char*) "Asia/Hovd"                         , 0x028340 },
-	{ (char*) "Asia/Irkutsk"                      , 0x0285C9 },
-	{ (char*) "Asia/Istanbul"                     , 0x0288E7 },
-	{ (char*) "Asia/Jakarta"                      , 0x028DA3 },
-	{ (char*) "Asia/Jayapura"                     , 0x028EB4 },
-	{ (char*) "Asia/Jerusalem"                    , 0x028FA1 },
-	{ (char*) "Asia/Kabul"                        , 0x0293DF },
-	{ (char*) "Asia/Kamchatka"                    , 0x02948A },
-	{ (char*) "Asia/Karachi"                      , 0x02977F },
-	{ (char*) "Asia/Kashgar"                      , 0x029895 },
-	{ (char*) "Asia/Kathmandu"                    , 0x029926 },
-	{ (char*) "Asia/Katmandu"                     , 0x0299D3 },
-	{ (char*) "Asia/Khandyga"                     , 0x029A80 },
-	{ (char*) "Asia/Kolkata"                      , 0x029DB1 },
-	{ (char*) "Asia/Krasnoyarsk"                  , 0x029E99 },
-	{ (char*) "Asia/Kuala_Lumpur"                 , 0x02A1A3 },
-	{ (char*) "Asia/Kuching"                      , 0x02A2C3 },
-	{ (char*) "Asia/Kuwait"                       , 0x02A41D },
-	{ (char*) "Asia/Macao"                        , 0x02A4AE },
-	{ (char*) "Asia/Macau"                        , 0x02A7D1 },
-	{ (char*) "Asia/Magadan"                      , 0x02AAF4 },
-	{ (char*) "Asia/Makassar"                     , 0x02ADFF },
-	{ (char*) "Asia/Manila"                       , 0x02AF12 },
-	{ (char*) "Asia/Muscat"                       , 0x02B00C },
-	{ (char*) "Asia/Nicosia"                      , 0x02B09D },
-	{ (char*) "Asia/Novokuznetsk"                 , 0x02B30C },
-	{ (char*) "Asia/Novosibirsk"                  , 0x02B5FF },
-	{ (char*) "Asia/Omsk"                         , 0x02B910 },
-	{ (char*) "Asia/Oral"                         , 0x02BC0E },
-	{ (char*) "Asia/Phnom_Penh"                   , 0x02BE9A },
-	{ (char*) "Asia/Pontianak"                    , 0x02BF6E },
-	{ (char*) "Asia/Pyongyang"                    , 0x02C087 },
-	{ (char*) "Asia/Qatar"                        , 0x02C14A },
-	{ (char*) "Asia/Qostanay"                     , 0x02C1EE },
-	{ (char*) "Asia/Qyzylorda"                    , 0x02C484 },
-	{ (char*) "Asia/Rangoon"                      , 0x02C71D },
-	{ (char*) "Asia/Riyadh"                       , 0x02C7E4 },
-	{ (char*) "Asia/Saigon"                       , 0x02C875 },
-	{ (char*) "Asia/Sakhalin"                     , 0x02C96D },
-	{ (char*) "Asia/Samarkand"                    , 0x02CC84 },
-	{ (char*) "Asia/Seoul"                        , 0x02CE0F },
-	{ (char*) "Asia/Shanghai"                     , 0x02CFBA },
-	{ (char*) "Asia/Singapore"                    , 0x02D15B },
-	{ (char*) "Asia/Srednekolymsk"                , 0x02D267 },
-	{ (char*) "Asia/Taipei"                       , 0x02D577 },
-	{ (char*) "Asia/Tashkent"                     , 0x02D782 },
-	{ (char*) "Asia/Tbilisi"                      , 0x02D90D },
-	{ (char*) "Asia/Tehran"                       , 0x02DB8E },
-	{ (char*) "Asia/Tel_Aviv"                     , 0x02DEC6 },
-	{ (char*) "Asia/Thimbu"                       , 0x02E304 },
-	{ (char*) "Asia/Thimphu"                      , 0x02E3AA },
-	{ (char*) "Asia/Tokyo"                        , 0x02E450 },
-	{ (char*) "Asia/Tomsk"                        , 0x02E531 },
-	{ (char*) "Asia/Ujung_Pandang"                , 0x02E83C },
-	{ (char*) "Asia/Ulaanbaatar"                  , 0x02E906 },
-	{ (char*) "Asia/Ulan_Bator"                   , 0x02EB74 },
-	{ (char*) "Asia/Urumqi"                       , 0x02EDD2 },
-	{ (char*) "Asia/Ust-Nera"                     , 0x02EE70 },
-	{ (char*) "Asia/Vientiane"                    , 0x02F193 },
-	{ (char*) "Asia/Vladivostok"                  , 0x02F279 },
-	{ (char*) "Asia/Yakutsk"                      , 0x02F57E },
-	{ (char*) "Asia/Yangon"                       , 0x02F882 },
-	{ (char*) "Asia/Yekaterinburg"                , 0x02F949 },
-	{ (char*) "Asia/Yerevan"                      , 0x02FC5B },
-	{ (char*) "Atlantic/Azores"                   , 0x02FF2B },
-	{ (char*) "Atlantic/Bermuda"                  , 0x0304EA },
-	{ (char*) "Atlantic/Canary"                   , 0x0308F6 },
-	{ (char*) "Atlantic/Cape_Verde"               , 0x030AEE },
-	{ (char*) "Atlantic/Faeroe"                   , 0x030BA9 },
-	{ (char*) "Atlantic/Faroe"                    , 0x030D6E },
-	{ (char*) "Atlantic/Jan_Mayen"                , 0x030F33 },
-	{ (char*) "Atlantic/Madeira"                  , 0x031200 },
-	{ (char*) "Atlantic/Reykjavik"                , 0x0317C8 },
-	{ (char*) "Atlantic/South_Georgia"            , 0x031AC5 },
-	{ (char*) "Atlantic/St_Helena"                , 0x031B55 },
-	{ (char*) "Atlantic/Stanley"                  , 0x031BF6 },
-	{ (char*) "Australia/ACT"                     , 0x031F17 },
-	{ (char*) "Australia/Adelaide"                , 0x0322AB },
-	{ (char*) "Australia/Brisbane"                , 0x03265F },
-	{ (char*) "Australia/Broken_Hill"             , 0x0327A3 },
-	{ (char*) "Australia/Canberra"                , 0x032B78 },
-	{ (char*) "Australia/Currie"                  , 0x032F0C },
-	{ (char*) "Australia/Darwin"                  , 0x033303 },
-	{ (char*) "Australia/Eucla"                   , 0x03340B },
-	{ (char*) "Australia/Hobart"                  , 0x03356A },
-	{ (char*) "Australia/LHI"                     , 0x033969 },
-	{ (char*) "Australia/Lindeman"                , 0x033C29 },
-	{ (char*) "Australia/Lord_Howe"               , 0x033D99 },
-	{ (char*) "Australia/Melbourne"               , 0x034069 },
-	{ (char*) "Australia/North"                   , 0x034405 },
-	{ (char*) "Australia/NSW"                     , 0x0344FB },
-	{ (char*) "Australia/Perth"                   , 0x03488F },
-	{ (char*) "Australia/Queensland"              , 0x0349EB },
-	{ (char*) "Australia/South"                   , 0x034B18 },
-	{ (char*) "Australia/Sydney"                  , 0x034EBD },
-	{ (char*) "Australia/Tasmania"                , 0x03526D },
-	{ (char*) "Australia/Victoria"                , 0x035664 },
-	{ (char*) "Australia/West"                    , 0x0359F8 },
-	{ (char*) "Australia/Yancowinna"              , 0x035B36 },
-	{ (char*) "Brazil/Acre"                       , 0x035EEF },
-	{ (char*) "Brazil/DeNoronha"                  , 0x03609D },
-	{ (char*) "Brazil/East"                       , 0x03628D },
-	{ (char*) "Brazil/West"                       , 0x036651 },
-	{ (char*) "Canada/Atlantic"                   , 0x0367F9 },
-	{ (char*) "Canada/Central"                    , 0x036E8D },
-	{ (char*) "Canada/Eastern"                    , 0x0373A7 },
-	{ (char*) "Canada/Mountain"                   , 0x037A68 },
-	{ (char*) "Canada/Newfoundland"               , 0x037E3E },
-	{ (char*) "Canada/Pacific"                    , 0x0385A0 },
-	{ (char*) "Canada/Saskatchewan"               , 0x038ADE },
-	{ (char*) "Canada/Yukon"                      , 0x038D68 },
-	{ (char*) "CET"                               , 0x039179 },
-	{ (char*) "Chile/Continental"                 , 0x0393F2 },
-	{ (char*) "Chile/EasterIsland"                , 0x039948 },
-	{ (char*) "CST6CDT"                           , 0x039DEA },
-	{ (char*) "Cuba"                              , 0x03A1AD },
-	{ (char*) "EET"                               , 0x03A616 },
-	{ (char*) "Egypt"                             , 0x03A813 },
-	{ (char*) "Eire"                              , 0x03AD3C },
-	{ (char*) "EST"                               , 0x03B320 },
-	{ (char*) "EST5EDT"                           , 0x03B39B },
-	{ (char*) "Etc/GMT"                           , 0x03B75E },
-	{ (char*) "Etc/GMT+0"                         , 0x03B7D9 },
-	{ (char*) "Etc/GMT+1"                         , 0x03B854 },
-	{ (char*) "Etc/GMT+10"                        , 0x03B8D1 },
-	{ (char*) "Etc/GMT+11"                        , 0x03B94F },
-	{ (char*) "Etc/GMT+12"                        , 0x03B9CD },
-	{ (char*) "Etc/GMT+2"                         , 0x03BA4B },
-	{ (char*) "Etc/GMT+3"                         , 0x03BAC8 },
-	{ (char*) "Etc/GMT+4"                         , 0x03BB45 },
-	{ (char*) "Etc/GMT+5"                         , 0x03BBC2 },
-	{ (char*) "Etc/GMT+6"                         , 0x03BC3F },
-	{ (char*) "Etc/GMT+7"                         , 0x03BCBC },
-	{ (char*) "Etc/GMT+8"                         , 0x03BD39 },
-	{ (char*) "Etc/GMT+9"                         , 0x03BDB6 },
-	{ (char*) "Etc/GMT-0"                         , 0x03BE33 },
-	{ (char*) "Etc/GMT-1"                         , 0x03BEAE },
-	{ (char*) "Etc/GMT-10"                        , 0x03BF2C },
-	{ (char*) "Etc/GMT-11"                        , 0x03BFAB },
-	{ (char*) "Etc/GMT-12"                        , 0x03C02A },
-	{ (char*) "Etc/GMT-13"                        , 0x03C0A9 },
-	{ (char*) "Etc/GMT-14"                        , 0x03C128 },
-	{ (char*) "Etc/GMT-2"                         , 0x03C1A7 },
-	{ (char*) "Etc/GMT-3"                         , 0x03C225 },
-	{ (char*) "Etc/GMT-4"                         , 0x03C2A3 },
-	{ (char*) "Etc/GMT-5"                         , 0x03C321 },
-	{ (char*) "Etc/GMT-6"                         , 0x03C39F },
-	{ (char*) "Etc/GMT-7"                         , 0x03C41D },
-	{ (char*) "Etc/GMT-8"                         , 0x03C49B },
-	{ (char*) "Etc/GMT-9"                         , 0x03C519 },
-	{ (char*) "Etc/GMT0"                          , 0x03C597 },
-	{ (char*) "Etc/Greenwich"                     , 0x03C612 },
-	{ (char*) "Etc/UCT"                           , 0x03C68D },
-	{ (char*) "Etc/Universal"                     , 0x03C708 },
-	{ (char*) "Etc/UTC"                           , 0x03C783 },
-	{ (char*) "Etc/Zulu"                          , 0x03C7FE },
-	{ (char*) "Europe/Amsterdam"                  , 0x03C879 },
-	{ (char*) "Europe/Andorra"                    , 0x03CCB4 },
-	{ (char*) "Europe/Astrakhan"                  , 0x03CE45 },
-	{ (char*) "Europe/Athens"                     , 0x03D139 },
-	{ (char*) "Europe/Belfast"                    , 0x03D3EF },
-	{ (char*) "Europe/Belgrade"                   , 0x03DA3A },
-	{ (char*) "Europe/Berlin"                     , 0x03DC24 },
-	{ (char*) "Europe/Bratislava"                 , 0x03DF00 },
-	{ (char*) "Europe/Brussels"                   , 0x03E1DF },
-	{ (char*) "Europe/Bucharest"                  , 0x03E63A },
-	{ (char*) "Europe/Budapest"                   , 0x03E8DB },
-	{ (char*) "Europe/Busingen"                   , 0x03EBE5 },
-	{ (char*) "Europe/Chisinau"                   , 0x03EDEA },
-	{ (char*) "Europe/Copenhagen"                 , 0x03F0E9 },
-	{ (char*) "Europe/Dublin"                     , 0x03F364 },
-	{ (char*) "Europe/Gibraltar"                  , 0x03F948 },
-	{ (char*) "Europe/Guernsey"                   , 0x03FE18 },
-	{ (char*) "Europe/Helsinki"                   , 0x04046F },
-	{ (char*) "Europe/Isle_of_Man"                , 0x04065C },
-	{ (char*) "Europe/Istanbul"                   , 0x040CA7 },
-	{ (char*) "Europe/Jersey"                     , 0x041163 },
-	{ (char*) "Europe/Kaliningrad"                , 0x0417BA },
-	{ (char*) "Europe/Kiev"                       , 0x041B62 },
-	{ (char*) "Europe/Kirov"                      , 0x041D9C },
-	{ (char*) "Europe/Kyiv"                       , 0x042095 },
-	{ (char*) "Europe/Lisbon"                     , 0x0422DE },
-	{ (char*) "Europe/Ljubljana"                  , 0x0428AB },
-	{ (char*) "Europe/London"                     , 0x042A95 },
-	{ (char*) "Europe/Luxembourg"                 , 0x0430E0 },
-	{ (char*) "Europe/Madrid"                     , 0x04352B },
-	{ (char*) "Europe/Malta"                      , 0x0438C8 },
-	{ (char*) "Europe/Mariehamn"                  , 0x043C74 },
-	{ (char*) "Europe/Minsk"                      , 0x043E61 },
-	{ (char*) "Europe/Monaco"                     , 0x044195 },
-	{ (char*) "Europe/Moscow"                     , 0x0445FB },
-	{ (char*) "Europe/Nicosia"                    , 0x0449A7 },
-	{ (char*) "Europe/Oslo"                       , 0x044C08 },
-	{ (char*) "Europe/Paris"                      , 0x044EB8 },
-	{ (char*) "Europe/Podgorica"                  , 0x045315 },
-	{ (char*) "Europe/Prague"                     , 0x0454FF },
-	{ (char*) "Europe/Riga"                       , 0x0457DE },
-	{ (char*) "Europe/Rome"                       , 0x045AA0 },
-	{ (char*) "Europe/Samara"                     , 0x045E5F },
-	{ (char*) "Europe/San_Marino"                 , 0x046160 },
-	{ (char*) "Europe/Sarajevo"                   , 0x04651F },
-	{ (char*) "Europe/Saratov"                    , 0x046709 },
-	{ (char*) "Europe/Simferopol"                 , 0x0469FB },
-	{ (char*) "Europe/Skopje"                     , 0x046D6E },
-	{ (char*) "Europe/Sofia"                      , 0x046F58 },
-	{ (char*) "Europe/Stockholm"                  , 0x0471B4 },
-	{ (char*) "Europe/Tallinn"                    , 0x0473B1 },
-	{ (char*) "Europe/Tirane"                     , 0x047660 },
-	{ (char*) "Europe/Tiraspol"                   , 0x0478C8 },
-	{ (char*) "Europe/Ulyanovsk"                  , 0x047BC7 },
-	{ (char*) "Europe/Uzhgorod"                   , 0x047EDD },
-	{ (char*) "Europe/Vaduz"                      , 0x048117 },
-	{ (char*) "Europe/Vatican"                    , 0x048301 },
-	{ (char*) "Europe/Vienna"                     , 0x0486C0 },
-	{ (char*) "Europe/Vilnius"                    , 0x04895E },
-	{ (char*) "Europe/Volgograd"                  , 0x048C0E },
-	{ (char*) "Europe/Warsaw"                     , 0x048F1D },
-	{ (char*) "Europe/Zagreb"                     , 0x0492C4 },
-	{ (char*) "Europe/Zaporozhye"                 , 0x0494AE },
-	{ (char*) "Europe/Zurich"                     , 0x0496E8 },
-	{ (char*) "Factory"                           , 0x0498E5 },
-	{ (char*) "GB"                                , 0x049962 },
-	{ (char*) "GB-Eire"                           , 0x049FAD },
-	{ (char*) "GMT"                               , 0x04A5F8 },
-	{ (char*) "GMT+0"                             , 0x04A673 },
-	{ (char*) "GMT-0"                             , 0x04A6EE },
-	{ (char*) "GMT0"                              , 0x04A769 },
-	{ (char*) "Greenwich"                         , 0x04A7E4 },
-	{ (char*) "Hongkong"                          , 0x04A85F },
-	{ (char*) "HST"                               , 0x04AB72 },
-	{ (char*) "Iceland"                           , 0x04ABEE },
-	{ (char*) "Indian/Antananarivo"               , 0x04AC7C },
-	{ (char*) "Indian/Chagos"                     , 0x04AD28 },
-	{ (char*) "Indian/Christmas"                  , 0x04ADCC },
-	{ (char*) "Indian/Cocos"                      , 0x04AE5D },
-	{ (char*) "Indian/Comoro"                     , 0x04AEF5 },
-	{ (char*) "Indian/Kerguelen"                  , 0x04AF84 },
-	{ (char*) "Indian/Mahe"                       , 0x04B015 },
-	{ (char*) "Indian/Maldives"                   , 0x04B0A6 },
-	{ (char*) "Indian/Mauritius"                  , 0x04B14A },
-	{ (char*) "Indian/Mayotte"                    , 0x04B209 },
-	{ (char*) "Indian/Reunion"                    , 0x04B298 },
-	{ (char*) "Iran"                              , 0x04B329 },
-	{ (char*) "Israel"                            , 0x04B661 },
-	{ (char*) "Jamaica"                           , 0x04BA9F },
-	{ (char*) "Japan"                             , 0x04BBFE },
-	{ (char*) "Kwajalein"                         , 0x04BCDF },
-	{ (char*) "Libya"                             , 0x04BDC6 },
-	{ (char*) "MET"                               , 0x04BF81 },
-	{ (char*) "Mexico/BajaNorte"                  , 0x04C1FA },
-	{ (char*) "Mexico/BajaSur"                    , 0x04C607 },
-	{ (char*) "Mexico/General"                    , 0x04C8E1 },
-	{ (char*) "MST"                               , 0x04CBF2 },
-	{ (char*) "MST7MDT"                           , 0x04CC6D },
-	{ (char*) "Navajo"                            , 0x04D030 },
-	{ (char*) "NZ"                                , 0x04D44E },
-	{ (char*) "NZ-CHAT"                           , 0x04D86D },
-	{ (char*) "Pacific/Apia"                      , 0x04DBA1 },
-	{ (char*) "Pacific/Auckland"                  , 0x04DD44 },
-	{ (char*) "Pacific/Bougainville"              , 0x04E176 },
-	{ (char*) "Pacific/Chatham"                   , 0x04E257 },
-	{ (char*) "Pacific/Chuuk"                     , 0x04E59A },
-	{ (char*) "Pacific/Easter"                    , 0x04E678 },
-	{ (char*) "Pacific/Efate"                     , 0x04EB27 },
-	{ (char*) "Pacific/Enderbury"                 , 0x04EC89 },
-	{ (char*) "Pacific/Fakaofo"                   , 0x04ED41 },
-	{ (char*) "Pacific/Fiji"                      , 0x04EDE6 },
-	{ (char*) "Pacific/Funafuti"                  , 0x04EF7E },
-	{ (char*) "Pacific/Galapagos"                 , 0x04F010 },
-	{ (char*) "Pacific/Gambier"                   , 0x04F0DC },
-	{ (char*) "Pacific/Guadalcanal"               , 0x04F17B },
-	{ (char*) "Pacific/Guam"                      , 0x04F20D },
-	{ (char*) "Pacific/Honolulu"                  , 0x04F377 },
-	{ (char*) "Pacific/Johnston"                  , 0x04F466 },
-	{ (char*) "Pacific/Kanton"                    , 0x04F54F },
-	{ (char*) "Pacific/Kiritimati"                , 0x04F616 },
-	{ (char*) "Pacific/Kosrae"                    , 0x04F6DC },
-	{ (char*) "Pacific/Kwajalein"                 , 0x04F7E0 },
-	{ (char*) "Pacific/Majuro"                    , 0x04F8D0 },
-	{ (char*) "Pacific/Marquesas"                 , 0x04F9CE },
-	{ (char*) "Pacific/Midway"                    , 0x04FA76 },
-	{ (char*) "Pacific/Nauru"                     , 0x04FB39 },
-	{ (char*) "Pacific/Niue"                      , 0x04FBFC },
-	{ (char*) "Pacific/Norfolk"                   , 0x04FCA2 },
-	{ (char*) "Pacific/Noumea"                    , 0x04FD9B },
-	{ (char*) "Pacific/Pago_Pago"                 , 0x04FE6D },
-	{ (char*) "Pacific/Palau"                     , 0x04FF0B },
-	{ (char*) "Pacific/Pitcairn"                  , 0x04FFAB },
-	{ (char*) "Pacific/Pohnpei"                   , 0x050050 },
-	{ (char*) "Pacific/Ponape"                    , 0x050140 },
-	{ (char*) "Pacific/Port_Moresby"              , 0x0501D2 },
-	{ (char*) "Pacific/Rarotonga"                 , 0x050290 },
-	{ (char*) "Pacific/Saipan"                    , 0x050432 },
-	{ (char*) "Pacific/Samoa"                     , 0x050593 },
-	{ (char*) "Pacific/Tahiti"                    , 0x050631 },
-	{ (char*) "Pacific/Tarawa"                    , 0x0506D1 },
-	{ (char*) "Pacific/Tongatapu"                 , 0x050772 },
-	{ (char*) "Pacific/Truk"                      , 0x05086B },
-	{ (char*) "Pacific/Wake"                      , 0x050911 },
-	{ (char*) "Pacific/Wallis"                    , 0x0509AE },
-	{ (char*) "Pacific/Yap"                       , 0x050A40 },
-	{ (char*) "Poland"                            , 0x050AE6 },
-	{ (char*) "Portugal"                          , 0x050E8D },
-	{ (char*) "PRC"                               , 0x051447 },
-	{ (char*) "PST8PDT"                           , 0x0515DC },
-	{ (char*) "ROC"                               , 0x05199F },
-	{ (char*) "ROK"                               , 0x051BAA },
-	{ (char*) "Singapore"                         , 0x051D55 },
-	{ (char*) "Turkey"                            , 0x051E61 },
-	{ (char*) "UCT"                               , 0x05231D },
-	{ (char*) "Universal"                         , 0x052398 },
-	{ (char*) "US/Alaska"                         , 0x052413 },
-	{ (char*) "US/Aleutian"                       , 0x0527F0 },
-	{ (char*) "US/Arizona"                        , 0x052BC5 },
-	{ (char*) "US/Central"                        , 0x052CC1 },
-	{ (char*) "US/East-Indiana"                   , 0x0533A7 },
-	{ (char*) "US/Eastern"                        , 0x0535C6 },
-	{ (char*) "US/Hawaii"                         , 0x053CA2 },
-	{ (char*) "US/Indiana-Starke"                 , 0x053D8B },
-	{ (char*) "US/Michigan"                       , 0x05418F },
-	{ (char*) "US/Mountain"                       , 0x05451E },
-	{ (char*) "US/Pacific"                        , 0x05493C },
-	{ (char*) "US/Samoa"                          , 0x054E56 },
-	{ (char*) "UTC"                               , 0x054EF4 },
-	{ (char*) "W-SU"                              , 0x054F6F },
-	{ (char*) "WET"                               , 0x055307 },
-	{ (char*) "Zulu"                              , 0x055501 },
+	{ (char*) "America/Barbados"                  , 0x008089 },
+	{ (char*) "America/Belem"                     , 0x0081AB },
+	{ (char*) "America/Belize"                    , 0x008353 },
+	{ (char*) "America/Blanc-Sablon"              , 0x008774 },
+	{ (char*) "America/Boa_Vista"                 , 0x008869 },
+	{ (char*) "America/Bogota"                    , 0x008A2A },
+	{ (char*) "America/Boise"                     , 0x008AE9 },
+	{ (char*) "America/Buenos_Aires"              , 0x008EFC },
+	{ (char*) "America/Cambridge_Bay"             , 0x0091CC },
+	{ (char*) "America/Campo_Grande"              , 0x00955F },
+	{ (char*) "America/Cancun"                    , 0x009935 },
+	{ (char*) "America/Caracas"                   , 0x009B67 },
+	{ (char*) "America/Catamarca"                 , 0x009C31 },
+	{ (char*) "America/Cayenne"                   , 0x009F01 },
+	{ (char*) "America/Cayman"                    , 0x009FA4 },
+	{ (char*) "America/Chicago"                   , 0x00A045 },
+	{ (char*) "America/Chihuahua"                 , 0x00A73F },
+	{ (char*) "America/Ciudad_Juarez"             , 0x00AA14 },
+	{ (char*) "America/Coral_Harbour"             , 0x00AD0A },
+	{ (char*) "America/Cordoba"                   , 0x00ADAB },
+	{ (char*) "America/Costa_Rica"                , 0x00B07B },
+	{ (char*) "America/Creston"                   , 0x00B16F },
+	{ (char*) "America/Cuiaba"                    , 0x00B22B },
+	{ (char*) "America/Curacao"                   , 0x00B5E8 },
+	{ (char*) "America/Danmarkshavn"              , 0x00B68B },
+	{ (char*) "America/Dawson"                    , 0x00B870 },
+	{ (char*) "America/Dawson_Creek"              , 0x00BC93 },
+	{ (char*) "America/Denver"                    , 0x00BF6A },
+	{ (char*) "America/Detroit"                   , 0x00C39D },
+	{ (char*) "America/Dominica"                  , 0x00C745 },
+	{ (char*) "America/Edmonton"                  , 0x00C7D3 },
+	{ (char*) "America/Eirunepe"                  , 0x00CBCB },
+	{ (char*) "America/El_Salvador"               , 0x00CD9A },
+	{ (char*) "America/Ensenada"                  , 0x00CE56 },
+	{ (char*) "America/Fort_Nelson"               , 0x00D299 },
+	{ (char*) "America/Fort_Wayne"                , 0x00D861 },
+	{ (char*) "America/Fortaleza"                 , 0x00DA80 },
+	{ (char*) "America/Glace_Bay"                 , 0x00DC96 },
+	{ (char*) "America/Godthab"                   , 0x00E02D },
+	{ (char*) "America/Goose_Bay"                 , 0x00E3FE },
+	{ (char*) "America/Grand_Turk"                , 0x00EA56 },
+	{ (char*) "America/Grenada"                   , 0x00EDB7 },
+	{ (char*) "America/Guadeloupe"                , 0x00EE45 },
+	{ (char*) "America/Guatemala"                 , 0x00EED3 },
+	{ (char*) "America/Guayaquil"                 , 0x00EFB3 },
+	{ (char*) "America/Guyana"                    , 0x00F084 },
+	{ (char*) "America/Halifax"                   , 0x00F145 },
+	{ (char*) "America/Havana"                    , 0x00F7F7 },
+	{ (char*) "America/Hermosillo"                , 0x00FC60 },
+	{ (char*) "America/Indiana/Indianapolis"      , 0x00FD74 },
+	{ (char*) "America/Indiana/Knox"              , 0x00FFAC },
+	{ (char*) "America/Indiana/Marengo"           , 0x0103C5 },
+	{ (char*) "America/Indiana/Petersburg"        , 0x01061F },
+	{ (char*) "America/Indiana/Tell_City"         , 0x0108E9 },
+	{ (char*) "America/Indiana/Vevay"             , 0x010B13 },
+	{ (char*) "America/Indiana/Vincennes"         , 0x010CAA },
+	{ (char*) "America/Indiana/Winamac"           , 0x010F00 },
+	{ (char*) "America/Indianapolis"              , 0x01117D },
+	{ (char*) "America/Inuvik"                    , 0x01139C },
+	{ (char*) "America/Iqaluit"                   , 0x0116ED },
+	{ (char*) "America/Jamaica"                   , 0x011A69 },
+	{ (char*) "America/Jujuy"                     , 0x011BC8 },
+	{ (char*) "America/Juneau"                    , 0x011E86 },
+	{ (char*) "America/Kentucky/Louisville"       , 0x01226C },
+	{ (char*) "America/Kentucky/Monticello"       , 0x012770 },
+	{ (char*) "America/Knox_IN"                   , 0x012B5C },
+	{ (char*) "America/Kralendijk"                , 0x012F60 },
+	{ (char*) "America/La_Paz"                    , 0x01301D },
+	{ (char*) "America/Lima"                      , 0x0130D3 },
+	{ (char*) "America/Los_Angeles"               , 0x0131FA },
+	{ (char*) "America/Louisville"                , 0x01371B },
+	{ (char*) "America/Lower_Princes"             , 0x013C01 },
+	{ (char*) "America/Maceio"                    , 0x013CBE },
+	{ (char*) "America/Managua"                   , 0x013ED0 },
+	{ (char*) "America/Manaus"                    , 0x014003 },
+	{ (char*) "America/Marigot"                   , 0x0141BA },
+	{ (char*) "America/Martinique"                , 0x014277 },
+	{ (char*) "America/Matamoros"                 , 0x014335 },
+	{ (char*) "America/Mazatlan"                  , 0x014522 },
+	{ (char*) "America/Mendoza"                   , 0x014812 },
+	{ (char*) "America/Menominee"                 , 0x014AE2 },
+	{ (char*) "America/Merida"                    , 0x014EA2 },
+	{ (char*) "America/Metlakatla"                , 0x01514D },
+	{ (char*) "America/Mexico_City"               , 0x0153BA },
+	{ (char*) "America/Miquelon"                  , 0x0156D9 },
+	{ (char*) "America/Moncton"                   , 0x01590B },
+	{ (char*) "America/Monterrey"                 , 0x015F04 },
+	{ (char*) "America/Montevideo"                , 0x01620B },
+	{ (char*) "America/Montreal"                  , 0x0165E0 },
+	{ (char*) "America/Montserrat"                , 0x016CA1 },
+	{ (char*) "America/Nassau"                    , 0x016D2F },
+	{ (char*) "America/New_York"                  , 0x017129 },
+	{ (char*) "America/Nipigon"                   , 0x017819 },
+	{ (char*) "America/Nome"                      , 0x017EDA },
+	{ (char*) "America/Noronha"                   , 0x0182C2 },
+	{ (char*) "America/North_Dakota/Beulah"       , 0x0184C2 },
+	{ (char*) "America/North_Dakota/Center"       , 0x0188F6 },
+	{ (char*) "America/North_Dakota/New_Salem"    , 0x018CF5 },
+	{ (char*) "America/Nuuk"                      , 0x0190FA },
+	{ (char*) "America/Ojinaga"                   , 0x0194DC },
+	{ (char*) "America/Panama"                    , 0x0197D2 },
+	{ (char*) "America/Pangnirtung"               , 0x019873 },
+	{ (char*) "America/Paramaribo"                , 0x019BD6 },
+	{ (char*) "America/Phoenix"                   , 0x019C9D },
+	{ (char*) "America/Port-au-Prince"            , 0x019DB1 },
+	{ (char*) "America/Port_of_Spain"             , 0x019FF2 },
+	{ (char*) "America/Porto_Acre"                , 0x01A080 },
+	{ (char*) "America/Porto_Velho"               , 0x01A22E },
+	{ (char*) "America/Puerto_Rico"               , 0x01A3CC },
+	{ (char*) "America/Punta_Arenas"              , 0x01A489 },
+	{ (char*) "America/Rainy_River"               , 0x01A96B },
+	{ (char*) "America/Rankin_Inlet"              , 0x01AE85 },
+	{ (char*) "America/Recife"                    , 0x01B1CE },
+	{ (char*) "America/Regina"                    , 0x01B3C8 },
+	{ (char*) "America/Resolute"                  , 0x01B667 },
+	{ (char*) "America/Rio_Branco"                , 0x01B9B1 },
+	{ (char*) "America/Rosario"                   , 0x01BB63 },
+	{ (char*) "America/Santa_Isabel"              , 0x01BE33 },
+	{ (char*) "America/Santarem"                  , 0x01C276 },
+	{ (char*) "America/Santiago"                  , 0x01C426 },
+	{ (char*) "America/Santo_Domingo"             , 0x01C989 },
+	{ (char*) "America/Sao_Paulo"                 , 0x01CAD2 },
+	{ (char*) "America/Scoresbysund"              , 0x01CECC },
+	{ (char*) "America/Shiprock"                  , 0x01D2CD },
+	{ (char*) "America/Sitka"                     , 0x01D6EB },
+	{ (char*) "America/St_Barthelemy"             , 0x01DAC6 },
+	{ (char*) "America/St_Johns"                  , 0x01DB83 },
+	{ (char*) "America/St_Kitts"                  , 0x01E300 },
+	{ (char*) "America/St_Lucia"                  , 0x01E38E },
+	{ (char*) "America/St_Thomas"                 , 0x01E42F },
+	{ (char*) "America/St_Vincent"                , 0x01E4BD },
+	{ (char*) "America/Swift_Current"             , 0x01E55E },
+	{ (char*) "America/Tegucigalpa"               , 0x01E6EC },
+	{ (char*) "America/Thule"                     , 0x01E7BA },
+	{ (char*) "America/Thunder_Bay"               , 0x01E99B },
+	{ (char*) "America/Tijuana"                   , 0x01F05C },
+	{ (char*) "America/Toronto"                   , 0x01F4AE },
+	{ (char*) "America/Tortola"                   , 0x01FB8D },
+	{ (char*) "America/Vancouver"                 , 0x01FC1B },
+	{ (char*) "America/Virgin"                    , 0x020172 },
+	{ (char*) "America/Whitehorse"                , 0x02022F },
+	{ (char*) "America/Winnipeg"                  , 0x020652 },
+	{ (char*) "America/Yakutat"                   , 0x020B89 },
+	{ (char*) "America/Yellowknife"               , 0x020F57 },
+	{ (char*) "Antarctica/Casey"                  , 0x02132D },
+	{ (char*) "Antarctica/Davis"                  , 0x02145D },
+	{ (char*) "Antarctica/DumontDUrville"         , 0x021533 },
+	{ (char*) "Antarctica/Macquarie"              , 0x0215E7 },
+	{ (char*) "Antarctica/Mawson"                 , 0x0219D3 },
+	{ (char*) "Antarctica/McMurdo"                , 0x021A7D },
+	{ (char*) "Antarctica/Palmer"                 , 0x021DAF },
+	{ (char*) "Antarctica/Rothera"                , 0x022138 },
+	{ (char*) "Antarctica/South_Pole"             , 0x0221CF },
+	{ (char*) "Antarctica/Syowa"                  , 0x0225EE },
+	{ (char*) "Antarctica/Troll"                  , 0x022684 },
+	{ (char*) "Antarctica/Vostok"                 , 0x022733 },
+	{ (char*) "Arctic/Longyearbyen"               , 0x0227EF },
+	{ (char*) "Asia/Aden"                         , 0x022ABC },
+	{ (char*) "Asia/Almaty"                       , 0x022B4D },
+	{ (char*) "Asia/Amman"                        , 0x022DD5 },
+	{ (char*) "Asia/Anadyr"                       , 0x023181 },
+	{ (char*) "Asia/Aqtau"                        , 0x023487 },
+	{ (char*) "Asia/Aqtobe"                       , 0x023706 },
+	{ (char*) "Asia/Ashgabat"                     , 0x023986 },
+	{ (char*) "Asia/Ashkhabad"                    , 0x023B09 },
+	{ (char*) "Asia/Atyrau"                       , 0x023C8C },
+	{ (char*) "Asia/Baghdad"                      , 0x023F15 },
+	{ (char*) "Asia/Bahrain"                      , 0x024197 },
+	{ (char*) "Asia/Baku"                         , 0x024250 },
+	{ (char*) "Asia/Bangkok"                      , 0x024544 },
+	{ (char*) "Asia/Barnaul"                      , 0x0245E8 },
+	{ (char*) "Asia/Beirut"                       , 0x0248F3 },
+	{ (char*) "Asia/Bishkek"                      , 0x024BDB },
+	{ (char*) "Asia/Brunei"                       , 0x024E51 },
+	{ (char*) "Asia/Calcutta"                     , 0x024EF7 },
+	{ (char*) "Asia/Chita"                        , 0x024FDF },
+	{ (char*) "Asia/Choibalsan"                   , 0x0252ED },
+	{ (char*) "Asia/Chongqing"                    , 0x02554B },
+	{ (char*) "Asia/Chungking"                    , 0x0256E0 },
+	{ (char*) "Asia/Colombo"                      , 0x025875 },
+	{ (char*) "Asia/Dacca"                        , 0x025978 },
+	{ (char*) "Asia/Damascus"                     , 0x025A6B },
+	{ (char*) "Asia/Dhaka"                        , 0x025F49 },
+	{ (char*) "Asia/Dili"                         , 0x02603C },
+	{ (char*) "Asia/Dubai"                        , 0x0260F2 },
+	{ (char*) "Asia/Dushanbe"                     , 0x026183 },
+	{ (char*) "Asia/Famagusta"                    , 0x0262FD },
+	{ (char*) "Asia/Gaza"                         , 0x0266C4 },
+	{ (char*) "Asia/Harbin"                       , 0x027260 },
+	{ (char*) "Asia/Hebron"                       , 0x0273F5 },
+	{ (char*) "Asia/Ho_Chi_Minh"                  , 0x027FA2 },
+	{ (char*) "Asia/Hong_Kong"                    , 0x02809A },
+	{ (char*) "Asia/Hovd"                         , 0x0283AD },
+	{ (char*) "Asia/Irkutsk"                      , 0x028621 },
+	{ (char*) "Asia/Istanbul"                     , 0x02893F },
+	{ (char*) "Asia/Jakarta"                      , 0x028DFB },
+	{ (char*) "Asia/Jayapura"                     , 0x028F0C },
+	{ (char*) "Asia/Jerusalem"                    , 0x028FF9 },
+	{ (char*) "Asia/Kabul"                        , 0x029437 },
+	{ (char*) "Asia/Kamchatka"                    , 0x0294E2 },
+	{ (char*) "Asia/Karachi"                      , 0x0297D7 },
+	{ (char*) "Asia/Kashgar"                      , 0x0298ED },
+	{ (char*) "Asia/Kathmandu"                    , 0x02997E },
+	{ (char*) "Asia/Katmandu"                     , 0x029A2B },
+	{ (char*) "Asia/Khandyga"                     , 0x029AD8 },
+	{ (char*) "Asia/Kolkata"                      , 0x029E09 },
+	{ (char*) "Asia/Krasnoyarsk"                  , 0x029EF1 },
+	{ (char*) "Asia/Kuala_Lumpur"                 , 0x02A1FB },
+	{ (char*) "Asia/Kuching"                      , 0x02A31B },
+	{ (char*) "Asia/Kuwait"                       , 0x02A475 },
+	{ (char*) "Asia/Macao"                        , 0x02A506 },
+	{ (char*) "Asia/Macau"                        , 0x02A829 },
+	{ (char*) "Asia/Magadan"                      , 0x02AB4C },
+	{ (char*) "Asia/Makassar"                     , 0x02AE57 },
+	{ (char*) "Asia/Manila"                       , 0x02AF6A },
+	{ (char*) "Asia/Muscat"                       , 0x02B064 },
+	{ (char*) "Asia/Nicosia"                      , 0x02B0F5 },
+	{ (char*) "Asia/Novokuznetsk"                 , 0x02B364 },
+	{ (char*) "Asia/Novosibirsk"                  , 0x02B657 },
+	{ (char*) "Asia/Omsk"                         , 0x02B968 },
+	{ (char*) "Asia/Oral"                         , 0x02BC66 },
+	{ (char*) "Asia/Phnom_Penh"                   , 0x02BEF2 },
+	{ (char*) "Asia/Pontianak"                    , 0x02BFC6 },
+	{ (char*) "Asia/Pyongyang"                    , 0x02C0DF },
+	{ (char*) "Asia/Qatar"                        , 0x02C1A2 },
+	{ (char*) "Asia/Qostanay"                     , 0x02C246 },
+	{ (char*) "Asia/Qyzylorda"                    , 0x02C4DC },
+	{ (char*) "Asia/Rangoon"                      , 0x02C775 },
+	{ (char*) "Asia/Riyadh"                       , 0x02C83C },
+	{ (char*) "Asia/Saigon"                       , 0x02C8CD },
+	{ (char*) "Asia/Sakhalin"                     , 0x02C9C5 },
+	{ (char*) "Asia/Samarkand"                    , 0x02CCDC },
+	{ (char*) "Asia/Seoul"                        , 0x02CE67 },
+	{ (char*) "Asia/Shanghai"                     , 0x02D012 },
+	{ (char*) "Asia/Singapore"                    , 0x02D1B3 },
+	{ (char*) "Asia/Srednekolymsk"                , 0x02D2BF },
+	{ (char*) "Asia/Taipei"                       , 0x02D5CF },
+	{ (char*) "Asia/Tashkent"                     , 0x02D7DA },
+	{ (char*) "Asia/Tbilisi"                      , 0x02D965 },
+	{ (char*) "Asia/Tehran"                       , 0x02DBE6 },
+	{ (char*) "Asia/Tel_Aviv"                     , 0x02DF1E },
+	{ (char*) "Asia/Thimbu"                       , 0x02E35C },
+	{ (char*) "Asia/Thimphu"                      , 0x02E402 },
+	{ (char*) "Asia/Tokyo"                        , 0x02E4A8 },
+	{ (char*) "Asia/Tomsk"                        , 0x02E589 },
+	{ (char*) "Asia/Ujung_Pandang"                , 0x02E894 },
+	{ (char*) "Asia/Ulaanbaatar"                  , 0x02E95E },
+	{ (char*) "Asia/Ulan_Bator"                   , 0x02EBCC },
+	{ (char*) "Asia/Urumqi"                       , 0x02EE2A },
+	{ (char*) "Asia/Ust-Nera"                     , 0x02EEC8 },
+	{ (char*) "Asia/Vientiane"                    , 0x02F1EB },
+	{ (char*) "Asia/Vladivostok"                  , 0x02F2D1 },
+	{ (char*) "Asia/Yakutsk"                      , 0x02F5D6 },
+	{ (char*) "Asia/Yangon"                       , 0x02F8DA },
+	{ (char*) "Asia/Yekaterinburg"                , 0x02F9A1 },
+	{ (char*) "Asia/Yerevan"                      , 0x02FCB3 },
+	{ (char*) "Atlantic/Azores"                   , 0x02FF83 },
+	{ (char*) "Atlantic/Bermuda"                  , 0x03050E },
+	{ (char*) "Atlantic/Canary"                   , 0x03091A },
+	{ (char*) "Atlantic/Cape_Verde"               , 0x030B12 },
+	{ (char*) "Atlantic/Faeroe"                   , 0x030BCD },
+	{ (char*) "Atlantic/Faroe"                    , 0x030D92 },
+	{ (char*) "Atlantic/Jan_Mayen"                , 0x030F57 },
+	{ (char*) "Atlantic/Madeira"                  , 0x031224 },
+	{ (char*) "Atlantic/Reykjavik"                , 0x03179B },
+	{ (char*) "Atlantic/South_Georgia"            , 0x031A98 },
+	{ (char*) "Atlantic/St_Helena"                , 0x031B28 },
+	{ (char*) "Atlantic/Stanley"                  , 0x031BC9 },
+	{ (char*) "Australia/ACT"                     , 0x031EEA },
+	{ (char*) "Australia/Adelaide"                , 0x03227E },
+	{ (char*) "Australia/Brisbane"                , 0x032632 },
+	{ (char*) "Australia/Broken_Hill"             , 0x032776 },
+	{ (char*) "Australia/Canberra"                , 0x032B4B },
+	{ (char*) "Australia/Currie"                  , 0x032EDF },
+	{ (char*) "Australia/Darwin"                  , 0x0332D6 },
+	{ (char*) "Australia/Eucla"                   , 0x0333DE },
+	{ (char*) "Australia/Hobart"                  , 0x03353D },
+	{ (char*) "Australia/LHI"                     , 0x03393C },
+	{ (char*) "Australia/Lindeman"                , 0x033BFC },
+	{ (char*) "Australia/Lord_Howe"               , 0x033D6C },
+	{ (char*) "Australia/Melbourne"               , 0x03403C },
+	{ (char*) "Australia/North"                   , 0x0343D8 },
+	{ (char*) "Australia/NSW"                     , 0x0344CE },
+	{ (char*) "Australia/Perth"                   , 0x034862 },
+	{ (char*) "Australia/Queensland"              , 0x0349BE },
+	{ (char*) "Australia/South"                   , 0x034AEB },
+	{ (char*) "Australia/Sydney"                  , 0x034E90 },
+	{ (char*) "Australia/Tasmania"                , 0x035240 },
+	{ (char*) "Australia/Victoria"                , 0x035637 },
+	{ (char*) "Australia/West"                    , 0x0359CB },
+	{ (char*) "Australia/Yancowinna"              , 0x035B09 },
+	{ (char*) "Brazil/Acre"                       , 0x035EC2 },
+	{ (char*) "Brazil/DeNoronha"                  , 0x036070 },
+	{ (char*) "Brazil/East"                       , 0x036260 },
+	{ (char*) "Brazil/West"                       , 0x036624 },
+	{ (char*) "Canada/Atlantic"                   , 0x0367CC },
+	{ (char*) "Canada/Central"                    , 0x036E60 },
+	{ (char*) "Canada/Eastern"                    , 0x03737A },
+	{ (char*) "Canada/Mountain"                   , 0x037A3B },
+	{ (char*) "Canada/Newfoundland"               , 0x037E11 },
+	{ (char*) "Canada/Pacific"                    , 0x038573 },
+	{ (char*) "Canada/Saskatchewan"               , 0x038AB1 },
+	{ (char*) "Canada/Yukon"                      , 0x038D3B },
+	{ (char*) "CET"                               , 0x03914C },
+	{ (char*) "Chile/Continental"                 , 0x0395A7 },
+	{ (char*) "Chile/EasterIsland"                , 0x039AFD },
+	{ (char*) "CST6CDT"                           , 0x039F9F },
+	{ (char*) "Cuba"                              , 0x03A685 },
+	{ (char*) "EET"                               , 0x03AAEE },
+	{ (char*) "Egypt"                             , 0x03ADA4 },
+	{ (char*) "Eire"                              , 0x03B2CD },
+	{ (char*) "EST"                               , 0x03B8B1 },
+	{ (char*) "EST5EDT"                           , 0x03B952 },
+	{ (char*) "Etc/GMT"                           , 0x03C02E },
+	{ (char*) "Etc/GMT+0"                         , 0x03C0A9 },
+	{ (char*) "Etc/GMT+1"                         , 0x03C124 },
+	{ (char*) "Etc/GMT+10"                        , 0x03C1A1 },
+	{ (char*) "Etc/GMT+11"                        , 0x03C21F },
+	{ (char*) "Etc/GMT+12"                        , 0x03C29D },
+	{ (char*) "Etc/GMT+2"                         , 0x03C31B },
+	{ (char*) "Etc/GMT+3"                         , 0x03C398 },
+	{ (char*) "Etc/GMT+4"                         , 0x03C415 },
+	{ (char*) "Etc/GMT+5"                         , 0x03C492 },
+	{ (char*) "Etc/GMT+6"                         , 0x03C50F },
+	{ (char*) "Etc/GMT+7"                         , 0x03C58C },
+	{ (char*) "Etc/GMT+8"                         , 0x03C609 },
+	{ (char*) "Etc/GMT+9"                         , 0x03C686 },
+	{ (char*) "Etc/GMT-0"                         , 0x03C703 },
+	{ (char*) "Etc/GMT-1"                         , 0x03C77E },
+	{ (char*) "Etc/GMT-10"                        , 0x03C7FC },
+	{ (char*) "Etc/GMT-11"                        , 0x03C87B },
+	{ (char*) "Etc/GMT-12"                        , 0x03C8FA },
+	{ (char*) "Etc/GMT-13"                        , 0x03C979 },
+	{ (char*) "Etc/GMT-14"                        , 0x03C9F8 },
+	{ (char*) "Etc/GMT-2"                         , 0x03CA77 },
+	{ (char*) "Etc/GMT-3"                         , 0x03CAF5 },
+	{ (char*) "Etc/GMT-4"                         , 0x03CB73 },
+	{ (char*) "Etc/GMT-5"                         , 0x03CBF1 },
+	{ (char*) "Etc/GMT-6"                         , 0x03CC6F },
+	{ (char*) "Etc/GMT-7"                         , 0x03CCED },
+	{ (char*) "Etc/GMT-8"                         , 0x03CD6B },
+	{ (char*) "Etc/GMT-9"                         , 0x03CDE9 },
+	{ (char*) "Etc/GMT0"                          , 0x03CE67 },
+	{ (char*) "Etc/Greenwich"                     , 0x03CEE2 },
+	{ (char*) "Etc/UCT"                           , 0x03CF5D },
+	{ (char*) "Etc/Universal"                     , 0x03CFD8 },
+	{ (char*) "Etc/UTC"                           , 0x03D053 },
+	{ (char*) "Etc/Zulu"                          , 0x03D0CE },
+	{ (char*) "Europe/Amsterdam"                  , 0x03D149 },
+	{ (char*) "Europe/Andorra"                    , 0x03D584 },
+	{ (char*) "Europe/Astrakhan"                  , 0x03D715 },
+	{ (char*) "Europe/Athens"                     , 0x03DA09 },
+	{ (char*) "Europe/Belfast"                    , 0x03DCBF },
+	{ (char*) "Europe/Belgrade"                   , 0x03E30A },
+	{ (char*) "Europe/Berlin"                     , 0x03E4F4 },
+	{ (char*) "Europe/Bratislava"                 , 0x03E7D0 },
+	{ (char*) "Europe/Brussels"                   , 0x03EAAF },
+	{ (char*) "Europe/Bucharest"                  , 0x03EF0A },
+	{ (char*) "Europe/Budapest"                   , 0x03F1AB },
+	{ (char*) "Europe/Busingen"                   , 0x03F4B5 },
+	{ (char*) "Europe/Chisinau"                   , 0x03F6BA },
+	{ (char*) "Europe/Copenhagen"                 , 0x03F9B9 },
+	{ (char*) "Europe/Dublin"                     , 0x03FC34 },
+	{ (char*) "Europe/Gibraltar"                  , 0x040218 },
+	{ (char*) "Europe/Guernsey"                   , 0x0406E8 },
+	{ (char*) "Europe/Helsinki"                   , 0x040D3F },
+	{ (char*) "Europe/Isle_of_Man"                , 0x040F2C },
+	{ (char*) "Europe/Istanbul"                   , 0x041577 },
+	{ (char*) "Europe/Jersey"                     , 0x041A33 },
+	{ (char*) "Europe/Kaliningrad"                , 0x04208A },
+	{ (char*) "Europe/Kiev"                       , 0x042432 },
+	{ (char*) "Europe/Kirov"                      , 0x04266C },
+	{ (char*) "Europe/Kyiv"                       , 0x042965 },
+	{ (char*) "Europe/Lisbon"                     , 0x042BAE },
+	{ (char*) "Europe/Ljubljana"                  , 0x043184 },
+	{ (char*) "Europe/London"                     , 0x04336E },
+	{ (char*) "Europe/Luxembourg"                 , 0x0439B9 },
+	{ (char*) "Europe/Madrid"                     , 0x043E04 },
+	{ (char*) "Europe/Malta"                      , 0x0441A1 },
+	{ (char*) "Europe/Mariehamn"                  , 0x04454D },
+	{ (char*) "Europe/Minsk"                      , 0x04473A },
+	{ (char*) "Europe/Monaco"                     , 0x044A6E },
+	{ (char*) "Europe/Moscow"                     , 0x044ED4 },
+	{ (char*) "Europe/Nicosia"                    , 0x045280 },
+	{ (char*) "Europe/Oslo"                       , 0x0454E1 },
+	{ (char*) "Europe/Paris"                      , 0x045791 },
+	{ (char*) "Europe/Podgorica"                  , 0x045BEE },
+	{ (char*) "Europe/Prague"                     , 0x045DD8 },
+	{ (char*) "Europe/Riga"                       , 0x0460B7 },
+	{ (char*) "Europe/Rome"                       , 0x046379 },
+	{ (char*) "Europe/Samara"                     , 0x046738 },
+	{ (char*) "Europe/San_Marino"                 , 0x046A39 },
+	{ (char*) "Europe/Sarajevo"                   , 0x046DF8 },
+	{ (char*) "Europe/Saratov"                    , 0x046FE2 },
+	{ (char*) "Europe/Simferopol"                 , 0x0472D4 },
+	{ (char*) "Europe/Skopje"                     , 0x047647 },
+	{ (char*) "Europe/Sofia"                      , 0x047831 },
+	{ (char*) "Europe/Stockholm"                  , 0x047A8D },
+	{ (char*) "Europe/Tallinn"                    , 0x047C8A },
+	{ (char*) "Europe/Tirane"                     , 0x047F39 },
+	{ (char*) "Europe/Tiraspol"                   , 0x0481A1 },
+	{ (char*) "Europe/Ulyanovsk"                  , 0x0484A0 },
+	{ (char*) "Europe/Uzhgorod"                   , 0x0487B6 },
+	{ (char*) "Europe/Vaduz"                      , 0x0489F0 },
+	{ (char*) "Europe/Vatican"                    , 0x048BDA },
+	{ (char*) "Europe/Vienna"                     , 0x048F99 },
+	{ (char*) "Europe/Vilnius"                    , 0x049237 },
+	{ (char*) "Europe/Volgograd"                  , 0x0494E7 },
+	{ (char*) "Europe/Warsaw"                     , 0x0497F6 },
+	{ (char*) "Europe/Zagreb"                     , 0x049B9D },
+	{ (char*) "Europe/Zaporozhye"                 , 0x049D87 },
+	{ (char*) "Europe/Zurich"                     , 0x049FC1 },
+	{ (char*) "Factory"                           , 0x04A1BE },
+	{ (char*) "GB"                                , 0x04A23B },
+	{ (char*) "GB-Eire"                           , 0x04A886 },
+	{ (char*) "GMT"                               , 0x04AED1 },
+	{ (char*) "GMT+0"                             , 0x04AF4C },
+	{ (char*) "GMT-0"                             , 0x04AFC7 },
+	{ (char*) "GMT0"                              , 0x04B042 },
+	{ (char*) "Greenwich"                         , 0x04B0BD },
+	{ (char*) "Hongkong"                          , 0x04B138 },
+	{ (char*) "HST"                               , 0x04B44B },
+	{ (char*) "Iceland"                           , 0x04B534 },
+	{ (char*) "Indian/Antananarivo"               , 0x04B5C2 },
+	{ (char*) "Indian/Chagos"                     , 0x04B66E },
+	{ (char*) "Indian/Christmas"                  , 0x04B712 },
+	{ (char*) "Indian/Cocos"                      , 0x04B7A3 },
+	{ (char*) "Indian/Comoro"                     , 0x04B83B },
+	{ (char*) "Indian/Kerguelen"                  , 0x04B8CA },
+	{ (char*) "Indian/Mahe"                       , 0x04B95B },
+	{ (char*) "Indian/Maldives"                   , 0x04B9EC },
+	{ (char*) "Indian/Mauritius"                  , 0x04BA90 },
+	{ (char*) "Indian/Mayotte"                    , 0x04BB4F },
+	{ (char*) "Indian/Reunion"                    , 0x04BBDE },
+	{ (char*) "Iran"                              , 0x04BC6F },
+	{ (char*) "Israel"                            , 0x04BFA7 },
+	{ (char*) "Jamaica"                           , 0x04C3E5 },
+	{ (char*) "Japan"                             , 0x04C544 },
+	{ (char*) "Kwajalein"                         , 0x04C625 },
+	{ (char*) "Libya"                             , 0x04C70C },
+	{ (char*) "MET"                               , 0x04C8C7 },
+	{ (char*) "Mexico/BajaNorte"                  , 0x04CD22 },
+	{ (char*) "Mexico/BajaSur"                    , 0x04D165 },
+	{ (char*) "Mexico/General"                    , 0x04D423 },
+	{ (char*) "MST"                               , 0x04D734 },
+	{ (char*) "MST7MDT"                           , 0x04D830 },
+	{ (char*) "Navajo"                            , 0x04DC4E },
+	{ (char*) "NZ"                                , 0x04E06C },
+	{ (char*) "NZ-CHAT"                           , 0x04E48B },
+	{ (char*) "Pacific/Apia"                      , 0x04E7BF },
+	{ (char*) "Pacific/Auckland"                  , 0x04E962 },
+	{ (char*) "Pacific/Bougainville"              , 0x04ED94 },
+	{ (char*) "Pacific/Chatham"                   , 0x04EE75 },
+	{ (char*) "Pacific/Chuuk"                     , 0x04F1B8 },
+	{ (char*) "Pacific/Easter"                    , 0x04F296 },
+	{ (char*) "Pacific/Efate"                     , 0x04F745 },
+	{ (char*) "Pacific/Enderbury"                 , 0x04F8A7 },
+	{ (char*) "Pacific/Fakaofo"                   , 0x04F95F },
+	{ (char*) "Pacific/Fiji"                      , 0x04FA04 },
+	{ (char*) "Pacific/Funafuti"                  , 0x04FB9C },
+	{ (char*) "Pacific/Galapagos"                 , 0x04FC2E },
+	{ (char*) "Pacific/Gambier"                   , 0x04FCFA },
+	{ (char*) "Pacific/Guadalcanal"               , 0x04FD99 },
+	{ (char*) "Pacific/Guam"                      , 0x04FE2B },
+	{ (char*) "Pacific/Honolulu"                  , 0x04FF95 },
+	{ (char*) "Pacific/Johnston"                  , 0x050084 },
+	{ (char*) "Pacific/Kanton"                    , 0x05016D },
+	{ (char*) "Pacific/Kiritimati"                , 0x050234 },
+	{ (char*) "Pacific/Kosrae"                    , 0x0502FA },
+	{ (char*) "Pacific/Kwajalein"                 , 0x0503FE },
+	{ (char*) "Pacific/Majuro"                    , 0x0504EE },
+	{ (char*) "Pacific/Marquesas"                 , 0x0505EC },
+	{ (char*) "Pacific/Midway"                    , 0x050694 },
+	{ (char*) "Pacific/Nauru"                     , 0x050757 },
+	{ (char*) "Pacific/Niue"                      , 0x05081A },
+	{ (char*) "Pacific/Norfolk"                   , 0x0508C0 },
+	{ (char*) "Pacific/Noumea"                    , 0x0509B9 },
+	{ (char*) "Pacific/Pago_Pago"                 , 0x050A8B },
+	{ (char*) "Pacific/Palau"                     , 0x050B29 },
+	{ (char*) "Pacific/Pitcairn"                  , 0x050BC9 },
+	{ (char*) "Pacific/Pohnpei"                   , 0x050C6E },
+	{ (char*) "Pacific/Ponape"                    , 0x050D5E },
+	{ (char*) "Pacific/Port_Moresby"              , 0x050DF0 },
+	{ (char*) "Pacific/Rarotonga"                 , 0x050EAE },
+	{ (char*) "Pacific/Saipan"                    , 0x051050 },
+	{ (char*) "Pacific/Samoa"                     , 0x0511B1 },
+	{ (char*) "Pacific/Tahiti"                    , 0x05124F },
+	{ (char*) "Pacific/Tarawa"                    , 0x0512EF },
+	{ (char*) "Pacific/Tongatapu"                 , 0x051390 },
+	{ (char*) "Pacific/Truk"                      , 0x051489 },
+	{ (char*) "Pacific/Wake"                      , 0x05152F },
+	{ (char*) "Pacific/Wallis"                    , 0x0515CC },
+	{ (char*) "Pacific/Yap"                       , 0x05165E },
+	{ (char*) "Poland"                            , 0x051704 },
+	{ (char*) "Portugal"                          , 0x051AAB },
+	{ (char*) "PRC"                               , 0x05206E },
+	{ (char*) "PST8PDT"                           , 0x052203 },
+	{ (char*) "ROC"                               , 0x05271D },
+	{ (char*) "ROK"                               , 0x052928 },
+	{ (char*) "Singapore"                         , 0x052AD3 },
+	{ (char*) "Turkey"                            , 0x052BDF },
+	{ (char*) "UCT"                               , 0x05309B },
+	{ (char*) "Universal"                         , 0x053116 },
+	{ (char*) "US/Alaska"                         , 0x053191 },
+	{ (char*) "US/Aleutian"                       , 0x05356E },
+	{ (char*) "US/Arizona"                        , 0x053943 },
+	{ (char*) "US/Central"                        , 0x053A3F },
+	{ (char*) "US/East-Indiana"                   , 0x054125 },
+	{ (char*) "US/Eastern"                        , 0x054344 },
+	{ (char*) "US/Hawaii"                         , 0x054A20 },
+	{ (char*) "US/Indiana-Starke"                 , 0x054B09 },
+	{ (char*) "US/Michigan"                       , 0x054F0D },
+	{ (char*) "US/Mountain"                       , 0x05529C },
+	{ (char*) "US/Pacific"                        , 0x0556BA },
+	{ (char*) "US/Samoa"                          , 0x055BD4 },
+	{ (char*) "UTC"                               , 0x055C72 },
+	{ (char*) "W-SU"                              , 0x055CED },
+	{ (char*) "WET"                               , 0x056085 },
+	{ (char*) "Zulu"                              , 0x056648 },
 };
 
 
-const unsigned char timelib_timezone_db_data_builtin349564 = {
+const unsigned char timelib_timezone_db_data_builtin353987 = {
 
 /* Africa/Abidjan */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1515,7 +1515,7 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xFF,
-0xFF, 0xFF, 0xFF, 0x82, 0x46, 0xC5, 0xF4, 0x01, 0x00, 0x00, 0x1E, 0x8C, 0x00, 0x00, 0x00, 0x00,
+0xFF, 0xFF, 0xFF, 0x8D, 0x42, 0xD5, 0x76, 0x01, 0x00, 0x00, 0x1E, 0x8A, 0x00, 0x00, 0x00, 0x00,
 0x1C, 0x20, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x41, 0x54, 0x00, 0x0A, 0x43, 0x41, 0x54,
 0x2D, 0x32, 0x0A, 0x00, 0x61, 0xB5, 0x05, 0x01, 0x44, 0x60, 0x5D, 0x00, 0x00, 0x00, 0x00, 
 
@@ -2815,12 +2815,11 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
+0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00,
@@ -2847,17 +2846,16 @@
 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x90, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x5F, 0x95, 0x22, 0x70, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x72, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x04, 0x01,
+0x00, 0x00, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01,
 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
-0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x05, 0x02, 0x05, 0x02,
-0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
-0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0xFF, 0xFF, 0x9D, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53,
-0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x43, 0x44,
-0x54, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xA9, 0x11, 0x40, 0x00, 0x72, 0x0F, 0x38,
-0x00, 0x00, 0x00, 0x11, 0x42, 0x61, 0x68, 0x69, 0x61, 0x20, 0x64, 0x65, 0x20, 0x42, 0x61, 0x6E,
-0x64, 0x65, 0x72, 0x61, 0x73, 
+0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x9D, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
+0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0,
+0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44,
+0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xA9, 0x11, 0x40,
+0x00, 0x72, 0x0F, 0x38, 0x00, 0x00, 0x00, 0x11, 0x42, 0x61, 0x68, 0x69, 0x61, 0x20, 0x64, 0x65,
+0x20, 0x42, 0x61, 0x6E, 0x64, 0x65, 0x72, 0x61, 0x73, 
 
 /* America/Barbados */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3287,36 +3285,37 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16, 0x86, 0xD5, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xFA, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xDC, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x35, 0xC4, 0x00, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x04, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xB6, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x66, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x47, 0x24, 0x33, 0x70, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x83, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x49, 0x04, 0x15, 0x70, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x65, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x47, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x29, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x27, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x09, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x54, 0xCD, 0xDD, 0x00, 0x01,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01,
-0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01,
-0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x03, 0xFF, 0xFF, 0xAE, 0xA8, 0x00, 0x00, 0xFF,
-0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00,
-0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45,
-0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35,
-0x0A, 0x00, 0xA9, 0x7F, 0xED, 0x00, 0x8E, 0x43, 0x45, 0x00, 0x00, 0x00, 0x0C, 0x51, 0x75, 0x69,
-0x6E, 0x74, 0x61, 0x6E, 0x61, 0x20, 0x52, 0x6F, 0x6F, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16, 0x8A, 0xE6, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x18, 0x77, 0xCC, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x35, 0xC4, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xF5, 0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xC2, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x46, 0x0F, 0x66, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x33, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x47, 0xF8, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x15, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x49, 0xD8, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x4B, 0xB8, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x4D, 0x98, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x51, 0x61, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x53, 0x41, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x54, 0xCD, 0xDD, 0x00, 0x01, 0x02, 0x01, 0x03, 0x01, 0x03, 0x02, 0x04, 0x03,
+0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03,
+0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03,
+0x01, 0x02, 0xFF, 0xFF, 0xAE, 0xA8, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF,
+0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10,
+0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00,
+0x45, 0x44, 0x54, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35, 0x0A, 0x00, 0xA9, 0x7F, 0xED, 0x00, 0x8E,
+0x43, 0x45, 0x00, 0x00, 0x00, 0x0C, 0x51, 0x75, 0x69, 0x6E, 0x74, 0x61, 0x6E, 0x61, 0x20, 0x52,
+0x6F, 0x6F, 
 
 /* America/Caracas */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x56, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3528,8 +3527,8 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00,
 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00,
 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00,
@@ -3576,8 +3575,8 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00,
 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00,
 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00,
@@ -4196,13 +4195,16 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF,
@@ -4249,13 +4251,14 @@
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92,
-0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF,
-0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
-0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54,
-0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44,
-0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30,
-0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50,
+0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A,
+0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
+0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 
 
 /* America/Fort_Nelson */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -4968,21 +4971,19 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
+0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x04, 0x01,
-0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0xFF, 0xFF, 0x97, 0xF8, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x8F, 0x80, 0x00, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
-0x4D, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0xB5,
-0xAE, 0x6A, 0x00, 0x69, 0x56, 0x25, 0x00, 0x00, 0x00, 0x06, 0x53, 0x6F, 0x6E, 0x6F, 0x72, 0x61,
-
+0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01,
+0x03, 0x01, 0x03, 0x01, 0xFF, 0xFF, 0x97, 0xF8, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
+0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00,
+0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54,
+0x37, 0x0A, 0x00, 0xB5, 0xAE, 0x6A, 0x00, 0x69, 0x56, 0x25, 0x00, 0x00, 0x00, 0x06, 0x53, 0x6F,
+0x6E, 0x6F, 0x72, 0x61, 
 
 /* America/Indiana/Indianapolis */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6208,12 +6209,11 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
+0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00,
@@ -6240,18 +6240,18 @@
 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x4E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x9E, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x5F, 0x95, 0x30, 0x80, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x80, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x61, 0x7E, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x62, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x04, 0x01,
+0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01,
 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
-0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x8F, 0x80, 0x00, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
-0x4D, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0xAC,
-0xC1, 0x42, 0x00, 0x70, 0x47, 0x7D, 0x00, 0x00, 0x00, 0x32, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43,
-0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E, 0x69, 0x61, 0x20, 0x53, 0x75, 0x72, 0x2C, 0x20, 0x4E,
-0x61, 0x79, 0x61, 0x72, 0x69, 0x74, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65,
-0x61, 0x73, 0x29, 0x2C, 0x20, 0x53, 0x69, 0x6E, 0x61, 0x6C, 0x6F, 0x61, 
+0x03, 0x01, 0x03, 0x01, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
+0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00,
+0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54,
+0x37, 0x0A, 0x00, 0xAC, 0xC1, 0x42, 0x00, 0x70, 0x47, 0x7D, 0x00, 0x00, 0x00, 0x32, 0x42, 0x61,
+0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E, 0x69, 0x61, 0x20, 0x53, 0x75,
+0x72, 0x2C, 0x20, 0x4E, 0x61, 0x79, 0x61, 0x72, 0x69, 0x74, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74,
+0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 0x2C, 0x20, 0x53, 0x69, 0x6E, 0x61, 0x6C, 0x6F, 0x61,
+
 
 /* America/Mendoza */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6371,8 +6371,8 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16, 0x86, 0xD5, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x18, 0x4C, 0x4B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16, 0x8A, 0xE6, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x18, 0x24, 0xDA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00,
@@ -6457,8 +6457,8 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC5, 0xDE, 0xB0, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x97, 0x34, 0x50, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC9, 0x55, 0xF1, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xEA, 0xDD, 0x50, 0xFF,
@@ -6644,46 +6644,50 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xF1, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x04, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xB6, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x66, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x47, 0x24, 0x33, 0x70, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x83, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x49, 0x04, 0x15, 0x70, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x65, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x47, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x29, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x27, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x09, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20, 0xEB, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x56, 0x2C, 0x7D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00, 0xCD, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x58, 0x15, 0x9A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0, 0xAF, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x59, 0xF5, 0x7C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0, 0x91, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x5B, 0xD5, 0x5E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9, 0xAE, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x90, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x5F, 0x95, 0x22, 0x70, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x72, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0xFF, 0xFF, 0xA1, 0xF4, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0,
-0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A, 0x43,
-0x53, 0x54, 0x36, 0x0A, 0x00, 0xB0, 0x7E, 0x4A, 0x00, 0x79, 0x96, 0x4D, 0x00, 0x00, 0x00, 0x36,
-0x44, 0x75, 0x72, 0x61, 0x6E, 0x67, 0x6F, 0x3B, 0x20, 0x43, 0x6F, 0x61, 0x68, 0x75, 0x69, 0x6C,
-0x61, 0x2C, 0x20, 0x4E, 0x75, 0x65, 0x76, 0x6F, 0x20, 0x4C, 0x65, 0x6F, 0x6E, 0x2C, 0x20, 0x54,
-0x61, 0x6D, 0x61, 0x75, 0x6C, 0x69, 0x70, 0x61, 0x73, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20,
-0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x55, 0xF1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xF5, 0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xC2, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x46, 0x0F, 0x66, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x33, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x47, 0xF8, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x15, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x49, 0xD8, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x4B, 0xB8, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x4D, 0x98, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x51, 0x61, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x53, 0x41, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x55, 0x20, 0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x7D, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x57, 0x00, 0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x9A, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x58, 0xE0, 0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x7C, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x5A, 0xC0, 0x91, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x5E, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x5C, 0xA9, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x5E, 0x89, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x95, 0x22, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x60, 0x69, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x62, 0x49, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01,
+0x02, 0x01, 0x03, 0x01, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0xA1,
+0xF4, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF,
+0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D,
+0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A,
+0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xB0, 0x7E, 0x4A, 0x00, 0x79, 0x96, 0x4D, 0x00, 0x00, 0x00,
+0x36, 0x44, 0x75, 0x72, 0x61, 0x6E, 0x67, 0x6F, 0x3B, 0x20, 0x43, 0x6F, 0x61, 0x68, 0x75, 0x69,
+0x6C, 0x61, 0x2C, 0x20, 0x4E, 0x75, 0x65, 0x76, 0x6F, 0x20, 0x4C, 0x65, 0x6F, 0x6E, 0x2C, 0x20,
+0x54, 0x61, 0x6D, 0x61, 0x75, 0x6C, 0x69, 0x70, 0x61, 0x73, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74,
+0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
 
 /* America/Montevideo */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7537,8 +7541,8 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00,
 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00,
 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00,
@@ -8243,13 +8247,16 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF,
@@ -8296,13 +8303,14 @@
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92,
-0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF,
-0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
-0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54,
-0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44,
-0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30,
-0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50,
+0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A,
+0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
+0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 
 
 /* America/Santarem */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9087,13 +9095,16 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF,
@@ -9140,14 +9151,15 @@
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92,
-0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF,
-0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
-0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54,
-0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44,
-0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30,
-0x0A, 0x00, 0xBA, 0xF8, 0x95, 0x00, 0x60, 0x1A, 0xDD, 0x00, 0x00, 0x00, 0x0F, 0x42, 0x61, 0x6A,
-0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E, 0x69, 0x61, 
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50,
+0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A,
+0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
+0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xBA, 0xF8, 0x95, 0x00, 0x60, 0x1A, 0xDD, 0x00,
+0x00, 0x00, 0x0F, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E,
+0x69, 0x61, 
 
 /* America/Toronto */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10758,47 +10770,44 @@
 0x20, 0x2D, 0x20, 0x5A, 0x61, 0x62, 0x61, 0x79, 0x6B, 0x61, 0x6C, 0x73, 0x6B, 0x79, 
 
 /* Asia/Choibalsan */
-0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0x86, 0xD3, 0xE7, 0x28, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0B, 0xDC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x18, 0xE9, 0xC8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0xDA, 0xEE, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0xCC, 0x3F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0x22, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x1C, 0xAC, 0x21, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x04, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x1E, 0x8C, 0x03, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7B, 0xE6, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x20, 0x6B, 0xE5, 0x70, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5B, 0xC8, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x22, 0x4B, 0xC7, 0x70, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3B, 0xAA, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x24, 0x2B, 0xA9, 0x70, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1B, 0x8C, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x26, 0x0B, 0x8B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x27, 0x04, 0xA8, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x27, 0xF4, 0xA7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE4, 0x8A, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x29, 0xD4, 0x89, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC4, 0x6C, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x2B, 0xB4, 0x6B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0x4E, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x2D, 0x94, 0x4D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0x30, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x2F, 0x74, 0x2F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0x12, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x5D, 0x4C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x32, 0x4D, 0x2F, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x33, 0x3D, 0x2E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x34, 0x2D, 0x11, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x35, 0x1D, 0x10, 0x70, 0x00, 0x00, 0x00, 0x00, 0x36, 0x0C, 0xF3, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x3A, 0xE9, 0xA5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB4, 0x9E, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3C, 0xA4, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x94, 0x80, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3E, 0x84, 0x7F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x74, 0x62, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x40, 0x64, 0x61, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x54, 0x44, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x42, 0x44, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x34, 0x26, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x44, 0x24, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x1D, 0x43, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x47, 0xEF, 0xAA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x55, 0x15, 0x9A, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x56, 0x05, 0x61, 0x70, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF5, 0x7C, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x57, 0xE5, 0x43, 0x70, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x02, 0x05, 0x02, 0x05, 0x02, 0x00, 0x00, 0x6B, 0x58, 0x00, 0x00,
-0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x00, 0x00, 0x7E, 0x90,
-0x00, 0x0C, 0x00, 0x00, 0x8C, 0xA0, 0x01, 0x10, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x0C, 0x4C, 0x4D,
-0x54, 0x00, 0x2B, 0x30, 0x37, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x2B, 0x31,
-0x30, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x38, 0x3E, 0x2D, 0x38, 0x0A, 0x00, 0xD2, 0xAC, 0x4A, 0x01,
-0xC1, 0x5F, 0x10, 0x00, 0x00, 0x00, 0x12, 0x44, 0x6F, 0x72, 0x6E, 0x6F, 0x64, 0x2C, 0x20, 0x53,
-0x75, 0x6B, 0x68, 0x62, 0x61, 0x61, 0x74, 0x61, 0x72, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0x86, 0xD3, 0xEE, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0B, 0xDC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x18, 0xE9, 0xC8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0xDA, 0xFC, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xCC, 0x4D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0x30, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xAC, 0x2F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x12, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0x8C, 0x11, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7B, 0xF4, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x6B, 0xF3, 0x80, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5B, 0xD6, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x4B, 0xD5, 0x80, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3B, 0xB8, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x2B, 0xB7, 0x80, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1B, 0x9A, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x0B, 0x99, 0x80, 0x00, 0x00, 0x00, 0x00, 0x27, 0x04, 0xB6, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xF4, 0xB6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE4, 0x98, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xD4, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC4, 0x7A, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xB4, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0x5C, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x94, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0x3E, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x74, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0x20, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x5D, 0x5A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x32, 0x4D, 0x3D, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x3D, 0x3C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x34, 0x2D, 0x1F, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x1D, 0x1E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x36, 0x0D, 0x01, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xE9, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB4, 0xAC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xA4, 0xAB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x94, 0x8E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x84, 0x8D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x74, 0x70, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x64, 0x6F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x54, 0x52, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x44, 0x51, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x34, 0x34, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x24, 0x33, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x1D, 0x51, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x55, 0x15, 0x9A, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x05, 0x61, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x56, 0xF5, 0x7C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x57, 0xE5, 0x43, 0x70, 0x01,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x00, 0x00, 0x64, 0x34, 0x00, 0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x00, 0x00, 0x7E,
+0x90, 0x01, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x37,
+0x00, 0x2B, 0x30, 0x39, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x38, 0x3E, 0x2D,
+0x38, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Asia/Chongqing */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10998,7 +11007,7 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xFF,
-0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x18, 0xC4, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x99, 0x32, 0xF0, 0x00,
+0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x1E, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x99, 0x32, 0xF0, 0x00,
 0x00, 0x00, 0x00, 0x0B, 0xEA, 0x30, 0x70, 0x00, 0x00, 0x00, 0x00, 0x39, 0xC3, 0x99, 0x00, 0x01,
 0x02, 0x01, 0x02, 0x00, 0x00, 0x75, 0xBC, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04, 0x00,
 0x00, 0x7E, 0x90, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x39,
@@ -11619,10 +11628,9 @@
 0x03, 0x00, 0x00, 0x55, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x54, 0x60, 0x00, 0x04, 0x00, 0x00, 0x70,
 0x80, 0x01, 0x08, 0x00, 0x00, 0x62, 0x70, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x36,
 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x37, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x37, 0x3E, 0x2D,
-0x37, 0x0A, 0x00, 0xD2, 0x98, 0xC2, 0x01, 0x9E, 0x81, 0x47, 0x00, 0x00, 0x00, 0x2B, 0x42, 0x61,
-0x79, 0x61, 0x6E, 0x2D, 0x4F, 0x6C, 0x67, 0x69, 0x79, 0x2C, 0x20, 0x47, 0x6F, 0x76, 0x69, 0x2D,
-0x41, 0x6C, 0x74, 0x61, 0x69, 0x2C, 0x20, 0x48, 0x6F, 0x76, 0x64, 0x2C, 0x20, 0x55, 0x76, 0x73,
-0x2C, 0x20, 0x5A, 0x61, 0x76, 0x6B, 0x68, 0x61, 0x6E, 
+0x37, 0x0A, 0x00, 0xD2, 0x98, 0xC2, 0x01, 0x9E, 0x81, 0x47, 0x00, 0x00, 0x00, 0x16, 0x42, 0x61,
+0x79, 0x61, 0x6E, 0x2D, 0x4F, 0x6C, 0x67, 0x69, 0x69, 0x2C, 0x20, 0x48, 0x6F, 0x76, 0x64, 0x2C,
+0x20, 0x55, 0x76, 0x73, 
 
 /* Asia/Irkutsk */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -13733,15 +13741,15 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x18, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1D, 0xFF,
 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x1B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0xAA, 0xA0, 0xFF,
 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x89, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xE3, 0xA0, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9C, 0x9D, 0x09, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x9F, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x8E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xD3, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x70, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8C, 0x06, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xF5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x8B, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x29, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xBF, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAA, 0x06, 0x0B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xF4, 0xAB, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9C, 0x9D, 0x17, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x9F, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x4B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xD3, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x7E, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8C, 0x06, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA2, 0x42, 0x03, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x8B, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x37, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xBF, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAA, 0x06, 0x0B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x7C, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xC4, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x40, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x6B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x22, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x88, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x3E, 0x90, 0xFF,
@@ -13754,7 +13762,7 @@
 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x7A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x6B, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x21, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x4D, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0xB3, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xC8, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xFB, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x01, 0x4B, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xFB, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xEE, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x3C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x7F, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x6F, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xC0, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x68, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xBF, 0x10, 0xFF,
@@ -13784,42 +13792,39 @@
 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xBC, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0xAD, 0xC0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x9E, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x8F, 0xC0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x80, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x71, 0xC0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x62, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x29, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x12, 0x54, 0x26, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x44, 0x09, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x14, 0x34, 0x08, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xF9, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x16, 0x13, 0xEA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xDB, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x17, 0xF3, 0xCC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xCB, 0xB0, 0x00,
-0x00, 0x00, 0x00, 0x19, 0xD3, 0xAE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x9F, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x1B, 0xBC, 0xCB, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xBC, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x1D, 0x9C, 0xAD, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x9E, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x1F, 0x7C, 0x8F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x80, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x21, 0x5C, 0x71, 0x20, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x62, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x23, 0x3C, 0x53, 0x20, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x44, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x25, 0x1C, 0x35, 0x20, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x26, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x27, 0x05, 0x51, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x42, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x28, 0xE5, 0x33, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x24, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x2A, 0xC5, 0x15, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x62, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x53, 0xC0, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0x3D, 0x0E, 0x20, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0x1F, 0xC2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02,
-0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02,
+0x04, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0xFF, 0xFF, 0xE7, 0xF0, 0x00,
-0x00, 0xFF, 0xFF, 0xE5, 0x28, 0x00, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF, 0xE3,
-0xE0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x31,
-0x00, 0x2D, 0x30, 0x32, 0x00, 0x2B, 0x30, 0x30, 0x00, 0x57, 0x45, 0x54, 0x00, 0x0A, 0x3C, 0x2D,
-0x30, 0x31, 0x3E, 0x31, 0x3C, 0x2B, 0x30, 0x30, 0x3E, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30,
-0x2F, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x0A, 0x00, 0xC2, 0xE7,
-0xD5, 0x00, 0xEB, 0x7E, 0x75, 0x00, 0x00, 0x00, 0x06, 0x41, 0x7A, 0x6F, 0x72, 0x65, 0x73, 
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x07, 0x06, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0xFF, 0xFF, 0xE7, 0xF0,
+0x00, 0x00, 0xFF, 0xFF, 0xE5, 0x28, 0x00, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF,
+0xE3, 0xE0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08,
+0x00, 0x00, 0x0E, 0x10, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x4C, 0x4D, 0x54, 0x00,
+0x48, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x31, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x2B, 0x30, 0x30, 0x00,
+0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x0A, 0x3C, 0x2D, 0x30, 0x31, 0x3E, 0x31,
+0x3C, 0x2B, 0x30, 0x30, 0x3E, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x30, 0x2C, 0x4D,
+0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x0A, 0x00, 0xC2, 0xE7, 0xD5, 0x00, 0xEB, 0x7E,
+0x75, 0x00, 0x00, 0x00, 0x06, 0x41, 0x7A, 0x6F, 0x72, 0x65, 0x73, 
 
 /* Atlantic/Bermuda */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -14051,15 +14056,15 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x1D, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x1D, 0xFF,
 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x13, 0x58, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x9C, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x7B, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xD5, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x91, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x80, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xC5, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xF8, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x7D, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xB1, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xFD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xF4, 0x9D, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9C, 0x9D, 0x09, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x91, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x3D, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xC5, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x70, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xF8, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xF5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x7D, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x29, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xB1, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xFD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x6E, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xB6, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x32, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x5D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x14, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x7A, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x30, 0x80, 0xFF,
@@ -14072,7 +14077,7 @@
 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x6C, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x5D, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x13, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x3F, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0xA5, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xBA, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xED, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x01, 0x3D, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xED, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xE0, 0x80, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x2E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x71, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x61, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xB1, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x59, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xB1, 0x00, 0xFF,
@@ -14102,43 +14107,38 @@
 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xAE, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x9F, 0xB0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x90, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x81, 0xB0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x72, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x63, 0xB0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x54, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x10, 0x74, 0x28, 0x80, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x19, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x43, 0xFB, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xBD, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x54, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x45, 0xB0, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x0C, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x18, 0xE3, 0xA1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xC3, 0x83, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xAC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0x8C, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02,
-0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02, 0x04, 0x02, 0x03, 0x02,
+0x04, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x05, 0x06, 0x05, 0x06,
 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
-0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0xFF, 0xFF, 0xF0, 0x28, 0x00,
-0x00, 0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1,
-0xF0, 0x00, 0x0C, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x10, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x14, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x19, 0x4C, 0x4D, 0x54, 0x00, 0x46, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x30,
-0x00, 0x2D, 0x30, 0x31, 0x00, 0x2B, 0x30, 0x31, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45,
-0x54, 0x00, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35,
-0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0xBB, 0x1F,
-0xA5, 0x00, 0xF8, 0xDE, 0xF0, 0x00, 0x00, 0x00, 0x0F, 0x4D, 0x61, 0x64, 0x65, 0x69, 0x72, 0x61,
-0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73, 
+0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x00,
+0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1, 0xF0,
+0x00, 0x0C, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00,
+0x0E, 0x10, 0x01, 0x18, 0x4C, 0x4D, 0x54, 0x00, 0x46, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x30, 0x00,
+0x2D, 0x30, 0x31, 0x00, 0x2B, 0x30, 0x31, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54,
+0x00, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E,
+0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0xBB, 0x1F, 0xA5,
+0x00, 0xF8, 0xDE, 0xF0, 0x00, 0x00, 0x00, 0x0F, 0x4D, 0x61, 0x64, 0x65, 0x69, 0x72, 0x61, 0x20,
+0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73, 
 
 /* Atlantic/Reykjavik */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x49, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16195,41 +16195,71 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x17, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xC8, 0x09, 0x71, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x82, 0x25, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x4E, 0x40, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x0E, 0x10,
-0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54,
-0x00, 0x0A, 0x43, 0x45, 0x54, 0x2D, 0x31, 0x43, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35,
-0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1A, 0xFF,
+0xFF, 0xFF, 0xFF, 0x56, 0xB6, 0xDF, 0xE6, 0xFF, 0xFF, 0xFF, 0xFF, 0x6D, 0xE8, 0xC8, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0x98, 0x44, 0x49, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x25, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xCE, 0xF8, 0x30, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x60, 0xA5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x7E, 0xBB, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA2, 0x2E, 0x12, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x7A, 0x4C, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x35, 0x81, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x5E, 0x23, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA6, 0x25, 0x35, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0x27, 0x9B, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA8, 0x2A, 0x01, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x07, 0x7D, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA9, 0xEE, 0x34, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAB, 0xD7, 0x50, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAC, 0xC7, 0x41, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x4C, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0xB2, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x2E, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB5, 0x49, 0x5A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x30, 0x10, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x76, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xF2, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xE3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xD4, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBA, 0xD6, 0x8B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0xD8, 0xF1, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xE2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xD3, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x89, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0xB5, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC0, 0x9B, 0x1B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x97, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x88, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x79, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x2F, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x5B, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0xC1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xD6, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0xDA, 0x09, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x4A, 0x19, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD0, 0x6E, 0x5E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x4E, 0x40, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x91, 0x40, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD4, 0x4B, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01,
+0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05,
+0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05,
+0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05,
+0x02, 0x05, 0x02, 0x05, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x00, 0x00, 0x04, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x04, 0x1A, 0x00,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x1C,
+0x20, 0x01, 0x10, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x15, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x4D, 0x54,
+0x00, 0x57, 0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45,
+0x53, 0x54, 0x00, 0x0A, 0x43, 0x45, 0x54, 0x2D, 0x31, 0x43, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33,
+0x2E, 0x35, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Chile/Continental */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16402,62 +16432,112 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x2C, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBA, 0xF9, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x0E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xDB, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xFE, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x09, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x67, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x49, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x49, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x2B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x2B, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x0D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x0D, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x87, 0xEF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xEF, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x03, 0x71, 0x0C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x0B, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x05, 0x50, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xED, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x07, 0x30, 0xD0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x27, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x09, 0x10, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0xA3, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0A, 0xF0, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x93, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x0C, 0xD9, 0xB0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x75, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x0E, 0xB9, 0x92, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x92, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x10, 0x99, 0x74, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x74, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x12, 0x79, 0x56, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x56, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x38, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x1A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x18, 0x22, 0x37, 0x70, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xFC, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0x02, 0x19, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x18, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x1B, 0xE1, 0xFB, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xFA, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x1D, 0xC1, 0xDD, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xDC, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x1F, 0xA1, 0xBF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x0F, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x21, 0x81, 0xA1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xF1, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xD3, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x25, 0x4A, 0x9F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xB5, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x27, 0x2A, 0x81, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xD1, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x29, 0x0A, 0x63, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xB3, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x2A, 0xEA, 0x45, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x95, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x2C, 0xD3, 0x62, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x77, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x2E, 0xB3, 0x44, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x59, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x30, 0x93, 0x26, 0x70, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xDB, 0xAC, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xB7, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9,
-0xB0, 0x01, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0x43,
-0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50, 0x54, 0x00, 0x0A,
-0x43, 0x53, 0x54, 0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
-0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAF, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
+0xFF, 0xFF, 0xFF, 0x5E, 0x03, 0xFE, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x2C, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9F, 0xBA, 0xF9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x0E, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xDB, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0xCB, 0x74, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA3, 0x83, 0xF7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x45, 0xD2, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0x63, 0xD9, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA6, 0x53, 0xD9, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA7, 0x15, 0x97, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x33, 0xBB, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA8, 0xFE, 0xB3, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x13, 0x9D, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAA, 0xDE, 0x95, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAB, 0xF3, 0x7F, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAC, 0xBE, 0x77, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xD3, 0x61, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAE, 0x9E, 0x59, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xB3, 0x43, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB0, 0x7E, 0x3B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x9C, 0x5F, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB2, 0x67, 0x58, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x7C, 0x41, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB4, 0x47, 0x3A, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB5, 0x5C, 0x23, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x27, 0x1C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x3C, 0x05, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0x06, 0xFE, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0x1B, 0xE7, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB9, 0xE6, 0xE0, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0x05, 0x04, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBB, 0xC6, 0xC2, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xE4, 0xE6, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBD, 0xAF, 0xDE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0xC4, 0xC8, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBF, 0x8F, 0xC0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x5A, 0xD6, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC1, 0xB0, 0x3C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x84, 0x8C, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC3, 0x4F, 0x84, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x64, 0x6E, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC5, 0x2F, 0x66, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x4D, 0x8A, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0x0F, 0x48, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x2D, 0x6C, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC8, 0xF8, 0x65, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0x0D, 0x4E, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCA, 0xD8, 0x47, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xFE, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x09, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD3, 0x75, 0xF3, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x40, 0xEB, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD5, 0x55, 0xD5, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x20, 0xCD, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD7, 0x35, 0xB7, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x00, 0xAF, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD9, 0x15, 0x99, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE0, 0x91, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDA, 0xFE, 0xB5, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0x97, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0x90, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x79, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x72, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE0, 0x9E, 0x5B, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x69, 0x54, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x3D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x36, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x1F, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x57, 0x3C, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x3C, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x37, 0x1E, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x1E, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0x17, 0x00, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xF6, 0xE2, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xE2, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xD6, 0xC4, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xC4, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0xBF, 0xE1, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEF, 0xAF, 0xE0, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x9F, 0xC3, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF1, 0x8F, 0xC2, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x7F, 0xA5, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF3, 0x6F, 0xA4, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5F, 0x87, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF5, 0x4F, 0x86, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x3F, 0x69, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x68, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x85, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF9, 0x0F, 0x4A, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08, 0x67, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x67, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x49, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x49, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x2B, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x2B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x0D, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x98, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xEF, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x02, 0x77, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x0C, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x61, 0x0B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xEE, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x06, 0x40, 0xED, 0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xD0, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x8D, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xB2, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x09, 0xAD, 0xA3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0x94, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0x93, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xB0, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x75, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0x92, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x74, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x56, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x37, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x08, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x19, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x18, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xFB, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD1, 0xFA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xDD, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xDC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xBF, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xA1, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x55, 0xF1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x9F, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xB5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x81, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xD1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x63, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xB3, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x45, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0x95, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x62, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x77, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x44, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x59, 0x80, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x26, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xAC, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x45, 0xF3, 0xB7, 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x05, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xAD, 0xD4, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0,
+0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF,
+0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x44,
+0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50,
+0x54, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
+0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Cuba */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16538,11 +16618,19 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0x00,
-0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x37, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1A, 0xFF,
+0xFF, 0xFF, 0xFF, 0x74, 0x3F, 0x98, 0x44, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x80, 0x21, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB9, 0x7C, 0xE9, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xC6, 0xAF, 0xD0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC9, 0xF2, 0x63, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0x10, 0xA8, 0x50, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xAA, 0x4C, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCE, 0xA2, 0x18, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x93, 0x69, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDF, 0x13, 0x9E, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0xB7, 0x0A, 0x50, 0x00,
+0x00, 0x00, 0x00, 0x09, 0xEC, 0x5E, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x18, 0xF4, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xCD, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xBD, 0x9F, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xA4, 0x55, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8C, 0x5D, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10, 0x6A, 0xFC, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x64, 0x7B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x12, 0x52, 0xAA, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x46, 0x82, 0x60, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xC2, 0x50, 0x00,
 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00,
@@ -16558,13 +16646,17 @@
 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
-0x1C, 0x20, 0x00, 0x05, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45,
-0x45, 0x54, 0x00, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33,
-0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x34,
-0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01, 0x03, 0x02, 0x03, 0x02, 0x05, 0x04, 0x05, 0x04,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x00, 0x00,
+0x16, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x16, 0x3C, 0x00, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x08,
+0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x11, 0x00, 0x00, 0x1C, 0x20,
+0x01, 0x15, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45,
+0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x45, 0x45, 0x54,
+0x2D, 0x32, 0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x2C,
+0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x34, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Egypt */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16754,9 +16846,12 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF,
-0xFF, 0xB9, 0xB0, 0x00, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35, 0x0A, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xFF,
+0xFF, 0xFF, 0xFF, 0x69, 0x87, 0x26, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x8B, 0xF4, 0x61, 0xE8, 0x01,
+0x02, 0xFF, 0xFF, 0xB5, 0x70, 0x00, 0x00, 0xFF, 0xFF, 0xB5, 0x18, 0x00, 0x04, 0xFF, 0xFF, 0xB9,
+0xB0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x4D, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A,
+0x45, 0x53, 0x54, 0x35, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 
 
 /* EST5EDT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -16764,62 +16859,111 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x1E, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBA, 0xEB, 0x60, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x00, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xCD, 0x60, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xF0, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x60, 0xFB, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x58, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x3B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x3A, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x1D, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x1C, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0xFE, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x87, 0xE1, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xE0, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x03, 0x70, 0xFE, 0x60, 0x00, 0x00, 0x00, 0x00, 0x04, 0x60, 0xFD, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x05, 0x50, 0xE0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xDF, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x07, 0x30, 0xC2, 0x60, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x19, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x09, 0x10, 0xA4, 0x60, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0x94, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x0A, 0xF0, 0x86, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x85, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x0C, 0xD9, 0xA2, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x67, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x0E, 0xB9, 0x84, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x83, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x10, 0x99, 0x66, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x65, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x12, 0x79, 0x48, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x47, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x14, 0x59, 0x2A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x29, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x16, 0x39, 0x0C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x0B, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x18, 0x22, 0x29, 0x60, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xED, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0x02, 0x0B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x0A, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x1B, 0xE1, 0xED, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xEC, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x1D, 0xC1, 0xCF, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xCE, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x1F, 0xA1, 0xB1, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x00, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x21, 0x81, 0x93, 0x60, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xE2, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x23, 0x6A, 0xAF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xC4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x25, 0x4A, 0x91, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xA6, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x27, 0x2A, 0x73, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xC3, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x29, 0x0A, 0x55, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xA5, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x2A, 0xEA, 0x37, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x87, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x2C, 0xD3, 0x54, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x69, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x2E, 0xB3, 0x36, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x4B, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x30, 0x93, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x72, 0xFA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x52, 0xDC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xBE, 0x60, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x0D, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1B, 0xDA, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xEF, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xBC, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xD1, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xDB, 0x9E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xEE, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0x80, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xD0, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x62, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xB2, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0x7F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0x94, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x61, 0x60, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x76, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x43, 0x60, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0, 0x01,
-0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0xFF, 0xFF, 0xC7,
-0xC0, 0x01, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0x45,
-0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00, 0x0A,
-0x45, 0x53, 0x54, 0x35, 0x45, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
-0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAF, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0x5E, 0x03, 0xF0, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x1E, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9F, 0xBA, 0xEB, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x00, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xCD, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x65, 0xE2, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA3, 0x83, 0xE9, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x6A, 0xAE, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0x35, 0xA7, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xA6, 0x53, 0xCA, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA7, 0x15, 0x89, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x33, 0xAC, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA8, 0xFE, 0xA5, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x13, 0x8E, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAA, 0xDE, 0x87, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAB, 0xF3, 0x70, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAC, 0xBE, 0x69, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xD3, 0x52, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAE, 0x9E, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xB3, 0x34, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB0, 0x7E, 0x2D, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x9C, 0x51, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB2, 0x67, 0x4A, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x7C, 0x33, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB4, 0x47, 0x2C, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB5, 0x5C, 0x15, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x27, 0x0E, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x3B, 0xF7, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0x06, 0xF0, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0x1B, 0xD9, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB9, 0xE6, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0x04, 0xF5, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBB, 0xC6, 0xB4, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xE4, 0xD7, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBD, 0xAF, 0xD0, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0xC4, 0xB9, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBF, 0x8F, 0xB2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0xA4, 0x9B, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC1, 0x6F, 0x94, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x84, 0x7D, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC3, 0x4F, 0x76, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x64, 0x5F, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC5, 0x2F, 0x58, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x4D, 0x7C, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0x0F, 0x3A, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x2D, 0x5E, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC8, 0xF8, 0x57, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0x0D, 0x40, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCA, 0xD8, 0x39, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xF0, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x60, 0xFB, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD3, 0x75, 0xE4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x40, 0xDD, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD5, 0x55, 0xC6, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x20, 0xBF, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD7, 0x35, 0xA8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x00, 0xA1, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD9, 0x15, 0x8A, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE0, 0x83, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDA, 0xFE, 0xA7, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x65, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0x89, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0x82, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x6B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x64, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE0, 0x9E, 0x4D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x69, 0x46, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x2F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x28, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x11, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x57, 0x2E, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x2D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x37, 0x10, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x0F, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0x16, 0xF2, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEA, 0x06, 0xF1, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xF6, 0xD4, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xD3, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xD6, 0xB6, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xB5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0xBF, 0xD3, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEF, 0xAF, 0xD2, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x9F, 0xB5, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF1, 0x8F, 0xB4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x7F, 0x97, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF3, 0x6F, 0x96, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5F, 0x79, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF5, 0x4F, 0x78, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x3F, 0x5B, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x5A, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x77, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF9, 0x0F, 0x3C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08, 0x59, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x58, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x3B, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x3A, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x1D, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x1C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0xFF, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x97, 0xFE, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xE1, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x02, 0x77, 0xE0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x03, 0x70, 0xFE, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x60, 0xFD, 0x70, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xE0, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x06, 0x40, 0xDF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xC2, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x8D, 0x19, 0x70, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xA4, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x09, 0xAD, 0x94, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0x86, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0x85, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xA2, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x67, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0x84, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0x83, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x66, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x65, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x48, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x47, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x2A, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x29, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x0C, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x0B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x29, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x08, 0xED, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x0B, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x0A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xED, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD1, 0xEC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xCF, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xCE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xB1, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0x93, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x55, 0xE2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xAF, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xC4, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x91, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xA6, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x73, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xC3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x55, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xA5, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x37, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0x87, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x54, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x69, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x36, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x4B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x18, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xFA, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xDC, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xBE, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x0D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xDA, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE6, 0xEF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xBC, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xD1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x9E, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xAF, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x80, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xD0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x62, 0xE0, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x7F, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x61, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0x76, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x43, 0x60, 0x00,
+0x00, 0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xBA, 0x9E, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0,
+0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF,
+0xC7, 0xC0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00,
+0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35, 0x45, 0x44, 0x54,
+0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Etc/GMT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -18685,15 +18829,15 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8D, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1B, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1B, 0xFF,
 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x8E, 0x80, 0xFF,
 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xC7, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xED, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x72, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x54, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xD9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x0C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xF4, 0x8E, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x2F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x22, 0x70, 0xFF,
@@ -18706,7 +18850,7 @@
 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x4E, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x30, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xAC, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x01, 0x2F, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xD2, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x62, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xA3, 0xE0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xA2, 0xF0, 0xFF,
@@ -18736,43 +18880,44 @@
 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x91, 0xA0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x73, 0xA0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x55, 0xA0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x28, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x11, 0x64, 0x19, 0x80, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x13, 0x43, 0xFB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x18, 0xE3, 0xBD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x37, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xDD, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x13, 0xCE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xBF, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xA1, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x83, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xA0, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01,
-0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01,
+0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x01, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x0E, 0x10,
-0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54,
-0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45,
-0x53, 0x54, 0x00, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E,
-0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0xC4,
-0x67, 0xF2, 0x01, 0x04, 0xB8, 0xCA, 0x00, 0x00, 0x00, 0x13, 0x50, 0x6F, 0x72, 0x74, 0x75, 0x67,
-0x61, 0x6C, 0x20, 0x28, 0x6D, 0x61, 0x69, 0x6E, 0x6C, 0x61, 0x6E, 0x64, 0x29, 
+0x02, 0x01, 0x02, 0x01, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x01, 0xFF, 0xFF, 0xF7,
+0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01,
+0x16, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45,
+0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x57, 0x45, 0x54,
+0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D,
+0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0xC4, 0x67, 0xF2, 0x01, 0x04, 0xB8, 0xCA, 0x00,
+0x00, 0x00, 0x13, 0x50, 0x6F, 0x72, 0x74, 0x75, 0x67, 0x61, 0x6C, 0x20, 0x28, 0x6D, 0x61, 0x69,
+0x6E, 0x6C, 0x61, 0x6E, 0x64, 0x29, 
 
 /* Europe/Ljubljana */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x53, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -20985,9 +21130,16 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF,
-0xFF, 0x73, 0x60, 0x00, 0x00, 0x48, 0x53, 0x54, 0x00, 0x0A, 0x48, 0x53, 0x54, 0x31, 0x30, 0x0A,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0x74, 0xE0, 0x70, 0xBE, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0x05, 0x43, 0x48, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBB, 0x21, 0x71, 0x58, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x3D, 0xC8, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x49, 0x38, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD5, 0x8D, 0x73, 0x48, 0x01, 0x02, 0x01, 0x03, 0x04, 0x01, 0x05, 0xFF, 0xFF,
+0x6C, 0x02, 0x00, 0x00, 0xFF, 0xFF, 0x6C, 0x58, 0x00, 0x04, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x08,
+0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x0C, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x10, 0xFF, 0xFF, 0x73, 0x60,
+0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x53, 0x54, 0x00, 0x48, 0x44, 0x54, 0x00, 0x48, 0x57,
+0x54, 0x00, 0x48, 0x50, 0x54, 0x00, 0x0A, 0x48, 0x53, 0x54, 0x31, 0x30, 0x0A, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Iceland */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -21353,41 +21505,71 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x17, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xC8, 0x09, 0x71, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x82, 0x25, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x4E, 0x40, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x0E, 0x10,
-0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x4D, 0x45, 0x53, 0x54, 0x00, 0x4D, 0x45, 0x54,
-0x00, 0x0A, 0x4D, 0x45, 0x54, 0x2D, 0x31, 0x4D, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35,
-0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1A, 0xFF,
+0xFF, 0xFF, 0xFF, 0x56, 0xB6, 0xDF, 0xE6, 0xFF, 0xFF, 0xFF, 0xFF, 0x6D, 0xE8, 0xC8, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0x98, 0x44, 0x49, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x25, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xCE, 0xF8, 0x30, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x60, 0xA5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x7E, 0xBB, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA2, 0x2E, 0x12, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x7A, 0x4C, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x35, 0x81, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x5E, 0x23, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA6, 0x25, 0x35, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0x27, 0x9B, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA8, 0x2A, 0x01, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x07, 0x7D, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA9, 0xEE, 0x34, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAB, 0xD7, 0x50, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAC, 0xC7, 0x41, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x4C, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0xB2, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x2E, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB5, 0x49, 0x5A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x30, 0x10, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x76, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xF2, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xE3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xD4, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBA, 0xD6, 0x8B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0xD8, 0xF1, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xE2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xD3, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x89, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0xB5, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC0, 0x9B, 0x1B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x97, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x88, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x79, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x2F, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x5B, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0xC1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xD6, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0xDA, 0x09, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x4A, 0x19, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD0, 0x6E, 0x5E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x4E, 0x40, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x91, 0x40, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD4, 0x4B, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01,
+0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05,
+0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05,
+0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05,
+0x02, 0x05, 0x02, 0x05, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x00, 0x00, 0x04, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x04, 0x1A, 0x00,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x1C,
+0x20, 0x01, 0x10, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x15, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x4D, 0x54,
+0x00, 0x57, 0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45,
+0x53, 0x54, 0x00, 0x0A, 0x43, 0x45, 0x54, 0x2D, 0x31, 0x43, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33,
+0x2E, 0x35, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Mexico/BajaNorte */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -21395,13 +21577,16 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF,
@@ -21448,13 +21633,14 @@
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92,
-0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF,
-0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
-0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54,
-0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44,
-0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30,
-0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50,
+0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A,
+0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
+0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 
 
 /* Mexico/BajaSur */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -21462,12 +21648,11 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
+0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00,
@@ -21494,15 +21679,14 @@
 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x4E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x9E, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x5F, 0x95, 0x30, 0x80, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x80, 0x10, 0x00,
 0x00, 0x00, 0x00, 0x61, 0x7E, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x62, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x04, 0x01,
+0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01,
 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01,
-0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x8F, 0x80, 0x00, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
-0x4D, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x03, 0x01, 0x03, 0x01, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
+0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00,
+0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54,
+0x37, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Mexico/General */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -21511,8 +21695,8 @@
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x18, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC5, 0xDE, 0xB0, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x97, 0x34, 0x50, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC9, 0x55, 0xF1, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xEA, 0xDD, 0x50, 0xFF,
@@ -21562,9 +21746,17 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF,
-0xFF, 0x9D, 0x90, 0x00, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0x5E, 0x04, 0x0C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x3A, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x07, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x1C, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xE9, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x0C, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCF, 0x17, 0xDF, 0x1C, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x8F, 0xE5, 0xAC, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD0, 0x81, 0x1A, 0x1C, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x75, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x58, 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x01, 0x02, 0xFF, 0xFF, 0x96, 0xEE, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF,
+0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44,
+0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* MST7MDT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -21572,62 +21764,67 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x3A, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x07, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x1C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xE9, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x0C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x18, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x75, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x58, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x57, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x3A, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x39, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x1B, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x87, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xFD, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x03, 0x71, 0x1A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x19, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x05, 0x50, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xFB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x07, 0x30, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x35, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x09, 0x10, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0xB1, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x0A, 0xF0, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xA1, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x0C, 0xD9, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x83, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x0E, 0xB9, 0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xA0, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x10, 0x99, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x82, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x12, 0x79, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x14, 0x59, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x16, 0x39, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x18, 0x22, 0x45, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x0A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0x02, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x26, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1B, 0xE2, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x08, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1D, 0xC1, 0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xEA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1F, 0xA1, 0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x1D, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x21, 0x81, 0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xFF, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x23, 0x6A, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x25, 0x4A, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x27, 0x2A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x29, 0x0A, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2A, 0xEA, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2C, 0xD3, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x85, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2E, 0xB3, 0x52, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x67, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x30, 0x93, 0x34, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xDB, 0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x01,
-0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB,
-0xA0, 0x01, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4D,
-0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x0A,
-0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
-0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0x5E, 0x04, 0x0C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x3A, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x07, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x1C, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xE9, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x65, 0xFE, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA3, 0x84, 0x06, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x45, 0xE0, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x8F, 0xA6, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x0C, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x18, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x76, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x94, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF9, 0x0F, 0x58, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08, 0x76, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x75, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x58, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x57, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x3A, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x39, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x1C, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x98, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xFE, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x02, 0x77, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x1A, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x61, 0x19, 0x90, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xFC, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x06, 0x40, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xDE, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x8D, 0x35, 0x90, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xC0, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x09, 0xAD, 0xB1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0xA2, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xBF, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xA1, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0xA0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x83, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x82, 0x10, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x65, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x47, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x29, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x45, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x09, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x27, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x26, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x09, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD2, 0x08, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xEB, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xCD, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x1D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xAF, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x55, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xCC, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xAE, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x72, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x54, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x70, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x85, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x52, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x67, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x34, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xBB, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x03, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0x9D, 0x94, 0x00, 0x00, 0xFF, 0xFF,
+0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C,
+0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53,
+0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D,
+0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E,
+0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Navajo */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -22757,15 +22954,15 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8D, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1B, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1B, 0xFF,
 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x8E, 0x80, 0xFF,
 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xC7, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xED, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x72, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x54, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xD9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x0C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xF4, 0x8E, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x2F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x22, 0x70, 0xFF,
@@ -22778,7 +22975,7 @@
 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x4E, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x30, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xAC, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x01, 0x2F, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xD2, 0x70, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x62, 0xF0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xA3, 0xE0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xA2, 0xF0, 0xFF,
@@ -22808,42 +23005,43 @@
 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x91, 0xA0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x73, 0xA0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x55, 0xA0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x28, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x11, 0x64, 0x19, 0x80, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x13, 0x43, 0xFB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x18, 0xE3, 0xBD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x37, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xDD, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x13, 0xCE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xBF, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xA1, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x83, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xA0, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01,
-0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01,
+0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x01, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x0E, 0x10,
-0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54,
-0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45,
-0x53, 0x54, 0x00, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E,
-0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x02, 0x01, 0x02, 0x01, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x01, 0xFF, 0xFF, 0xF7,
+0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01,
+0x16, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45,
+0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x57, 0x45, 0x54,
+0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D,
+0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 
 
 /* PRC */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -22879,62 +23077,83 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x48, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x15, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x2A, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xF7, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x1A, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x26, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x83, 0x20, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x66, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x65, 0x20, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x48, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x47, 0x20, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x29, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x88, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x02, 0x78, 0x0B, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x03, 0x71, 0x28, 0x90, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x27, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x05, 0x51, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x06, 0x41, 0x09, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x07, 0x30, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x43, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x09, 0x10, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0xBF, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x0A, 0xF0, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x12, 0x79, 0x73, 0x10, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0x02, 0x35, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x21, 0x81, 0xBD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x29, 0x0A, 0x80, 0x10, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62, 0x10, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x30, 0x93, 0x42, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x73, 0x24, 0x90, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x53, 0x06, 0x90, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xE8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1C, 0x05, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0xA9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x8B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x6D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xD3, 0x20, 0x01,
-0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x04, 0xFF, 0xFF, 0x9D,
-0x90, 0x01, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0x50,
-0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A,
-0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
-0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0x5E, 0x04, 0x1A, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x48, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x15, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x2A, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xF7, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x1A, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x26, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD6, 0xFE, 0x74, 0x5C, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x80, 0xAD, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDA, 0xFE, 0xC3, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x90, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xA5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x87, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE0, 0x9E, 0x69, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x69, 0x70, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEF, 0xAF, 0xEE, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x71, 0xBB, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF1, 0x8F, 0xD0, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x7F, 0xC1, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF3, 0x6F, 0xB2, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5F, 0xA3, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF5, 0x4F, 0x94, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x3F, 0x85, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x76, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0xA2, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF9, 0x0F, 0x58, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08, 0x84, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x83, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x66, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x65, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x48, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x47, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x2A, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x98, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x01, 0x88, 0x0C, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x02, 0x78, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x28, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x61, 0x27, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x05, 0x51, 0x0A, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x06, 0x41, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xEC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x8D, 0x43, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xCE, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x09, 0xAD, 0xBF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0xB0, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x45, 0xF3, 0xD3, 0x20, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0x91, 0x26, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x04,
+0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90,
+0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x57,
+0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D,
+0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* ROC */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -23907,33 +24126,94 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0x00,
-0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57,
-0x45, 0x54, 0x00, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E,
-0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1B, 0xFF,
+0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x8E, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xC7, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x2F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x22, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0x88, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x04, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x4C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xC8, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xB9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xAA, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xB7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xA8, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x5F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0x8A, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC0, 0x9A, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x6C, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x4E, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x30, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xAC, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xD2, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x62, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xA3, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xA2, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xC3, 0x4B, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xA2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xC5, 0xBF, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x16, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0xAC, 0x67, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0x84, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xA5, 0xA1, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD1, 0x54, 0xF8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x8C, 0x49, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x85, 0x83, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xC4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x49, 0xB5, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xD1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x29, 0xC2, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xB3, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x09, 0xA4, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0x95, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE9, 0x86, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x77, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC9, 0x68, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x59, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xB2, 0x84, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x75, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x92, 0x66, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x57, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x72, 0x48, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x39, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x52, 0x2A, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x1B, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x32, 0x0C, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x21, 0xFD, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x1B, 0x29, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x1A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xFB, 0x0B, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE9, 0xEA, 0xFC, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xDA, 0xED, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xBA, 0xCF, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xC0, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x9A, 0xB1, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xA2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x7A, 0x93, 0x20, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0x84, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x63, 0xAF, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x91, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x73, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x55, 0xA0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x37, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xDD, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x13, 0xCE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xBF, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xA1, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x83, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xA0, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01,
+0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x01, 0xFF, 0xFF, 0xF7,
+0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01,
+0x16, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45,
+0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x57, 0x45, 0x54,
+0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D,
+0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 
 
 /* Zulu */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -24025,529 +24305,529 @@
 	{ (char*) "America/Atka"                      , 0x00B5F6 },
 	{ (char*) "America/Bahia"                     , 0x00BF36 },
 	{ (char*) "America/Bahia_Banderas"            , 0x00C339 },
-	{ (char*) "America/Barbados"                  , 0x00C7D6 },
-	{ (char*) "America/Belem"                     , 0x00C996 },
-	{ (char*) "America/Belize"                    , 0x00CBE6 },
-	{ (char*) "America/Blanc-Sablon"              , 0x00D240 },
-	{ (char*) "America/Boa_Vista"                 , 0x00D392 },
-	{ (char*) "America/Bogota"                    , 0x00D60F },
-	{ (char*) "America/Boise"                     , 0x00D703 },
-	{ (char*) "America/Buenos_Aires"              , 0x00E099 },
-	{ (char*) "America/Cambridge_Bay"             , 0x00E4CB },
-	{ (char*) "America/Campo_Grande"              , 0x00EDB9 },
-	{ (char*) "America/Cancun"                    , 0x00F36D },
-	{ (char*) "America/Caracas"                   , 0x00F6C7 },
-	{ (char*) "America/Catamarca"                 , 0x00F7CD },
-	{ (char*) "America/Cayenne"                   , 0x00FBFF },
-	{ (char*) "America/Cayman"                    , 0x00FCC3 },
-	{ (char*) "America/Chicago"                   , 0x00FD85 },
-	{ (char*) "America/Chihuahua"                 , 0x010BAD },
-	{ (char*) "America/Ciudad_Juarez"             , 0x01101D },
-	{ (char*) "America/Coral_Harbour"             , 0x011647 },
-	{ (char*) "America/Cordoba"                   , 0x011709 },
-	{ (char*) "America/Costa_Rica"                , 0x011B3B },
-	{ (char*) "America/Creston"                   , 0x011C83 },
-	{ (char*) "America/Cuiaba"                    , 0x011D71 },
-	{ (char*) "America/Curacao"                   , 0x012302 },
-	{ (char*) "America/Danmarkshavn"              , 0x0123C8 },
-	{ (char*) "America/Dawson"                    , 0x0126A8 },
-	{ (char*) "America/Dawson_Creek"              , 0x012D14 },
-	{ (char*) "America/Denver"                    , 0x01315A },
-	{ (char*) "America/Detroit"                   , 0x013B17 },
-	{ (char*) "America/Dominica"                  , 0x0143F2 },
-	{ (char*) "America/Edmonton"                  , 0x014492 },
-	{ (char*) "America/Eirunepe"                  , 0x014DDC },
-	{ (char*) "America/El_Salvador"               , 0x015079 },
-	{ (char*) "America/Ensenada"                  , 0x015165 },
-	{ (char*) "America/Fort_Nelson"               , 0x015AB7 },
-	{ (char*) "America/Fort_Wayne"                , 0x016397 },
-	{ (char*) "America/Fortaleza"                 , 0x016A35 },
-	{ (char*) "America/Glace_Bay"                 , 0x016D25 },
-	{ (char*) "America/Godthab"                   , 0x0175DC },
-	{ (char*) "America/Goose_Bay"                 , 0x017D49 },
-	{ (char*) "America/Grand_Turk"                , 0x0189FF },
-	{ (char*) "America/Grenada"                   , 0x019135 },
-	{ (char*) "America/Guadeloupe"                , 0x0191D5 },
-	{ (char*) "America/Guatemala"                 , 0x019275 },
-	{ (char*) "America/Guayaquil"                 , 0x019399 },
-	{ (char*) "America/Guyana"                    , 0x01949F },
-	{ (char*) "America/Halifax"                   , 0x0195A3 },
-	{ (char*) "America/Havana"                    , 0x01A32D },
-	{ (char*) "America/Hermosillo"                , 0x01ACA9 },
-	{ (char*) "America/Indiana/Indianapolis"      , 0x01AE83 },
-	{ (char*) "America/Indiana/Knox"              , 0x01B53A },
-	{ (char*) "America/Indiana/Marengo"           , 0x01BEE7 },
-	{ (char*) "America/Indiana/Petersburg"        , 0x01C5D4 },
-	{ (char*) "America/Indiana/Tell_City"         , 0x01CD73 },
-	{ (char*) "America/Indiana/Vevay"             , 0x01D437 },
-	{ (char*) "America/Indiana/Vincennes"         , 0x01D9F3 },
-	{ (char*) "America/Indiana/Winamac"           , 0x01E0C9 },
-	{ (char*) "America/Indianapolis"              , 0x01E7ED },
-	{ (char*) "America/Inuvik"                    , 0x01EE8B },
-	{ (char*) "America/Iqaluit"                   , 0x01F6C5 },
-	{ (char*) "America/Jamaica"                   , 0x01FF84 },
-	{ (char*) "America/Jujuy"                     , 0x020172 },
-	{ (char*) "America/Juneau"                    , 0x020588 },
-	{ (char*) "America/Kentucky/Louisville"       , 0x020ED9 },
-	{ (char*) "America/Kentucky/Monticello"       , 0x0219E7 },
-	{ (char*) "America/Knox_IN"                   , 0x022347 },
-	{ (char*) "America/Kralendijk"                , 0x022CDF },
-	{ (char*) "America/La_Paz"                    , 0x022DE1 },
-	{ (char*) "America/Lima"                      , 0x022EC7 },
-	{ (char*) "America/Los_Angeles"               , 0x02305B },
-	{ (char*) "America/Louisville"                , 0x023B92 },
-	{ (char*) "America/Lower_Princes"             , 0x024682 },
-	{ (char*) "America/Maceio"                    , 0x024784 },
-	{ (char*) "America/Managua"                   , 0x024A7A },
-	{ (char*) "America/Manaus"                    , 0x024C34 },
-	{ (char*) "America/Marigot"                   , 0x024E9D },
-	{ (char*) "America/Martinique"                , 0x024F9F },
-	{ (char*) "America/Matamoros"                 , 0x025093 },
-	{ (char*) "America/Mazatlan"                  , 0x025655 },
-	{ (char*) "America/Mendoza"                   , 0x025AFB },
-	{ (char*) "America/Menominee"                 , 0x025F2D },
-	{ (char*) "America/Merida"                    , 0x02683A },
-	{ (char*) "America/Metlakatla"                , 0x026C43 },
-	{ (char*) "America/Mexico_City"               , 0x0271F5 },
-	{ (char*) "America/Miquelon"                  , 0x0276D5 },
-	{ (char*) "America/Moncton"                   , 0x027D55 },
-	{ (char*) "America/Monterrey"                 , 0x0289CB },
-	{ (char*) "America/Montevideo"                , 0x028DE1 },
-	{ (char*) "America/Montreal"                  , 0x0293C5 },
-	{ (char*) "America/Montserrat"                , 0x02A177 },
-	{ (char*) "America/Nassau"                    , 0x02A217 },
-	{ (char*) "America/New_York"                  , 0x02AB77 },
-	{ (char*) "America/Nipigon"                   , 0x02B977 },
-	{ (char*) "America/Nome"                      , 0x02C729 },
-	{ (char*) "America/Noronha"                   , 0x02D081 },
-	{ (char*) "America/North_Dakota/Beulah"       , 0x02D35B },
-	{ (char*) "America/North_Dakota/Center"       , 0x02DCD8 },
-	{ (char*) "America/North_Dakota/New_Salem"    , 0x02E655 },
-	{ (char*) "America/Nuuk"                      , 0x02EFD8 },
-	{ (char*) "America/Ojinaga"                   , 0x02F756 },
-	{ (char*) "America/Panama"                    , 0x02FD72 },
-	{ (char*) "America/Pangnirtung"               , 0x02FE34 },
-	{ (char*) "America/Paramaribo"                , 0x0306DA },
-	{ (char*) "America/Phoenix"                   , 0x0307DE },
-	{ (char*) "America/Port-au-Prince"            , 0x03096A },
-	{ (char*) "America/Port_of_Spain"             , 0x030F10 },
-	{ (char*) "America/Porto_Acre"                , 0x030FB0 },
-	{ (char*) "America/Porto_Velho"               , 0x031222 },
-	{ (char*) "America/Puerto_Rico"               , 0x031468 },
-	{ (char*) "America/Punta_Arenas"              , 0x03156A },
-	{ (char*) "America/Rainy_River"               , 0x031CF8 },
-	{ (char*) "America/Rankin_Inlet"              , 0x032838 },
-	{ (char*) "America/Recife"                    , 0x03306C },
-	{ (char*) "America/Regina"                    , 0x033340 },
-	{ (char*) "America/Resolute"                  , 0x033735 },
-	{ (char*) "America/Rio_Branco"                , 0x033F6A },
-	{ (char*) "America/Rosario"                   , 0x0341E0 },
-	{ (char*) "America/Santa_Isabel"              , 0x034612 },
-	{ (char*) "America/Santarem"                  , 0x034F64 },
-	{ (char*) "America/Santiago"                  , 0x0351C7 },
-	{ (char*) "America/Santo_Domingo"             , 0x035BB3 },
-	{ (char*) "America/Sao_Paulo"                 , 0x035D89 },
-	{ (char*) "America/Scoresbysund"              , 0x036361 },
-	{ (char*) "America/Shiprock"                  , 0x036B19 },
-	{ (char*) "America/Sitka"                     , 0x0374C1 },
-	{ (char*) "America/St_Barthelemy"             , 0x037DF9 },
-	{ (char*) "America/St_Johns"                  , 0x037EFB },
-	{ (char*) "America/St_Kitts"                  , 0x038D69 },
-	{ (char*) "America/St_Lucia"                  , 0x038E09 },
-	{ (char*) "America/St_Thomas"                 , 0x038ECB },
-	{ (char*) "America/St_Vincent"                , 0x038F6B },
-	{ (char*) "America/Swift_Current"             , 0x03902D },
-	{ (char*) "America/Tegucigalpa"               , 0x03927B },
-	{ (char*) "America/Thule"                     , 0x039383 },
-	{ (char*) "America/Thunder_Bay"               , 0x03997B },
-	{ (char*) "America/Tijuana"                   , 0x03A72D },
-	{ (char*) "America/Toronto"                   , 0x03B08E },
-	{ (char*) "America/Tortola"                   , 0x03BE5E },
-	{ (char*) "America/Vancouver"                 , 0x03BEFE },
-	{ (char*) "America/Virgin"                    , 0x03CA6F },
-	{ (char*) "America/Whitehorse"                , 0x03CB71 },
-	{ (char*) "America/Winnipeg"                  , 0x03D1DD },
-	{ (char*) "America/Yakutat"                   , 0x03DD3A },
-	{ (char*) "America/Yellowknife"               , 0x03E657 },
-	{ (char*) "Antarctica/Casey"                  , 0x03EF7F },
-	{ (char*) "Antarctica/Davis"                  , 0x03F137 },
-	{ (char*) "Antarctica/DumontDUrville"         , 0x03F263 },
-	{ (char*) "Antarctica/Macquarie"              , 0x03F333 },
-	{ (char*) "Antarctica/Mawson"                 , 0x03FC23 },
-	{ (char*) "Antarctica/McMurdo"                , 0x03FCEE },
-	{ (char*) "Antarctica/Palmer"                 , 0x0404E9 },
-	{ (char*) "Antarctica/Rothera"                , 0x040A77 },
-	{ (char*) "Antarctica/South_Pole"             , 0x040B20 },
-	{ (char*) "Antarctica/Syowa"                  , 0x0414B1 },
-	{ (char*) "Antarctica/Troll"                  , 0x041559 },
-	{ (char*) "Antarctica/Vostok"                 , 0x0419E6 },
-	{ (char*) "Arctic/Longyearbyen"               , 0x041ACD },
-	{ (char*) "Asia/Aden"                         , 0x0423D3 },
-	{ (char*) "Asia/Almaty"                       , 0x042476 },
-	{ (char*) "Asia/Amman"                        , 0x04286B },
-	{ (char*) "Asia/Anadyr"                       , 0x042E10 },
-	{ (char*) "Asia/Aqtau"                        , 0x0432C5 },
-	{ (char*) "Asia/Aqtobe"                       , 0x0436AF },
-	{ (char*) "Asia/Ashgabat"                     , 0x043AAD },
-	{ (char*) "Asia/Ashkhabad"                    , 0x043D16 },
-	{ (char*) "Asia/Atyrau"                       , 0x043F7F },
-	{ (char*) "Asia/Baghdad"                      , 0x044371 },
-	{ (char*) "Asia/Bahrain"                      , 0x044746 },
-	{ (char*) "Asia/Baku"                         , 0x044831 },
-	{ (char*) "Asia/Bangkok"                      , 0x044CFA },
-	{ (char*) "Asia/Barnaul"                      , 0x044DBF },
-	{ (char*) "Asia/Beirut"                       , 0x045290 },
-	{ (char*) "Asia/Bishkek"                      , 0x045B06 },
-	{ (char*) "Asia/Brunei"                       , 0x045EDB },
-	{ (char*) "Asia/Calcutta"                     , 0x045FA4 },
-	{ (char*) "Asia/Chita"                        , 0x0460CD },
-	{ (char*) "Asia/Choibalsan"                   , 0x0465A4 },
-	{ (char*) "Asia/Chongqing"                    , 0x046969 },
-	{ (char*) "Asia/Chungking"                    , 0x046BA6 },
-	{ (char*) "Asia/Colombo"                      , 0x046DE3 },
-	{ (char*) "Asia/Dacca"                        , 0x046F55 },
-	{ (char*) "Asia/Damascus"                     , 0x0470A4 },
-	{ (char*) "Asia/Dhaka"                        , 0x047801 },
-	{ (char*) "Asia/Dili"                         , 0x047950 },
-	{ (char*) "Asia/Dubai"                        , 0x047A31 },
-	{ (char*) "Asia/Dushanbe"                     , 0x047AD4 },
-	{ (char*) "Asia/Famagusta"                    , 0x047D21 },
-	{ (char*) "Asia/Gaza"                         , 0x048528 },
-	{ (char*) "Asia/Harbin"                       , 0x049442 },
-	{ (char*) "Asia/Hebron"                       , 0x04967F },
-	{ (char*) "Asia/Ho_Chi_Minh"                  , 0x04A5B4 },
-	{ (char*) "Asia/Hong_Kong"                    , 0x04A711 },
-	{ (char*) "Asia/Hovd"                         , 0x04ABEE },
-	{ (char*) "Asia/Irkutsk"                      , 0x04AF92 },
-	{ (char*) "Asia/Istanbul"                     , 0x04B485 },
-	{ (char*) "Asia/Jakarta"                      , 0x04BC1E },
-	{ (char*) "Asia/Jayapura"                     , 0x04BDB6 },
-	{ (char*) "Asia/Jerusalem"                    , 0x04BED5 },
-	{ (char*) "Asia/Kabul"                        , 0x04C835 },
-	{ (char*) "Asia/Kamchatka"                    , 0x04C903 },
-	{ (char*) "Asia/Karachi"                      , 0x04CDA1 },
-	{ (char*) "Asia/Kashgar"                      , 0x04CF28 },
-	{ (char*) "Asia/Kathmandu"                    , 0x04CFCB },
-	{ (char*) "Asia/Katmandu"                     , 0x04D09D },
-	{ (char*) "Asia/Khandyga"                     , 0x04D16F },
-	{ (char*) "Asia/Kolkata"                      , 0x04D682 },
-	{ (char*) "Asia/Krasnoyarsk"                  , 0x04D7AB },
-	{ (char*) "Asia/Kuala_Lumpur"                 , 0x04DC79 },
-	{ (char*) "Asia/Kuching"                      , 0x04DE2A },
-	{ (char*) "Asia/Kuwait"                       , 0x04E019 },
-	{ (char*) "Asia/Macao"                        , 0x04E0BC },
-	{ (char*) "Asia/Macau"                        , 0x04E593 },
-	{ (char*) "Asia/Magadan"                      , 0x04EA6A },
-	{ (char*) "Asia/Makassar"                     , 0x04EF3E },
-	{ (char*) "Asia/Manila"                       , 0x04F091 },
-	{ (char*) "Asia/Muscat"                       , 0x04F1E5 },
-	{ (char*) "Asia/Nicosia"                      , 0x04F288 },
-	{ (char*) "Asia/Novokuznetsk"                 , 0x04FA74 },
-	{ (char*) "Asia/Novosibirsk"                  , 0x04FF10 },
-	{ (char*) "Asia/Omsk"                         , 0x0503E7 },
-	{ (char*) "Asia/Oral"                         , 0x0508A9 },
-	{ (char*) "Asia/Phnom_Penh"                   , 0x050CA3 },
-	{ (char*) "Asia/Pontianak"                    , 0x050DC8 },
-	{ (char*) "Asia/Pyongyang"                    , 0x050F4B },
-	{ (char*) "Asia/Qatar"                        , 0x051044 },
-	{ (char*) "Asia/Qostanay"                     , 0x051109 },
-	{ (char*) "Asia/Qyzylorda"                    , 0x051530 },
-	{ (char*) "Asia/Rangoon"                      , 0x05194C },
-	{ (char*) "Asia/Riyadh"                       , 0x051A56 },
-	{ (char*) "Asia/Saigon"                       , 0x051AF9 },
-	{ (char*) "Asia/Sakhalin"                     , 0x051C56 },
-	{ (char*) "Asia/Samarkand"                    , 0x05211E },
-	{ (char*) "Asia/Seoul"                        , 0x05236E },
-	{ (char*) "Asia/Shanghai"                     , 0x0525E3 },
-	{ (char*) "Asia/Singapore"                    , 0x05282C },
-	{ (char*) "Asia/Srednekolymsk"                , 0x0529C9 },
-	{ (char*) "Asia/Taipei"                       , 0x052E9D },
-	{ (char*) "Asia/Tashkent"                     , 0x0531A2 },
-	{ (char*) "Asia/Tbilisi"                      , 0x053400 },
-	{ (char*) "Asia/Tehran"                       , 0x053809 },
-	{ (char*) "Asia/Tel_Aviv"                     , 0x053CF5 },
-	{ (char*) "Asia/Thimbu"                       , 0x054655 },
-	{ (char*) "Asia/Thimphu"                      , 0x05471E },
-	{ (char*) "Asia/Tokyo"                        , 0x0547E7 },
-	{ (char*) "Asia/Tomsk"                        , 0x054928 },
-	{ (char*) "Asia/Ujung_Pandang"                , 0x054DF9 },
-	{ (char*) "Asia/Ulaanbaatar"                  , 0x054F03 },
-	{ (char*) "Asia/Ulan_Bator"                   , 0x05528C },
-	{ (char*) "Asia/Urumqi"                       , 0x055605 },
-	{ (char*) "Asia/Ust-Nera"                     , 0x0556B5 },
-	{ (char*) "Asia/Vientiane"                    , 0x055BAB },
-	{ (char*) "Asia/Vladivostok"                  , 0x055CEC },
-	{ (char*) "Asia/Yakutsk"                      , 0x0561B5 },
-	{ (char*) "Asia/Yangon"                       , 0x05667D },
-	{ (char*) "Asia/Yekaterinburg"                , 0x056787 },
-	{ (char*) "Asia/Yerevan"                      , 0x056C6E },
-	{ (char*) "Atlantic/Azores"                   , 0x0570EB },
-	{ (char*) "Atlantic/Bermuda"                  , 0x057EA7 },
-	{ (char*) "Atlantic/Canary"                   , 0x05880F },
-	{ (char*) "Atlantic/Cape_Verde"               , 0x058F92 },
-	{ (char*) "Atlantic/Faeroe"                   , 0x05909E },
-	{ (char*) "Atlantic/Faroe"                    , 0x0597C1 },
-	{ (char*) "Atlantic/Jan_Mayen"                , 0x059EE4 },
-	{ (char*) "Atlantic/Madeira"                  , 0x05A7EA },
-	{ (char*) "Atlantic/Reykjavik"                , 0x05B5B4 },
-	{ (char*) "Atlantic/South_Georgia"            , 0x05BA4A },
-	{ (char*) "Atlantic/St_Helena"                , 0x05BAEC },
-	{ (char*) "Atlantic/Stanley"                  , 0x05BBAE },
-	{ (char*) "Australia/ACT"                     , 0x05C06A },
-	{ (char*) "Australia/Adelaide"                , 0x05C904 },
-	{ (char*) "Australia/Brisbane"                , 0x05D1BF },
-	{ (char*) "Australia/Broken_Hill"             , 0x05D385 },
-	{ (char*) "Australia/Canberra"                , 0x05DC62 },
-	{ (char*) "Australia/Currie"                  , 0x05E4FC },
-	{ (char*) "Australia/Darwin"                  , 0x05EE3E },
-	{ (char*) "Australia/Eucla"                   , 0x05EFA1 },
-	{ (char*) "Australia/Hobart"                  , 0x05F18E },
-	{ (char*) "Australia/LHI"                     , 0x05FAD8 },
-	{ (char*) "Australia/Lindeman"                , 0x06021A },
-	{ (char*) "Australia/Lord_Howe"               , 0x060420 },
-	{ (char*) "Australia/Melbourne"               , 0x060B72 },
-	{ (char*) "Australia/North"                   , 0x061414 },
-	{ (char*) "Australia/NSW"                     , 0x061565 },
-	{ (char*) "Australia/Perth"                   , 0x061DFF },
-	{ (char*) "Australia/Queensland"              , 0x061FE7 },
-	{ (char*) "Australia/South"                   , 0x062196 },
-	{ (char*) "Australia/Sydney"                  , 0x062A42 },
-	{ (char*) "Australia/Tasmania"                , 0x0632F8 },
-	{ (char*) "Australia/Victoria"                , 0x063C3A },
-	{ (char*) "Australia/West"                    , 0x0644D4 },
-	{ (char*) "Australia/Yancowinna"              , 0x06469E },
-	{ (char*) "Brazil/Acre"                       , 0x064F5F },
-	{ (char*) "Brazil/DeNoronha"                  , 0x0651D1 },
-	{ (char*) "Brazil/East"                       , 0x06549B },
-	{ (char*) "Brazil/West"                       , 0x065A3D },
-	{ (char*) "Canada/Atlantic"                   , 0x065C97 },
-	{ (char*) "Canada/Central"                    , 0x066A03 },
-	{ (char*) "Canada/Eastern"                    , 0x067543 },
-	{ (char*) "Canada/Mountain"                   , 0x0682F5 },
-	{ (char*) "Canada/Newfoundland"               , 0x068C1D },
-	{ (char*) "Canada/Pacific"                    , 0x069A70 },
-	{ (char*) "Canada/Saskatchewan"               , 0x06A5C8 },
-	{ (char*) "Canada/Yukon"                      , 0x06A9A8 },
-	{ (char*) "CET"                               , 0x06B002 },
-	{ (char*) "Chile/Continental"                 , 0x06B83C },
-	{ (char*) "Chile/EasterIsland"                , 0x06C21B },
-	{ (char*) "CST6CDT"                           , 0x06CAD2 },
-	{ (char*) "Cuba"                              , 0x06D3E4 },
-	{ (char*) "EET"                               , 0x06DD60 },
-	{ (char*) "Egypt"                             , 0x06E4E0 },
-	{ (char*) "Eire"                              , 0x06EE4B },
-	{ (char*) "EST"                               , 0x06FBFB },
-	{ (char*) "EST5EDT"                           , 0x06FC79 },
-	{ (char*) "Etc/GMT"                           , 0x07058B },
-	{ (char*) "Etc/GMT+0"                         , 0x070609 },
-	{ (char*) "Etc/GMT+1"                         , 0x070687 },
-	{ (char*) "Etc/GMT+10"                        , 0x070707 },
-	{ (char*) "Etc/GMT+11"                        , 0x070788 },
-	{ (char*) "Etc/GMT+12"                        , 0x070809 },
-	{ (char*) "Etc/GMT+2"                         , 0x07088A },
-	{ (char*) "Etc/GMT+3"                         , 0x07090A },
-	{ (char*) "Etc/GMT+4"                         , 0x07098A },
-	{ (char*) "Etc/GMT+5"                         , 0x070A0A },
-	{ (char*) "Etc/GMT+6"                         , 0x070A8A },
-	{ (char*) "Etc/GMT+7"                         , 0x070B0A },
-	{ (char*) "Etc/GMT+8"                         , 0x070B8A },
-	{ (char*) "Etc/GMT+9"                         , 0x070C0A },
-	{ (char*) "Etc/GMT-0"                         , 0x070C8A },
-	{ (char*) "Etc/GMT-1"                         , 0x070D08 },
-	{ (char*) "Etc/GMT-10"                        , 0x070D89 },
-	{ (char*) "Etc/GMT-11"                        , 0x070E0B },
-	{ (char*) "Etc/GMT-12"                        , 0x070E8D },
-	{ (char*) "Etc/GMT-13"                        , 0x070F0F },
-	{ (char*) "Etc/GMT-14"                        , 0x070F91 },
-	{ (char*) "Etc/GMT-2"                         , 0x071013 },
-	{ (char*) "Etc/GMT-3"                         , 0x071094 },
-	{ (char*) "Etc/GMT-4"                         , 0x071115 },
-	{ (char*) "Etc/GMT-5"                         , 0x071196 },
-	{ (char*) "Etc/GMT-6"                         , 0x071217 },
-	{ (char*) "Etc/GMT-7"                         , 0x071298 },
-	{ (char*) "Etc/GMT-8"                         , 0x071319 },
-	{ (char*) "Etc/GMT-9"                         , 0x07139A },
-	{ (char*) "Etc/GMT0"                          , 0x07141B },
-	{ (char*) "Etc/Greenwich"                     , 0x071499 },
-	{ (char*) "Etc/UCT"                           , 0x071517 },
-	{ (char*) "Etc/Universal"                     , 0x071595 },
-	{ (char*) "Etc/UTC"                           , 0x071613 },
-	{ (char*) "Etc/Zulu"                          , 0x071691 },
-	{ (char*) "Europe/Amsterdam"                  , 0x07170F },
-	{ (char*) "Europe/Andorra"                    , 0x072279 },
-	{ (char*) "Europe/Astrakhan"                  , 0x072953 },
-	{ (char*) "Europe/Athens"                     , 0x072DF0 },
-	{ (char*) "Europe/Belfast"                    , 0x0736D2 },
-	{ (char*) "Europe/Belgrade"                   , 0x07452E },
-	{ (char*) "Europe/Berlin"                     , 0x074CBA },
-	{ (char*) "Europe/Bratislava"                 , 0x0755CF },
-	{ (char*) "Europe/Brussels"                   , 0x075ED8 },
-	{ (char*) "Europe/Bucharest"                  , 0x076A59 },
-	{ (char*) "Europe/Budapest"                   , 0x0772ED },
-	{ (char*) "Europe/Busingen"                   , 0x077C39 },
-	{ (char*) "Europe/Chisinau"                   , 0x0783C2 },
-	{ (char*) "Europe/Copenhagen"                 , 0x078D24 },
-	{ (char*) "Europe/Dublin"                     , 0x079589 },
-	{ (char*) "Europe/Gibraltar"                  , 0x07A339 },
-	{ (char*) "Europe/Guernsey"                   , 0x07AF41 },
-	{ (char*) "Europe/Helsinki"                   , 0x07BDE1 },
-	{ (char*) "Europe/Isle_of_Man"                , 0x07C559 },
-	{ (char*) "Europe/Istanbul"                   , 0x07D3A5 },
-	{ (char*) "Europe/Jersey"                     , 0x07DB3E },
-	{ (char*) "Europe/Kaliningrad"                , 0x07E9DE },
-	{ (char*) "Europe/Kiev"                       , 0x07EFD3 },
-	{ (char*) "Europe/Kirov"                      , 0x07F827 },
-	{ (char*) "Europe/Kyiv"                       , 0x07FCE2 },
-	{ (char*) "Europe/Lisbon"                     , 0x080545 },
-	{ (char*) "Europe/Ljubljana"                  , 0x08130D },
-	{ (char*) "Europe/London"                     , 0x081A99 },
-	{ (char*) "Europe/Luxembourg"                 , 0x0828F5 },
-	{ (char*) "Europe/Madrid"                     , 0x083483 },
-	{ (char*) "Europe/Malta"                      , 0x083ED5 },
-	{ (char*) "Europe/Mariehamn"                  , 0x08491D },
-	{ (char*) "Europe/Minsk"                      , 0x085095 },
-	{ (char*) "Europe/Monaco"                     , 0x0855BC },
-	{ (char*) "Europe/Moscow"                     , 0x086148 },
-	{ (char*) "Europe/Nicosia"                    , 0x086767 },
-	{ (char*) "Europe/Oslo"                       , 0x086F45 },
-	{ (char*) "Europe/Paris"                      , 0x087805 },
-	{ (char*) "Europe/Podgorica"                  , 0x0883A3 },
-	{ (char*) "Europe/Prague"                     , 0x088B2F },
-	{ (char*) "Europe/Riga"                       , 0x089438 },
-	{ (char*) "Europe/Rome"                       , 0x089CDA },
-	{ (char*) "Europe/Samara"                     , 0x08A737 },
-	{ (char*) "Europe/San_Marino"                 , 0x08AC0D },
-	{ (char*) "Europe/Sarajevo"                   , 0x08B66A },
-	{ (char*) "Europe/Saratov"                    , 0x08BDF6 },
-	{ (char*) "Europe/Simferopol"                 , 0x08C2A3 },
-	{ (char*) "Europe/Skopje"                     , 0x08C872 },
-	{ (char*) "Europe/Sofia"                      , 0x08CFFE },
-	{ (char*) "Europe/Stockholm"                  , 0x08D827 },
-	{ (char*) "Europe/Tallinn"                    , 0x08DFA8 },
-	{ (char*) "Europe/Tirane"                     , 0x08E818 },
-	{ (char*) "Europe/Tiraspol"                   , 0x08F048 },
-	{ (char*) "Europe/Ulyanovsk"                  , 0x08F9AA },
-	{ (char*) "Europe/Uzhgorod"                   , 0x08FEAD },
-	{ (char*) "Europe/Vaduz"                      , 0x090701 },
-	{ (char*) "Europe/Vatican"                    , 0x090E6D },
-	{ (char*) "Europe/Vienna"                     , 0x0918CA },
-	{ (char*) "Europe/Vilnius"                    , 0x09216E },
-	{ (char*) "Europe/Volgograd"                  , 0x0929EC },
-	{ (char*) "Europe/Warsaw"                     , 0x092EB3 },
-	{ (char*) "Europe/Zagreb"                     , 0x09391D },
-	{ (char*) "Europe/Zaporozhye"                 , 0x0940A9 },
-	{ (char*) "Europe/Zurich"                     , 0x0948FD },
-	{ (char*) "Factory"                           , 0x09507E },
-	{ (char*) "GB"                                , 0x0950FE },
-	{ (char*) "GB-Eire"                           , 0x095F5A },
-	{ (char*) "GMT"                               , 0x096DB6 },
-	{ (char*) "GMT+0"                             , 0x096E34 },
-	{ (char*) "GMT-0"                             , 0x096EB2 },
-	{ (char*) "GMT0"                              , 0x096F30 },
-	{ (char*) "Greenwich"                         , 0x096FAE },
-	{ (char*) "Hongkong"                          , 0x09702C },
-	{ (char*) "HST"                               , 0x097509 },
-	{ (char*) "Iceland"                           , 0x097588 },
-	{ (char*) "Indian/Antananarivo"               , 0x097628 },
-	{ (char*) "Indian/Chagos"                     , 0x09770F },
-	{ (char*) "Indian/Christmas"                  , 0x0977D4 },
-	{ (char*) "Indian/Cocos"                      , 0x097877 },
-	{ (char*) "Indian/Comoro"                     , 0x097923 },
-	{ (char*) "Indian/Kerguelen"                  , 0x0979C4 },
-	{ (char*) "Indian/Mahe"                       , 0x097A67 },
-	{ (char*) "Indian/Maldives"                   , 0x097B0A },
-	{ (char*) "Indian/Mauritius"                  , 0x097BCF },
-	{ (char*) "Indian/Mayotte"                    , 0x097CBE },
-	{ (char*) "Indian/Reunion"                    , 0x097D5F },
-	{ (char*) "Iran"                              , 0x097E02 },
-	{ (char*) "Israel"                            , 0x0982EE },
-	{ (char*) "Jamaica"                           , 0x098C4E },
-	{ (char*) "Japan"                             , 0x098E3C },
-	{ (char*) "Kwajalein"                         , 0x098F7D },
-	{ (char*) "Libya"                             , 0x0990B7 },
-	{ (char*) "MET"                               , 0x099334 },
-	{ (char*) "Mexico/BajaNorte"                  , 0x099B6E },
-	{ (char*) "Mexico/BajaSur"                    , 0x09A4C0 },
-	{ (char*) "Mexico/General"                    , 0x09A934 },
-	{ (char*) "MST"                               , 0x09AE06 },
-	{ (char*) "MST7MDT"                           , 0x09AE84 },
-	{ (char*) "Navajo"                            , 0x09B796 },
-	{ (char*) "NZ"                                , 0x09C13E },
-	{ (char*) "NZ-CHAT"                           , 0x09CACF },
-	{ (char*) "Pacific/Apia"                      , 0x09D2E1 },
-	{ (char*) "Pacific/Auckland"                  , 0x09D543 },
-	{ (char*) "Pacific/Bougainville"              , 0x09DEE7 },
-	{ (char*) "Pacific/Chatham"                   , 0x09DFFD },
-	{ (char*) "Pacific/Chuuk"                     , 0x09E81E },
-	{ (char*) "Pacific/Easter"                    , 0x09E938 },
-	{ (char*) "Pacific/Efate"                     , 0x09F1FC },
-	{ (char*) "Pacific/Enderbury"                 , 0x09F414 },
-	{ (char*) "Pacific/Fakaofo"                   , 0x09F4FC },
-	{ (char*) "Pacific/Fiji"                      , 0x09F5C2 },
-	{ (char*) "Pacific/Funafuti"                  , 0x09F802 },
-	{ (char*) "Pacific/Galapagos"                 , 0x09F8A6 },
-	{ (char*) "Pacific/Gambier"                   , 0x09F9A3 },
-	{ (char*) "Pacific/Guadalcanal"               , 0x09FA54 },
-	{ (char*) "Pacific/Guam"                      , 0x09FAF8 },
-	{ (char*) "Pacific/Honolulu"                  , 0x09FCF2 },
-	{ (char*) "Pacific/Johnston"                  , 0x09FE4D },
-	{ (char*) "Pacific/Kanton"                    , 0x09FFA2 },
-	{ (char*) "Pacific/Kiritimati"                , 0x0A0099 },
-	{ (char*) "Pacific/Kosrae"                    , 0x0A0191 },
-	{ (char*) "Pacific/Kwajalein"                 , 0x0A02F4 },
-	{ (char*) "Pacific/Majuro"                    , 0x0A0437 },
-	{ (char*) "Pacific/Marquesas"                 , 0x0A0583 },
-	{ (char*) "Pacific/Midway"                    , 0x0A063F },
-	{ (char*) "Pacific/Nauru"                     , 0x0A0732 },
-	{ (char*) "Pacific/Niue"                      , 0x0A082C },
-	{ (char*) "Pacific/Norfolk"                   , 0x0A08F5 },
-	{ (char*) "Pacific/Noumea"                    , 0x0A0C63 },
-	{ (char*) "Pacific/Pago_Pago"                 , 0x0A0D91 },
-	{ (char*) "Pacific/Palau"                     , 0x0A0E4C },
-	{ (char*) "Pacific/Pitcairn"                  , 0x0A0EFE },
-	{ (char*) "Pacific/Pohnpei"                   , 0x0A0FC6 },
-	{ (char*) "Pacific/Ponape"                    , 0x0A1101 },
-	{ (char*) "Pacific/Port_Moresby"              , 0x0A11A5 },
-	{ (char*) "Pacific/Rarotonga"                 , 0x0A1275 },
-	{ (char*) "Pacific/Saipan"                    , 0x0A14CE },
-	{ (char*) "Pacific/Samoa"                     , 0x0A16BA },
-	{ (char*) "Pacific/Tahiti"                    , 0x0A1775 },
-	{ (char*) "Pacific/Tarawa"                    , 0x0A1827 },
-	{ (char*) "Pacific/Tongatapu"                 , 0x0A18DA },
-	{ (char*) "Pacific/Truk"                      , 0x0A1A4C },
-	{ (char*) "Pacific/Wake"                      , 0x0A1B04 },
-	{ (char*) "Pacific/Wallis"                    , 0x0A1BB3 },
-	{ (char*) "Pacific/Yap"                       , 0x0A1C57 },
-	{ (char*) "Poland"                            , 0x0A1D0F },
-	{ (char*) "Portugal"                          , 0x0A2779 },
-	{ (char*) "PRC"                               , 0x0A352E },
-	{ (char*) "PST8PDT"                           , 0x0A376B },
-	{ (char*) "ROC"                               , 0x0A407D },
-	{ (char*) "ROK"                               , 0x0A4382 },
-	{ (char*) "Singapore"                         , 0x0A45F7 },
-	{ (char*) "Turkey"                            , 0x0A4794 },
-	{ (char*) "UCT"                               , 0x0A4F2D },
-	{ (char*) "Universal"                         , 0x0A4FAB },
-	{ (char*) "US/Alaska"                         , 0x0A5029 },
-	{ (char*) "US/Aleutian"                       , 0x0A5978 },
-	{ (char*) "US/Arizona"                        , 0x0A62B8 },
-	{ (char*) "US/Central"                        , 0x0A642C },
-	{ (char*) "US/East-Indiana"                   , 0x0A7240 },
-	{ (char*) "US/Eastern"                        , 0x0A78DE },
-	{ (char*) "US/Hawaii"                         , 0x0A86CA },
-	{ (char*) "US/Indiana-Starke"                 , 0x0A881F },
-	{ (char*) "US/Michigan"                       , 0x0A91B7 },
-	{ (char*) "US/Mountain"                       , 0x0A9A79 },
-	{ (char*) "US/Pacific"                        , 0x0AA421 },
-	{ (char*) "US/Samoa"                          , 0x0AAF51 },
-	{ (char*) "UTC"                               , 0x0AB00C },
-	{ (char*) "W-SU"                              , 0x0AB08A },
-	{ (char*) "WET"                               , 0x0AB695 },
-	{ (char*) "Zulu"                              , 0x0ABE12 },
+	{ (char*) "America/Barbados"                  , 0x00C7A2 },
+	{ (char*) "America/Belem"                     , 0x00C962 },
+	{ (char*) "America/Belize"                    , 0x00CBB2 },
+	{ (char*) "America/Blanc-Sablon"              , 0x00D20C },
+	{ (char*) "America/Boa_Vista"                 , 0x00D35E },
+	{ (char*) "America/Bogota"                    , 0x00D5DB },
+	{ (char*) "America/Boise"                     , 0x00D6CF },
+	{ (char*) "America/Buenos_Aires"              , 0x00E065 },
+	{ (char*) "America/Cambridge_Bay"             , 0x00E497 },
+	{ (char*) "America/Campo_Grande"              , 0x00ED85 },
+	{ (char*) "America/Cancun"                    , 0x00F339 },
+	{ (char*) "America/Caracas"                   , 0x00F6B1 },
+	{ (char*) "America/Catamarca"                 , 0x00F7B7 },
+	{ (char*) "America/Cayenne"                   , 0x00FBE9 },
+	{ (char*) "America/Cayman"                    , 0x00FCAD },
+	{ (char*) "America/Chicago"                   , 0x00FD6F },
+	{ (char*) "America/Chihuahua"                 , 0x010B97 },
+	{ (char*) "America/Ciudad_Juarez"             , 0x011007 },
+	{ (char*) "America/Coral_Harbour"             , 0x011631 },
+	{ (char*) "America/Cordoba"                   , 0x0116F3 },
+	{ (char*) "America/Costa_Rica"                , 0x011B25 },
+	{ (char*) "America/Creston"                   , 0x011C6D },
+	{ (char*) "America/Cuiaba"                    , 0x011D5B },
+	{ (char*) "America/Curacao"                   , 0x0122EC },
+	{ (char*) "America/Danmarkshavn"              , 0x0123B2 },
+	{ (char*) "America/Dawson"                    , 0x012692 },
+	{ (char*) "America/Dawson_Creek"              , 0x012CFE },
+	{ (char*) "America/Denver"                    , 0x013144 },
+	{ (char*) "America/Detroit"                   , 0x013B01 },
+	{ (char*) "America/Dominica"                  , 0x0143DC },
+	{ (char*) "America/Edmonton"                  , 0x01447C },
+	{ (char*) "America/Eirunepe"                  , 0x014DC6 },
+	{ (char*) "America/El_Salvador"               , 0x015063 },
+	{ (char*) "America/Ensenada"                  , 0x01514F },
+	{ (char*) "America/Fort_Nelson"               , 0x015AF5 },
+	{ (char*) "America/Fort_Wayne"                , 0x0163D5 },
+	{ (char*) "America/Fortaleza"                 , 0x016A73 },
+	{ (char*) "America/Glace_Bay"                 , 0x016D63 },
+	{ (char*) "America/Godthab"                   , 0x01761A },
+	{ (char*) "America/Goose_Bay"                 , 0x017D87 },
+	{ (char*) "America/Grand_Turk"                , 0x018A3D },
+	{ (char*) "America/Grenada"                   , 0x019173 },
+	{ (char*) "America/Guadeloupe"                , 0x019213 },
+	{ (char*) "America/Guatemala"                 , 0x0192B3 },
+	{ (char*) "America/Guayaquil"                 , 0x0193D7 },
+	{ (char*) "America/Guyana"                    , 0x0194DD },
+	{ (char*) "America/Halifax"                   , 0x0195E1 },
+	{ (char*) "America/Havana"                    , 0x01A36B },
+	{ (char*) "America/Hermosillo"                , 0x01ACE7 },
+	{ (char*) "America/Indiana/Indianapolis"      , 0x01AE7D },
+	{ (char*) "America/Indiana/Knox"              , 0x01B534 },
+	{ (char*) "America/Indiana/Marengo"           , 0x01BEE1 },
+	{ (char*) "America/Indiana/Petersburg"        , 0x01C5CE },
+	{ (char*) "America/Indiana/Tell_City"         , 0x01CD6D },
+	{ (char*) "America/Indiana/Vevay"             , 0x01D431 },
+	{ (char*) "America/Indiana/Vincennes"         , 0x01D9ED },
+	{ (char*) "America/Indiana/Winamac"           , 0x01E0C3 },
+	{ (char*) "America/Indianapolis"              , 0x01E7E7 },
+	{ (char*) "America/Inuvik"                    , 0x01EE85 },
+	{ (char*) "America/Iqaluit"                   , 0x01F6BF },
+	{ (char*) "America/Jamaica"                   , 0x01FF7E },
+	{ (char*) "America/Jujuy"                     , 0x02016C },
+	{ (char*) "America/Juneau"                    , 0x020582 },
+	{ (char*) "America/Kentucky/Louisville"       , 0x020ED3 },
+	{ (char*) "America/Kentucky/Monticello"       , 0x0219E1 },
+	{ (char*) "America/Knox_IN"                   , 0x022341 },
+	{ (char*) "America/Kralendijk"                , 0x022CD9 },
+	{ (char*) "America/La_Paz"                    , 0x022DDB },
+	{ (char*) "America/Lima"                      , 0x022EC1 },
+	{ (char*) "America/Los_Angeles"               , 0x023055 },
+	{ (char*) "America/Louisville"                , 0x023B8C },
+	{ (char*) "America/Lower_Princes"             , 0x02467C },
+	{ (char*) "America/Maceio"                    , 0x02477E },
+	{ (char*) "America/Managua"                   , 0x024A74 },
+	{ (char*) "America/Manaus"                    , 0x024C2E },
+	{ (char*) "America/Marigot"                   , 0x024E97 },
+	{ (char*) "America/Martinique"                , 0x024F99 },
+	{ (char*) "America/Matamoros"                 , 0x02508D },
+	{ (char*) "America/Mazatlan"                  , 0x02564F },
+	{ (char*) "America/Mendoza"                   , 0x025AB1 },
+	{ (char*) "America/Menominee"                 , 0x025EE3 },
+	{ (char*) "America/Merida"                    , 0x0267F0 },
+	{ (char*) "America/Metlakatla"                , 0x026BF9 },
+	{ (char*) "America/Mexico_City"               , 0x0271AB },
+	{ (char*) "America/Miquelon"                  , 0x02768B },
+	{ (char*) "America/Moncton"                   , 0x027D0B },
+	{ (char*) "America/Monterrey"                 , 0x028981 },
+	{ (char*) "America/Montevideo"                , 0x028E1D },
+	{ (char*) "America/Montreal"                  , 0x029401 },
+	{ (char*) "America/Montserrat"                , 0x02A1B3 },
+	{ (char*) "America/Nassau"                    , 0x02A253 },
+	{ (char*) "America/New_York"                  , 0x02ABB3 },
+	{ (char*) "America/Nipigon"                   , 0x02B9B3 },
+	{ (char*) "America/Nome"                      , 0x02C765 },
+	{ (char*) "America/Noronha"                   , 0x02D0BD },
+	{ (char*) "America/North_Dakota/Beulah"       , 0x02D397 },
+	{ (char*) "America/North_Dakota/Center"       , 0x02DD14 },
+	{ (char*) "America/North_Dakota/New_Salem"    , 0x02E691 },
+	{ (char*) "America/Nuuk"                      , 0x02F014 },
+	{ (char*) "America/Ojinaga"                   , 0x02F792 },
+	{ (char*) "America/Panama"                    , 0x02FDAE },
+	{ (char*) "America/Pangnirtung"               , 0x02FE70 },
+	{ (char*) "America/Paramaribo"                , 0x030716 },
+	{ (char*) "America/Phoenix"                   , 0x03081A },
+	{ (char*) "America/Port-au-Prince"            , 0x0309A6 },
+	{ (char*) "America/Port_of_Spain"             , 0x030F4C },
+	{ (char*) "America/Porto_Acre"                , 0x030FEC },
+	{ (char*) "America/Porto_Velho"               , 0x03125E },
+	{ (char*) "America/Puerto_Rico"               , 0x0314A4 },
+	{ (char*) "America/Punta_Arenas"              , 0x0315A6 },
+	{ (char*) "America/Rainy_River"               , 0x031D34 },
+	{ (char*) "America/Rankin_Inlet"              , 0x032874 },
+	{ (char*) "America/Recife"                    , 0x0330A8 },
+	{ (char*) "America/Regina"                    , 0x03337C },
+	{ (char*) "America/Resolute"                  , 0x033771 },
+	{ (char*) "America/Rio_Branco"                , 0x033FA6 },
+	{ (char*) "America/Rosario"                   , 0x03421C },
+	{ (char*) "America/Santa_Isabel"              , 0x03464E },
+	{ (char*) "America/Santarem"                  , 0x034FF4 },
+	{ (char*) "America/Santiago"                  , 0x035257 },
+	{ (char*) "America/Santo_Domingo"             , 0x035C43 },
+	{ (char*) "America/Sao_Paulo"                 , 0x035E19 },
+	{ (char*) "America/Scoresbysund"              , 0x0363F1 },
+	{ (char*) "America/Shiprock"                  , 0x036BA9 },
+	{ (char*) "America/Sitka"                     , 0x037551 },
+	{ (char*) "America/St_Barthelemy"             , 0x037E89 },
+	{ (char*) "America/St_Johns"                  , 0x037F8B },
+	{ (char*) "America/St_Kitts"                  , 0x038DF9 },
+	{ (char*) "America/St_Lucia"                  , 0x038E99 },
+	{ (char*) "America/St_Thomas"                 , 0x038F5B },
+	{ (char*) "America/St_Vincent"                , 0x038FFB },
+	{ (char*) "America/Swift_Current"             , 0x0390BD },
+	{ (char*) "America/Tegucigalpa"               , 0x03930B },
+	{ (char*) "America/Thule"                     , 0x039413 },
+	{ (char*) "America/Thunder_Bay"               , 0x039A0B },
+	{ (char*) "America/Tijuana"                   , 0x03A7BD },
+	{ (char*) "America/Toronto"                   , 0x03B172 },
+	{ (char*) "America/Tortola"                   , 0x03BF42 },
+	{ (char*) "America/Vancouver"                 , 0x03BFE2 },
+	{ (char*) "America/Virgin"                    , 0x03CB53 },
+	{ (char*) "America/Whitehorse"                , 0x03CC55 },
+	{ (char*) "America/Winnipeg"                  , 0x03D2C1 },
+	{ (char*) "America/Yakutat"                   , 0x03DE1E },
+	{ (char*) "America/Yellowknife"               , 0x03E73B },
+	{ (char*) "Antarctica/Casey"                  , 0x03F063 },
+	{ (char*) "Antarctica/Davis"                  , 0x03F21B },
+	{ (char*) "Antarctica/DumontDUrville"         , 0x03F347 },
+	{ (char*) "Antarctica/Macquarie"              , 0x03F417 },
+	{ (char*) "Antarctica/Mawson"                 , 0x03FD07 },
+	{ (char*) "Antarctica/McMurdo"                , 0x03FDD2 },
+	{ (char*) "Antarctica/Palmer"                 , 0x0405CD },
+	{ (char*) "Antarctica/Rothera"                , 0x040B5B },
+	{ (char*) "Antarctica/South_Pole"             , 0x040C04 },
+	{ (char*) "Antarctica/Syowa"                  , 0x041595 },
+	{ (char*) "Antarctica/Troll"                  , 0x04163D },
+	{ (char*) "Antarctica/Vostok"                 , 0x041ACA },
+	{ (char*) "Arctic/Longyearbyen"               , 0x041BB1 },
+	{ (char*) "Asia/Aden"                         , 0x0424B7 },
+	{ (char*) "Asia/Almaty"                       , 0x04255A },
+	{ (char*) "Asia/Amman"                        , 0x04294F },
+	{ (char*) "Asia/Anadyr"                       , 0x042EF4 },
+	{ (char*) "Asia/Aqtau"                        , 0x0433A9 },
+	{ (char*) "Asia/Aqtobe"                       , 0x043793 },
+	{ (char*) "Asia/Ashgabat"                     , 0x043B91 },
+	{ (char*) "Asia/Ashkhabad"                    , 0x043DFA },
+	{ (char*) "Asia/Atyrau"                       , 0x044063 },
+	{ (char*) "Asia/Baghdad"                      , 0x044455 },
+	{ (char*) "Asia/Bahrain"                      , 0x04482A },
+	{ (char*) "Asia/Baku"                         , 0x044915 },
+	{ (char*) "Asia/Bangkok"                      , 0x044DDE },
+	{ (char*) "Asia/Barnaul"                      , 0x044EA3 },
+	{ (char*) "Asia/Beirut"                       , 0x045374 },
+	{ (char*) "Asia/Bishkek"                      , 0x045BEA },
+	{ (char*) "Asia/Brunei"                       , 0x045FBF },
+	{ (char*) "Asia/Calcutta"                     , 0x046088 },
+	{ (char*) "Asia/Chita"                        , 0x0461B1 },
+	{ (char*) "Asia/Choibalsan"                   , 0x046688 },
+	{ (char*) "Asia/Chongqing"                    , 0x046A01 },
+	{ (char*) "Asia/Chungking"                    , 0x046C3E },
+	{ (char*) "Asia/Colombo"                      , 0x046E7B },
+	{ (char*) "Asia/Dacca"                        , 0x046FED },
+	{ (char*) "Asia/Damascus"                     , 0x04713C },
+	{ (char*) "Asia/Dhaka"                        , 0x047899 },
+	{ (char*) "Asia/Dili"                         , 0x0479E8 },
+	{ (char*) "Asia/Dubai"                        , 0x047AF5 },
+	{ (char*) "Asia/Dushanbe"                     , 0x047B98 },
+	{ (char*) "Asia/Famagusta"                    , 0x047DE5 },
+	{ (char*) "Asia/Gaza"                         , 0x0485EC },
+	{ (char*) "Asia/Harbin"                       , 0x049506 },
+	{ (char*) "Asia/Hebron"                       , 0x049743 },
+	{ (char*) "Asia/Ho_Chi_Minh"                  , 0x04A678 },
+	{ (char*) "Asia/Hong_Kong"                    , 0x04A7D5 },
+	{ (char*) "Asia/Hovd"                         , 0x04ACB2 },
+	{ (char*) "Asia/Irkutsk"                      , 0x04B041 },
+	{ (char*) "Asia/Istanbul"                     , 0x04B534 },
+	{ (char*) "Asia/Jakarta"                      , 0x04BCCD },
+	{ (char*) "Asia/Jayapura"                     , 0x04BE65 },
+	{ (char*) "Asia/Jerusalem"                    , 0x04BF84 },
+	{ (char*) "Asia/Kabul"                        , 0x04C8E4 },
+	{ (char*) "Asia/Kamchatka"                    , 0x04C9B2 },
+	{ (char*) "Asia/Karachi"                      , 0x04CE50 },
+	{ (char*) "Asia/Kashgar"                      , 0x04CFD7 },
+	{ (char*) "Asia/Kathmandu"                    , 0x04D07A },
+	{ (char*) "Asia/Katmandu"                     , 0x04D14C },
+	{ (char*) "Asia/Khandyga"                     , 0x04D21E },
+	{ (char*) "Asia/Kolkata"                      , 0x04D731 },
+	{ (char*) "Asia/Krasnoyarsk"                  , 0x04D85A },
+	{ (char*) "Asia/Kuala_Lumpur"                 , 0x04DD28 },
+	{ (char*) "Asia/Kuching"                      , 0x04DED9 },
+	{ (char*) "Asia/Kuwait"                       , 0x04E0C8 },
+	{ (char*) "Asia/Macao"                        , 0x04E16B },
+	{ (char*) "Asia/Macau"                        , 0x04E642 },
+	{ (char*) "Asia/Magadan"                      , 0x04EB19 },
+	{ (char*) "Asia/Makassar"                     , 0x04EFED },
+	{ (char*) "Asia/Manila"                       , 0x04F140 },
+	{ (char*) "Asia/Muscat"                       , 0x04F294 },
+	{ (char*) "Asia/Nicosia"                      , 0x04F337 },
+	{ (char*) "Asia/Novokuznetsk"                 , 0x04FB23 },
+	{ (char*) "Asia/Novosibirsk"                  , 0x04FFBF },
+	{ (char*) "Asia/Omsk"                         , 0x050496 },
+	{ (char*) "Asia/Oral"                         , 0x050958 },
+	{ (char*) "Asia/Phnom_Penh"                   , 0x050D52 },
+	{ (char*) "Asia/Pontianak"                    , 0x050E77 },
+	{ (char*) "Asia/Pyongyang"                    , 0x050FFA },
+	{ (char*) "Asia/Qatar"                        , 0x0510F3 },
+	{ (char*) "Asia/Qostanay"                     , 0x0511B8 },
+	{ (char*) "Asia/Qyzylorda"                    , 0x0515DF },
+	{ (char*) "Asia/Rangoon"                      , 0x0519FB },
+	{ (char*) "Asia/Riyadh"                       , 0x051B05 },
+	{ (char*) "Asia/Saigon"                       , 0x051BA8 },
+	{ (char*) "Asia/Sakhalin"                     , 0x051D05 },
+	{ (char*) "Asia/Samarkand"                    , 0x0521CD },
+	{ (char*) "Asia/Seoul"                        , 0x05241D },
+	{ (char*) "Asia/Shanghai"                     , 0x052692 },
+	{ (char*) "Asia/Singapore"                    , 0x0528DB },
+	{ (char*) "Asia/Srednekolymsk"                , 0x052A78 },
+	{ (char*) "Asia/Taipei"                       , 0x052F4C },
+	{ (char*) "Asia/Tashkent"                     , 0x053251 },
+	{ (char*) "Asia/Tbilisi"                      , 0x0534AF },
+	{ (char*) "Asia/Tehran"                       , 0x0538B8 },
+	{ (char*) "Asia/Tel_Aviv"                     , 0x053DA4 },
+	{ (char*) "Asia/Thimbu"                       , 0x054704 },
+	{ (char*) "Asia/Thimphu"                      , 0x0547CD },
+	{ (char*) "Asia/Tokyo"                        , 0x054896 },
+	{ (char*) "Asia/Tomsk"                        , 0x0549D7 },
+	{ (char*) "Asia/Ujung_Pandang"                , 0x054EA8 },
+	{ (char*) "Asia/Ulaanbaatar"                  , 0x054FB2 },
+	{ (char*) "Asia/Ulan_Bator"                   , 0x05533B },
+	{ (char*) "Asia/Urumqi"                       , 0x0556B4 },
+	{ (char*) "Asia/Ust-Nera"                     , 0x055764 },
+	{ (char*) "Asia/Vientiane"                    , 0x055C5A },
+	{ (char*) "Asia/Vladivostok"                  , 0x055D9B },
+	{ (char*) "Asia/Yakutsk"                      , 0x056264 },
+	{ (char*) "Asia/Yangon"                       , 0x05672C },
+	{ (char*) "Asia/Yekaterinburg"                , 0x056836 },
+	{ (char*) "Asia/Yerevan"                      , 0x056D1D },
+	{ (char*) "Atlantic/Azores"                   , 0x05719A },
+	{ (char*) "Atlantic/Bermuda"                  , 0x057F1E },
+	{ (char*) "Atlantic/Canary"                   , 0x058886 },
+	{ (char*) "Atlantic/Cape_Verde"               , 0x059009 },
+	{ (char*) "Atlantic/Faeroe"                   , 0x059115 },
+	{ (char*) "Atlantic/Faroe"                    , 0x059838 },
+	{ (char*) "Atlantic/Jan_Mayen"                , 0x059F5B },
+	{ (char*) "Atlantic/Madeira"                  , 0x05A861 },
+	{ (char*) "Atlantic/Reykjavik"                , 0x05B5AD },
+	{ (char*) "Atlantic/South_Georgia"            , 0x05BA43 },
+	{ (char*) "Atlantic/St_Helena"                , 0x05BAE5 },
+	{ (char*) "Atlantic/Stanley"                  , 0x05BBA7 },
+	{ (char*) "Australia/ACT"                     , 0x05C063 },
+	{ (char*) "Australia/Adelaide"                , 0x05C8FD },
+	{ (char*) "Australia/Brisbane"                , 0x05D1B8 },
+	{ (char*) "Australia/Broken_Hill"             , 0x05D37E },
+	{ (char*) "Australia/Canberra"                , 0x05DC5B },
+	{ (char*) "Australia/Currie"                  , 0x05E4F5 },
+	{ (char*) "Australia/Darwin"                  , 0x05EE37 },
+	{ (char*) "Australia/Eucla"                   , 0x05EF9A },
+	{ (char*) "Australia/Hobart"                  , 0x05F187 },
+	{ (char*) "Australia/LHI"                     , 0x05FAD1 },
+	{ (char*) "Australia/Lindeman"                , 0x060213 },
+	{ (char*) "Australia/Lord_Howe"               , 0x060419 },
+	{ (char*) "Australia/Melbourne"               , 0x060B6B },
+	{ (char*) "Australia/North"                   , 0x06140D },
+	{ (char*) "Australia/NSW"                     , 0x06155E },
+	{ (char*) "Australia/Perth"                   , 0x061DF8 },
+	{ (char*) "Australia/Queensland"              , 0x061FE0 },
+	{ (char*) "Australia/South"                   , 0x06218F },
+	{ (char*) "Australia/Sydney"                  , 0x062A3B },
+	{ (char*) "Australia/Tasmania"                , 0x0632F1 },
+	{ (char*) "Australia/Victoria"                , 0x063C33 },
+	{ (char*) "Australia/West"                    , 0x0644CD },
+	{ (char*) "Australia/Yancowinna"              , 0x064697 },
+	{ (char*) "Brazil/Acre"                       , 0x064F58 },
+	{ (char*) "Brazil/DeNoronha"                  , 0x0651CA },
+	{ (char*) "Brazil/East"                       , 0x065494 },
+	{ (char*) "Brazil/West"                       , 0x065A36 },
+	{ (char*) "Canada/Atlantic"                   , 0x065C90 },
+	{ (char*) "Canada/Central"                    , 0x0669FC },
+	{ (char*) "Canada/Eastern"                    , 0x06753C },
+	{ (char*) "Canada/Mountain"                   , 0x0682EE },
+	{ (char*) "Canada/Newfoundland"               , 0x068C16 },
+	{ (char*) "Canada/Pacific"                    , 0x069A69 },
+	{ (char*) "Canada/Saskatchewan"               , 0x06A5C1 },
+	{ (char*) "Canada/Yukon"                      , 0x06A9A1 },
+	{ (char*) "CET"                               , 0x06AFFB },
+	{ (char*) "Chile/Continental"                 , 0x06BB7C },
+	{ (char*) "Chile/EasterIsland"                , 0x06C55B },
+	{ (char*) "CST6CDT"                           , 0x06CE12 },
+	{ (char*) "Cuba"                              , 0x06DC26 },
+	{ (char*) "EET"                               , 0x06E5A2 },
+	{ (char*) "Egypt"                             , 0x06EE84 },
+	{ (char*) "Eire"                              , 0x06F7EF },
+	{ (char*) "EST"                               , 0x07059F },
+	{ (char*) "EST5EDT"                           , 0x070661 },
+	{ (char*) "Etc/GMT"                           , 0x07144D },
+	{ (char*) "Etc/GMT+0"                         , 0x0714CB },
+	{ (char*) "Etc/GMT+1"                         , 0x071549 },
+	{ (char*) "Etc/GMT+10"                        , 0x0715C9 },
+	{ (char*) "Etc/GMT+11"                        , 0x07164A },
+	{ (char*) "Etc/GMT+12"                        , 0x0716CB },
+	{ (char*) "Etc/GMT+2"                         , 0x07174C },
+	{ (char*) "Etc/GMT+3"                         , 0x0717CC },
+	{ (char*) "Etc/GMT+4"                         , 0x07184C },
+	{ (char*) "Etc/GMT+5"                         , 0x0718CC },
+	{ (char*) "Etc/GMT+6"                         , 0x07194C },
+	{ (char*) "Etc/GMT+7"                         , 0x0719CC },
+	{ (char*) "Etc/GMT+8"                         , 0x071A4C },
+	{ (char*) "Etc/GMT+9"                         , 0x071ACC },
+	{ (char*) "Etc/GMT-0"                         , 0x071B4C },
+	{ (char*) "Etc/GMT-1"                         , 0x071BCA },
+	{ (char*) "Etc/GMT-10"                        , 0x071C4B },
+	{ (char*) "Etc/GMT-11"                        , 0x071CCD },
+	{ (char*) "Etc/GMT-12"                        , 0x071D4F },
+	{ (char*) "Etc/GMT-13"                        , 0x071DD1 },
+	{ (char*) "Etc/GMT-14"                        , 0x071E53 },
+	{ (char*) "Etc/GMT-2"                         , 0x071ED5 },
+	{ (char*) "Etc/GMT-3"                         , 0x071F56 },
+	{ (char*) "Etc/GMT-4"                         , 0x071FD7 },
+	{ (char*) "Etc/GMT-5"                         , 0x072058 },
+	{ (char*) "Etc/GMT-6"                         , 0x0720D9 },
+	{ (char*) "Etc/GMT-7"                         , 0x07215A },
+	{ (char*) "Etc/GMT-8"                         , 0x0721DB },
+	{ (char*) "Etc/GMT-9"                         , 0x07225C },
+	{ (char*) "Etc/GMT0"                          , 0x0722DD },
+	{ (char*) "Etc/Greenwich"                     , 0x07235B },
+	{ (char*) "Etc/UCT"                           , 0x0723D9 },
+	{ (char*) "Etc/Universal"                     , 0x072457 },
+	{ (char*) "Etc/UTC"                           , 0x0724D5 },
+	{ (char*) "Etc/Zulu"                          , 0x072553 },
+	{ (char*) "Europe/Amsterdam"                  , 0x0725D1 },
+	{ (char*) "Europe/Andorra"                    , 0x07313B },
+	{ (char*) "Europe/Astrakhan"                  , 0x073815 },
+	{ (char*) "Europe/Athens"                     , 0x073CB2 },
+	{ (char*) "Europe/Belfast"                    , 0x074594 },
+	{ (char*) "Europe/Belgrade"                   , 0x0753F0 },
+	{ (char*) "Europe/Berlin"                     , 0x075B7C },
+	{ (char*) "Europe/Bratislava"                 , 0x076491 },
+	{ (char*) "Europe/Brussels"                   , 0x076D9A },
+	{ (char*) "Europe/Bucharest"                  , 0x07791B },
+	{ (char*) "Europe/Budapest"                   , 0x0781AF },
+	{ (char*) "Europe/Busingen"                   , 0x078AFB },
+	{ (char*) "Europe/Chisinau"                   , 0x079284 },
+	{ (char*) "Europe/Copenhagen"                 , 0x079BE6 },
+	{ (char*) "Europe/Dublin"                     , 0x07A44B },
+	{ (char*) "Europe/Gibraltar"                  , 0x07B1FB },
+	{ (char*) "Europe/Guernsey"                   , 0x07BE03 },
+	{ (char*) "Europe/Helsinki"                   , 0x07CCA3 },
+	{ (char*) "Europe/Isle_of_Man"                , 0x07D41B },
+	{ (char*) "Europe/Istanbul"                   , 0x07E267 },
+	{ (char*) "Europe/Jersey"                     , 0x07EA00 },
+	{ (char*) "Europe/Kaliningrad"                , 0x07F8A0 },
+	{ (char*) "Europe/Kiev"                       , 0x07FE95 },
+	{ (char*) "Europe/Kirov"                      , 0x0806E9 },
+	{ (char*) "Europe/Kyiv"                       , 0x080BA4 },
+	{ (char*) "Europe/Lisbon"                     , 0x081407 },
+	{ (char*) "Europe/Ljubljana"                  , 0x0821ED },
+	{ (char*) "Europe/London"                     , 0x082979 },
+	{ (char*) "Europe/Luxembourg"                 , 0x0837D5 },
+	{ (char*) "Europe/Madrid"                     , 0x084363 },
+	{ (char*) "Europe/Malta"                      , 0x084DB5 },
+	{ (char*) "Europe/Mariehamn"                  , 0x0857FD },
+	{ (char*) "Europe/Minsk"                      , 0x085F75 },
+	{ (char*) "Europe/Monaco"                     , 0x08649C },
+	{ (char*) "Europe/Moscow"                     , 0x087028 },
+	{ (char*) "Europe/Nicosia"                    , 0x087647 },
+	{ (char*) "Europe/Oslo"                       , 0x087E25 },
+	{ (char*) "Europe/Paris"                      , 0x0886E5 },
+	{ (char*) "Europe/Podgorica"                  , 0x089283 },
+	{ (char*) "Europe/Prague"                     , 0x089A0F },
+	{ (char*) "Europe/Riga"                       , 0x08A318 },
+	{ (char*) "Europe/Rome"                       , 0x08ABBA },
+	{ (char*) "Europe/Samara"                     , 0x08B617 },
+	{ (char*) "Europe/San_Marino"                 , 0x08BAED },
+	{ (char*) "Europe/Sarajevo"                   , 0x08C54A },
+	{ (char*) "Europe/Saratov"                    , 0x08CCD6 },
+	{ (char*) "Europe/Simferopol"                 , 0x08D183 },
+	{ (char*) "Europe/Skopje"                     , 0x08D752 },
+	{ (char*) "Europe/Sofia"                      , 0x08DEDE },
+	{ (char*) "Europe/Stockholm"                  , 0x08E707 },
+	{ (char*) "Europe/Tallinn"                    , 0x08EE88 },
+	{ (char*) "Europe/Tirane"                     , 0x08F6F8 },
+	{ (char*) "Europe/Tiraspol"                   , 0x08FF28 },
+	{ (char*) "Europe/Ulyanovsk"                  , 0x09088A },
+	{ (char*) "Europe/Uzhgorod"                   , 0x090D8D },
+	{ (char*) "Europe/Vaduz"                      , 0x0915E1 },
+	{ (char*) "Europe/Vatican"                    , 0x091D4D },
+	{ (char*) "Europe/Vienna"                     , 0x0927AA },
+	{ (char*) "Europe/Vilnius"                    , 0x09304E },
+	{ (char*) "Europe/Volgograd"                  , 0x0938CC },
+	{ (char*) "Europe/Warsaw"                     , 0x093D93 },
+	{ (char*) "Europe/Zagreb"                     , 0x0947FD },
+	{ (char*) "Europe/Zaporozhye"                 , 0x094F89 },
+	{ (char*) "Europe/Zurich"                     , 0x0957DD },
+	{ (char*) "Factory"                           , 0x095F5E },
+	{ (char*) "GB"                                , 0x095FDE },
+	{ (char*) "GB-Eire"                           , 0x096E3A },
+	{ (char*) "GMT"                               , 0x097C96 },
+	{ (char*) "GMT+0"                             , 0x097D14 },
+	{ (char*) "GMT-0"                             , 0x097D92 },
+	{ (char*) "GMT0"                              , 0x097E10 },
+	{ (char*) "Greenwich"                         , 0x097E8E },
+	{ (char*) "Hongkong"                          , 0x097F0C },
+	{ (char*) "HST"                               , 0x0983E9 },
+	{ (char*) "Iceland"                           , 0x09853E },
+	{ (char*) "Indian/Antananarivo"               , 0x0985DE },
+	{ (char*) "Indian/Chagos"                     , 0x0986C5 },
+	{ (char*) "Indian/Christmas"                  , 0x09878A },
+	{ (char*) "Indian/Cocos"                      , 0x09882D },
+	{ (char*) "Indian/Comoro"                     , 0x0988D9 },
+	{ (char*) "Indian/Kerguelen"                  , 0x09897A },
+	{ (char*) "Indian/Mahe"                       , 0x098A1D },
+	{ (char*) "Indian/Maldives"                   , 0x098AC0 },
+	{ (char*) "Indian/Mauritius"                  , 0x098B85 },
+	{ (char*) "Indian/Mayotte"                    , 0x098C74 },
+	{ (char*) "Indian/Reunion"                    , 0x098D15 },
+	{ (char*) "Iran"                              , 0x098DB8 },
+	{ (char*) "Israel"                            , 0x0992A4 },
+	{ (char*) "Jamaica"                           , 0x099C04 },
+	{ (char*) "Japan"                             , 0x099DF2 },
+	{ (char*) "Kwajalein"                         , 0x099F33 },
+	{ (char*) "Libya"                             , 0x09A06D },
+	{ (char*) "MET"                               , 0x09A2EA },
+	{ (char*) "Mexico/BajaNorte"                  , 0x09AE6B },
+	{ (char*) "Mexico/BajaSur"                    , 0x09B811 },
+	{ (char*) "Mexico/General"                    , 0x09BC41 },
+	{ (char*) "MST"                               , 0x09C113 },
+	{ (char*) "MST7MDT"                           , 0x09C287 },
+	{ (char*) "Navajo"                            , 0x09CC2F },
+	{ (char*) "NZ"                                , 0x09D5D7 },
+	{ (char*) "NZ-CHAT"                           , 0x09DF68 },
+	{ (char*) "Pacific/Apia"                      , 0x09E77A },
+	{ (char*) "Pacific/Auckland"                  , 0x09E9DC },
+	{ (char*) "Pacific/Bougainville"              , 0x09F380 },
+	{ (char*) "Pacific/Chatham"                   , 0x09F496 },
+	{ (char*) "Pacific/Chuuk"                     , 0x09FCB7 },
+	{ (char*) "Pacific/Easter"                    , 0x09FDD1 },
+	{ (char*) "Pacific/Efate"                     , 0x0A0695 },
+	{ (char*) "Pacific/Enderbury"                 , 0x0A08AD },
+	{ (char*) "Pacific/Fakaofo"                   , 0x0A0995 },
+	{ (char*) "Pacific/Fiji"                      , 0x0A0A5B },
+	{ (char*) "Pacific/Funafuti"                  , 0x0A0C9B },
+	{ (char*) "Pacific/Galapagos"                 , 0x0A0D3F },
+	{ (char*) "Pacific/Gambier"                   , 0x0A0E3C },
+	{ (char*) "Pacific/Guadalcanal"               , 0x0A0EED },
+	{ (char*) "Pacific/Guam"                      , 0x0A0F91 },
+	{ (char*) "Pacific/Honolulu"                  , 0x0A118B },
+	{ (char*) "Pacific/Johnston"                  , 0x0A12E6 },
+	{ (char*) "Pacific/Kanton"                    , 0x0A143B },
+	{ (char*) "Pacific/Kiritimati"                , 0x0A1532 },
+	{ (char*) "Pacific/Kosrae"                    , 0x0A162A },
+	{ (char*) "Pacific/Kwajalein"                 , 0x0A178D },
+	{ (char*) "Pacific/Majuro"                    , 0x0A18D0 },
+	{ (char*) "Pacific/Marquesas"                 , 0x0A1A1C },
+	{ (char*) "Pacific/Midway"                    , 0x0A1AD8 },
+	{ (char*) "Pacific/Nauru"                     , 0x0A1BCB },
+	{ (char*) "Pacific/Niue"                      , 0x0A1CC5 },
+	{ (char*) "Pacific/Norfolk"                   , 0x0A1D8E },
+	{ (char*) "Pacific/Noumea"                    , 0x0A20FC },
+	{ (char*) "Pacific/Pago_Pago"                 , 0x0A222A },
+	{ (char*) "Pacific/Palau"                     , 0x0A22E5 },
+	{ (char*) "Pacific/Pitcairn"                  , 0x0A2397 },
+	{ (char*) "Pacific/Pohnpei"                   , 0x0A245F },
+	{ (char*) "Pacific/Ponape"                    , 0x0A259A },
+	{ (char*) "Pacific/Port_Moresby"              , 0x0A263E },
+	{ (char*) "Pacific/Rarotonga"                 , 0x0A270E },
+	{ (char*) "Pacific/Saipan"                    , 0x0A2967 },
+	{ (char*) "Pacific/Samoa"                     , 0x0A2B53 },
+	{ (char*) "Pacific/Tahiti"                    , 0x0A2C0E },
+	{ (char*) "Pacific/Tarawa"                    , 0x0A2CC0 },
+	{ (char*) "Pacific/Tongatapu"                 , 0x0A2D73 },
+	{ (char*) "Pacific/Truk"                      , 0x0A2EE5 },
+	{ (char*) "Pacific/Wake"                      , 0x0A2F9D },
+	{ (char*) "Pacific/Wallis"                    , 0x0A304C },
+	{ (char*) "Pacific/Yap"                       , 0x0A30F0 },
+	{ (char*) "Poland"                            , 0x0A31A8 },
+	{ (char*) "Portugal"                          , 0x0A3C12 },
+	{ (char*) "PRC"                               , 0x0A49E5 },
+	{ (char*) "PST8PDT"                           , 0x0A4C22 },
+	{ (char*) "ROC"                               , 0x0A5752 },
+	{ (char*) "ROK"                               , 0x0A5A57 },
+	{ (char*) "Singapore"                         , 0x0A5CCC },
+	{ (char*) "Turkey"                            , 0x0A5E69 },
+	{ (char*) "UCT"                               , 0x0A6602 },
+	{ (char*) "Universal"                         , 0x0A6680 },
+	{ (char*) "US/Alaska"                         , 0x0A66FE },
+	{ (char*) "US/Aleutian"                       , 0x0A704D },
+	{ (char*) "US/Arizona"                        , 0x0A798D },
+	{ (char*) "US/Central"                        , 0x0A7B01 },
+	{ (char*) "US/East-Indiana"                   , 0x0A8915 },
+	{ (char*) "US/Eastern"                        , 0x0A8FB3 },
+	{ (char*) "US/Hawaii"                         , 0x0A9D9F },
+	{ (char*) "US/Indiana-Starke"                 , 0x0A9EF4 },
+	{ (char*) "US/Michigan"                       , 0x0AA88C },
+	{ (char*) "US/Mountain"                       , 0x0AB14E },
+	{ (char*) "US/Pacific"                        , 0x0ABAF6 },
+	{ (char*) "US/Samoa"                          , 0x0AC626 },
+	{ (char*) "UTC"                               , 0x0AC6E1 },
+	{ (char*) "W-SU"                              , 0x0AC75F },
+	{ (char*) "WET"                               , 0x0ACD6A },
+	{ (char*) "Zulu"                              , 0x0ADB3D },
 };
 
 
-const unsigned char timelib_timezone_db_data_builtin704144 = {
+const unsigned char timelib_timezone_db_data_builtin711611 = {
 
 /* Africa/Abidjan */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -25822,12 +26102,12 @@
 /* Africa/Maputo */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x82, 0x46, 0xC5, 0xF4,
-0x01, 0x00, 0x00, 0x1E, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x4C, 0x4D, 0x54,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x8D, 0x42, 0xD5, 0x76,
+0x01, 0x00, 0x00, 0x1E, 0x8A, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x4C, 0x4D, 0x54,
 0x00, 0x43, 0x41, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-0x08, 0xFF, 0xFF, 0xFF, 0xFF, 0x82, 0x46, 0xC5, 0xF4, 0x01, 0x00, 0x00, 0x1E, 0x8C, 0x00, 0x00,
+0x08, 0xFF, 0xFF, 0xFF, 0xFF, 0x8D, 0x42, 0xD5, 0x76, 0x01, 0x00, 0x00, 0x1E, 0x8A, 0x00, 0x00,
 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x41, 0x54, 0x00, 0x0A, 0x43,
 0x41, 0x54, 0x2D, 0x32, 0x0A, 0x00, 0x61, 0xB5, 0x05, 0x01, 0x44, 0x60, 0x5D, 0x00, 0x00, 0x00,
 0x00, 
@@ -27876,79 +28156,76 @@
 
 /* America/Bahia_Banderas */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
-0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0xD8, 0x91, 0xB4, 0xF0, 0x00, 0x00, 0x70, 0x80,
-0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80,
-0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00,
-0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xF5, 0x12, 0x90, 0x3B, 0xB6, 0xD1, 0x00,
-0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00,
-0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80, 0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80,
-0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80, 0x46, 0x0F, 0x74, 0x90, 0x47, 0x24, 0x41, 0x80,
-0x47, 0xF8, 0x91, 0x10, 0x49, 0x04, 0x23, 0x80, 0x49, 0xD8, 0x73, 0x10, 0x4A, 0xE4, 0x05, 0x80,
-0x4B, 0xB8, 0x55, 0x10, 0x4C, 0xCD, 0x13, 0xF0, 0x4D, 0x98, 0x29, 0x00, 0x4E, 0xAC, 0xF5, 0xF0,
-0x4F, 0x78, 0x0B, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x51, 0x61, 0x27, 0x80, 0x52, 0x6C, 0xB9, 0xF0,
-0x53, 0x41, 0x09, 0x80, 0x54, 0x4C, 0x9B, 0xF0, 0x55, 0x20, 0xEB, 0x80, 0x56, 0x2C, 0x7D, 0xF0,
-0x57, 0x00, 0xCD, 0x80, 0x58, 0x15, 0x9A, 0x70, 0x58, 0xE0, 0xAF, 0x80, 0x59, 0xF5, 0x7C, 0x70,
-0x5A, 0xC0, 0x91, 0x80, 0x5B, 0xD5, 0x5E, 0x70, 0x5C, 0xA9, 0xAE, 0x00, 0x5D, 0xB5, 0x40, 0x70,
-0x5E, 0x89, 0x90, 0x00, 0x5F, 0x95, 0x22, 0x70, 0x60, 0x69, 0x72, 0x00, 0x61, 0x7E, 0x3E, 0xF0,
-0x62, 0x49, 0x54, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x06, 0x02, 0x06,
-0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06,
-0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0xFF, 0xFF, 0x9D, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0x9D,
-0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF,
-0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01,
-0x14, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43,
-0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54,
-0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5,
-0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6,
-0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8,
-0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB,
-0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32,
-0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34,
-0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
-0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38,
-0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39,
-0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3B,
-0xB6, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D,
-0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F,
-0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41,
-0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43,
-0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45,
-0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x74, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47,
-0x24, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x91, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
-0x04, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x73, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A,
-0xE4, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x55, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C,
-0xCD, 0x13, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E,
-0xAC, 0xF5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
-0x8C, 0xD7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52,
-0x6C, 0xB9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54,
-0x4C, 0x9B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20, 0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56,
-0x2C, 0x7D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00, 0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58,
-0x15, 0x9A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0, 0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x59,
-0xF5, 0x7C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0, 0x91, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5B,
-0xD5, 0x5E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D,
-0xB5, 0x40, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F,
-0x95, 0x22, 0x70, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61,
-0x7E, 0x3E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63,
-0x5E, 0x20, 0xF0, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02,
-0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02,
-0x06, 0x02, 0xFF, 0xFF, 0x9D, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF,
-0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
-0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x14, 0xFF, 0xFF, 0xAB, 0xA0,
-0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44,
-0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A,
-0x00, 0xA9, 0x11, 0x40, 0x00, 0x72, 0x0F, 0x38, 0x00, 0x00, 0x00, 0x11, 0x42, 0x61, 0x68, 0x69,
-0x61, 0x20, 0x64, 0x65, 0x20, 0x42, 0x61, 0x6E, 0x64, 0x65, 0x72, 0x61, 0x73, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
+0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80,
+0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80,
+0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00,
+0x3A, 0xF5, 0x12, 0x90, 0x3B, 0xB6, 0xD1, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00,
+0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80,
+0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80, 0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80,
+0x46, 0x0F, 0x74, 0x90, 0x47, 0x24, 0x41, 0x80, 0x47, 0xF8, 0x91, 0x10, 0x49, 0x04, 0x23, 0x80,
+0x49, 0xD8, 0x73, 0x10, 0x4A, 0xE4, 0x05, 0x80, 0x4B, 0xB8, 0x55, 0x10, 0x4C, 0xCD, 0x13, 0xF0,
+0x4D, 0x98, 0x29, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x4F, 0x78, 0x0B, 0x00, 0x50, 0x8C, 0xD7, 0xF0,
+0x51, 0x61, 0x27, 0x80, 0x52, 0x6C, 0xB9, 0xF0, 0x53, 0x41, 0x09, 0x80, 0x54, 0x4C, 0x9B, 0xF0,
+0x55, 0x20, 0xEB, 0x80, 0x56, 0x2C, 0x7D, 0xF0, 0x57, 0x00, 0xCD, 0x80, 0x58, 0x15, 0x9A, 0x70,
+0x58, 0xE0, 0xAF, 0x80, 0x59, 0xF5, 0x7C, 0x70, 0x5A, 0xC0, 0x91, 0x80, 0x5B, 0xD5, 0x5E, 0x70,
+0x5C, 0xA9, 0xAE, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x5E, 0x89, 0x90, 0x00, 0x5F, 0x95, 0x22, 0x70,
+0x60, 0x69, 0x72, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x62, 0x49, 0x54, 0x00, 0x63, 0x5E, 0x20, 0xF0,
+0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05,
+0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0xFF, 0xFF, 0x9D,
+0x54, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF,
+0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01,
+0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43,
+0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00,
+0x07, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF,
+0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00,
+0x00, 0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x3A, 0xF5, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xD1, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x46, 0x0F, 0x74, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x41, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x47, 0xF8, 0x91, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x23, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x49, 0xD8, 0x73, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x05, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x4B, 0xB8, 0x55, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00, 0x00, 0x00,
+0x00, 0x4D, 0x98, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00, 0x00, 0x00,
+0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00, 0x00, 0x00,
+0x00, 0x51, 0x61, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00, 0x00, 0x00,
+0x00, 0x53, 0x41, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00, 0x00, 0x00,
+0x00, 0x55, 0x20, 0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x7D, 0xF0, 0x00, 0x00, 0x00,
+0x00, 0x57, 0x00, 0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x9A, 0x70, 0x00, 0x00, 0x00,
+0x00, 0x58, 0xE0, 0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x7C, 0x70, 0x00, 0x00, 0x00,
+0x00, 0x5A, 0xC0, 0x91, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x5E, 0x70, 0x00, 0x00, 0x00,
+0x00, 0x5C, 0xA9, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x00, 0x00, 0x00,
+0x00, 0x5E, 0x89, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x95, 0x22, 0x70, 0x00, 0x00, 0x00,
+0x00, 0x60, 0x69, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x00, 0x00, 0x00,
+0x00, 0x62, 0x49, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x04,
+0x03, 0x04, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0xFF, 0xFF, 0x9D, 0x54, 0x00, 0x00,
+0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0,
+0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF,
+0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
+0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xA9, 0x11, 0x40,
+0x00, 0x72, 0x0F, 0x38, 0x00, 0x00, 0x00, 0x11, 0x42, 0x61, 0x68, 0x69, 0x61, 0x20, 0x64, 0x65,
+0x20, 0x42, 0x61, 0x6E, 0x64, 0x65, 0x72, 0x61, 0x73, 
 
 /* America/Barbados */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -28676,59 +28953,61 @@
 
 /* America/Cancun */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x2A, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xDA, 0x60,
-0x16, 0x86, 0xD5, 0x60, 0x31, 0x67, 0x67, 0xF0, 0x32, 0x72, 0xFA, 0x60, 0x33, 0x47, 0x49, 0xF0,
-0x34, 0x52, 0xDC, 0x60, 0x35, 0x27, 0x2B, 0xF0, 0x35, 0xC4, 0x00, 0x60, 0x36, 0x32, 0xCC, 0x70,
-0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0,
-0x3A, 0xF5, 0x04, 0x80, 0x3B, 0xB6, 0xC2, 0xF0, 0x3C, 0xAF, 0xFC, 0x80, 0x3D, 0xBB, 0x8E, 0xF0,
-0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0, 0x40, 0x6F, 0xC0, 0x80, 0x41, 0x84, 0x8D, 0x70,
-0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70, 0x44, 0x2F, 0x84, 0x80, 0x45, 0x44, 0x51, 0x70,
-0x46, 0x0F, 0x66, 0x80, 0x47, 0x24, 0x33, 0x70, 0x47, 0xF8, 0x83, 0x00, 0x49, 0x04, 0x15, 0x70,
-0x49, 0xD8, 0x65, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x4B, 0xB8, 0x47, 0x00, 0x4C, 0xCD, 0x13, 0xF0,
-0x4D, 0x98, 0x29, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x4F, 0x78, 0x0B, 0x00, 0x50, 0x8C, 0xD7, 0xF0,
-0x51, 0x61, 0x27, 0x80, 0x52, 0x6C, 0xB9, 0xF0, 0x53, 0x41, 0x09, 0x80, 0x54, 0x4C, 0x9B, 0xF0,
-0x54, 0xCD, 0xDD, 0x00, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x03, 0xFF, 0xFF,
-0xAE, 0xA8, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08,
-0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0,
-0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
-0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x00,
-0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x16, 0x86, 0xD5, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x32, 0x72, 0xFA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x34, 0x52, 0xDC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x35, 0xC4, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00,
-0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x3A, 0xF5, 0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xC2, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00,
-0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00,
-0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00,
-0x00, 0x00, 0x46, 0x0F, 0x66, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x33, 0x70, 0x00, 0x00,
-0x00, 0x00, 0x47, 0xF8, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x15, 0x70, 0x00, 0x00,
-0x00, 0x00, 0x49, 0xD8, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x00, 0x00,
-0x00, 0x00, 0x4B, 0xB8, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x4D, 0x98, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x51, 0x61, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x53, 0x41, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x54, 0xCD, 0xDD, 0x00, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x03,
-0xFF, 0xFF, 0xAE, 0xA8, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0,
-0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF,
-0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53,
-0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x45, 0x53, 0x54,
-0x35, 0x0A, 0x00, 0xA9, 0x7F, 0xED, 0x00, 0x8E, 0x43, 0x45, 0x00, 0x00, 0x00, 0x0C, 0x51, 0x75,
-0x69, 0x6E, 0x74, 0x61, 0x6E, 0x61, 0x20, 0x52, 0x6F, 0x6F, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xDA, 0x60,
+0x16, 0x8A, 0xE6, 0x00, 0x18, 0x77, 0xCC, 0xD0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70,
+0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x2B, 0xF0, 0x35, 0xC4, 0x00, 0x60,
+0x36, 0x32, 0xCC, 0x70, 0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x38, 0xE6, 0xFE, 0x00,
+0x39, 0xFB, 0xCA, 0xF0, 0x3A, 0xF5, 0x04, 0x80, 0x3B, 0xB6, 0xC2, 0xF0, 0x3C, 0xAF, 0xFC, 0x80,
+0x3D, 0xBB, 0x8E, 0xF0, 0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0, 0x40, 0x6F, 0xC0, 0x80,
+0x41, 0x84, 0x8D, 0x70, 0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70, 0x44, 0x2F, 0x84, 0x80,
+0x45, 0x44, 0x51, 0x70, 0x46, 0x0F, 0x66, 0x80, 0x47, 0x24, 0x33, 0x70, 0x47, 0xF8, 0x83, 0x00,
+0x49, 0x04, 0x15, 0x70, 0x49, 0xD8, 0x65, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x4B, 0xB8, 0x47, 0x00,
+0x4C, 0xCD, 0x13, 0xF0, 0x4D, 0x98, 0x29, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x4F, 0x78, 0x0B, 0x00,
+0x50, 0x8C, 0xD7, 0xF0, 0x51, 0x61, 0x27, 0x80, 0x52, 0x6C, 0xB9, 0xF0, 0x53, 0x41, 0x09, 0x80,
+0x54, 0x4C, 0x9B, 0xF0, 0x54, 0xCD, 0xDD, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x02, 0x05,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x02, 0xFF, 0xFF, 0xAE, 0xA8, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF,
+0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x00,
+0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9,
+0xB0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43,
+0x44, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B, 0x00, 0x00, 0x00, 0x08, 0x00,
+0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16,
+0x8A, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x77, 0xCC, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x31,
+0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33,
+0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35,
+0x27, 0x2B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x35, 0xC4, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x36,
+0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38,
+0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39,
+0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3B,
+0xB6, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D,
+0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F,
+0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41,
+0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43,
+0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45,
+0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x66, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47,
+0x24, 0x33, 0x70, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,
+0x04, 0x15, 0x70, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A,
+0xE3, 0xF7, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4C,
+0xCD, 0x13, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E,
+0xAC, 0xF5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50,
+0x8C, 0xD7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52,
+0x6C, 0xB9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54,
+0x4C, 0x9B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x54, 0xCD, 0xDD, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04,
+0x03, 0x02, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x02, 0xFF, 0xFF, 0xAE, 0xA8, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0,
+0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF,
+0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C,
+0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53,
+0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35, 0x0A,
+0x00, 0xA9, 0x7F, 0xED, 0x00, 0x8E, 0x43, 0x45, 0x00, 0x00, 0x00, 0x0C, 0x51, 0x75, 0x69, 0x6E,
+0x74, 0x61, 0x6E, 0x61, 0x20, 0x52, 0x6F, 0x6F, 
 
 /* America/Caracas */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x56, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -29082,7 +29361,7 @@
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
 0xB8, 0xFD, 0x86, 0xF0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00,
 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10,
 0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xF5, 0x12, 0x90,
@@ -29109,8 +29388,8 @@
 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C,
 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70,
-0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60,
-0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60,
 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10,
@@ -29156,7 +29435,7 @@
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x5B, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
 0xB8, 0xFD, 0x86, 0xF0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00,
 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10,
 0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xF5, 0x12, 0x90,
@@ -29192,8 +29471,8 @@
 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x5B, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5,
-0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6,
-0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8,
+0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6,
+0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8,
 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31,
 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33,
 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35,
@@ -30240,45 +30519,46 @@
 /* America/Ensenada */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
-0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF2, 0x7C, 0xF0, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
-0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x99, 0xBA, 0x70,
-0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90,
-0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90, 0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10,
-0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10, 0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10,
-0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10, 0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10,
-0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10, 0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10,
-0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10, 0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10,
-0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10, 0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10,
-0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90, 0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90,
-0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90, 0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90,
-0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90, 0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90,
-0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10, 0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10,
-0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10, 0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10,
-0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10, 0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90,
-0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90, 0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90,
-0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90, 0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90,
-0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90, 0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10,
-0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10, 0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10,
-0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10, 0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10,
-0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90, 0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90,
-0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90, 0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90,
-0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90, 0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90,
-0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90, 0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90,
-0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90, 0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90,
-0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90, 0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90,
-0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10, 0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10,
-0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10, 0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10,
-0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10, 0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90,
-0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90, 0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90,
-0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90, 0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90,
-0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90, 0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10,
-0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10, 0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10,
-0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10, 0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10,
-0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90, 0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90,
-0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90, 0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90,
-0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90, 0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90,
-0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x00, 0x00, 0x00, 0x9B, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
+0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF1, 0x39, 0x80, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
+0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x9D, 0xAE, 0xF0,
+0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xDB, 0x00, 0x07, 0x00, 0xDB, 0xC0, 0x73, 0xF0,
+0xDC, 0xDE, 0xB3, 0xA0, 0xDD, 0xA9, 0xAC, 0x90, 0xDE, 0xBE, 0x95, 0xA0, 0xDF, 0x89, 0x8E, 0x90,
+0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90, 0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90,
+0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10, 0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10,
+0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10, 0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10,
+0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10, 0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10,
+0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10, 0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10,
+0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10, 0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10,
+0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10, 0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90,
+0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90, 0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90,
+0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90, 0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90,
+0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90, 0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10,
+0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10, 0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10,
+0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10, 0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10,
+0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90, 0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90,
+0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90, 0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90,
+0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90, 0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90,
+0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10, 0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10,
+0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10, 0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10,
+0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10, 0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90,
+0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90, 0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90,
+0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90, 0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90,
+0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90, 0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90,
+0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90, 0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90,
+0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90, 0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90,
+0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90, 0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10,
+0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10, 0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10,
+0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10, 0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10,
+0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90, 0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90,
+0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90, 0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90,
+0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90, 0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90,
+0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10, 0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10,
+0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10, 0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10,
+0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10, 0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90,
+0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90, 0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90,
+0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90, 0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90,
+0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
@@ -30287,90 +30567,94 @@
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
-0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D,
-0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF,
-0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54,
-0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D,
-0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A,
-0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F,
+0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50,
+0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A, 0x90, 0x01,
+0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
@@ -30379,15 +30663,15 @@
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
-0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF,
-0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14,
-0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53,
-0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x50,
-0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00,
+0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90,
+0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF,
+0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53,
+0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50,
+0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
+0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Fort_Nelson */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -31739,35 +32023,31 @@
 
 /* America/Hermosillo */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
-0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0xD8, 0x91, 0xB4, 0xF0, 0x00, 0x00, 0x70, 0x80,
-0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80,
-0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x97, 0xF8, 0x00, 0x00, 0xFF, 0xFF, 0x9D,
-0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF,
-0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
-0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54,
-0x00, 0x50, 0x53, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05, 0x04,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xA5, 0xB6, 0xE8, 0x70,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
+0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80,
+0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80,
+0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x97,
+0xF8, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF,
+0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D,
+0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B,
+0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D,
+0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86,
+0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x97, 0xF8, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
-0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00,
-0x50, 0x53, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0xB5, 0xAE, 0x6A, 0x00, 0x69, 0x56, 0x25,
-0x00, 0x00, 0x00, 0x06, 0x53, 0x6F, 0x6E, 0x6F, 0x72, 0x61, 
+0x9D, 0x90, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
+0x4D, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x4D,
+0x53, 0x54, 0x37, 0x0A, 0x00, 0xB5, 0xAE, 0x6A, 0x00, 0x69, 0x56, 0x25, 0x00, 0x00, 0x00, 0x06,
+0x53, 0x6F, 0x6E, 0x6F, 0x72, 0x61, 
 
 /* America/Indiana/Indianapolis */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -34530,80 +34810,76 @@
 
 /* America/Mazatlan */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
-0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0xD8, 0x91, 0xB4, 0xF0, 0x00, 0x00, 0x70, 0x80,
-0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80,
-0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00,
-0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xF5, 0x12, 0x90, 0x3B, 0xB6, 0xD1, 0x00,
-0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00,
-0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80, 0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80,
-0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80, 0x46, 0x0F, 0x74, 0x90, 0x47, 0x24, 0x41, 0x80,
-0x47, 0xF8, 0x91, 0x10, 0x49, 0x04, 0x23, 0x80, 0x49, 0xD8, 0x73, 0x10, 0x4A, 0xE4, 0x05, 0x80,
-0x4B, 0xB8, 0x55, 0x10, 0x4C, 0xCD, 0x22, 0x00, 0x4D, 0x98, 0x37, 0x10, 0x4E, 0xAD, 0x04, 0x00,
-0x4F, 0x78, 0x19, 0x10, 0x50, 0x8C, 0xE6, 0x00, 0x51, 0x61, 0x35, 0x90, 0x52, 0x6C, 0xC8, 0x00,
-0x53, 0x41, 0x17, 0x90, 0x54, 0x4C, 0xAA, 0x00, 0x55, 0x20, 0xF9, 0x90, 0x56, 0x2C, 0x8C, 0x00,
-0x57, 0x00, 0xDB, 0x90, 0x58, 0x15, 0xA8, 0x80, 0x58, 0xE0, 0xBD, 0x90, 0x59, 0xF5, 0x8A, 0x80,
-0x5A, 0xC0, 0x9F, 0x90, 0x5B, 0xD5, 0x6C, 0x80, 0x5C, 0xA9, 0xBC, 0x10, 0x5D, 0xB5, 0x4E, 0x80,
-0x5E, 0x89, 0x9E, 0x10, 0x5F, 0x95, 0x30, 0x80, 0x60, 0x69, 0x80, 0x10, 0x61, 0x7E, 0x4D, 0x00,
-0x62, 0x49, 0x62, 0x10, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D,
-0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF,
-0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
-0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54,
-0x00, 0x50, 0x53, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x12, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xB6, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x74, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x47, 0x24, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x91, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x49, 0x04, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x73, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x4A, 0xE4, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x55, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x4C, 0xCD, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x37, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x4E, 0xAD, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x19, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x50, 0x8C, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x35, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x52, 0x6C, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x17, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x4C, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20, 0xF9, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x56, 0x2C, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00, 0xDB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x58, 0x15, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0, 0xBD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x59, 0xF5, 0x8A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0, 0x9F, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x5B, 0xD5, 0x6C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9, 0xBC, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x5D, 0xB5, 0x4E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x9E, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x5F, 0x95, 0x30, 0x80, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x80, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x61, 0x7E, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x62, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05, 0x04,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xA5, 0xB6, 0xE8, 0x70,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
+0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80,
+0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80,
+0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00,
+0x3A, 0xF5, 0x12, 0x90, 0x3B, 0xB6, 0xD1, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00,
+0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80,
+0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80, 0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80,
+0x46, 0x0F, 0x74, 0x90, 0x47, 0x24, 0x41, 0x80, 0x47, 0xF8, 0x91, 0x10, 0x49, 0x04, 0x23, 0x80,
+0x49, 0xD8, 0x73, 0x10, 0x4A, 0xE4, 0x05, 0x80, 0x4B, 0xB8, 0x55, 0x10, 0x4C, 0xCD, 0x22, 0x00,
+0x4D, 0x98, 0x37, 0x10, 0x4E, 0xAD, 0x04, 0x00, 0x4F, 0x78, 0x19, 0x10, 0x50, 0x8C, 0xE6, 0x00,
+0x51, 0x61, 0x35, 0x90, 0x52, 0x6C, 0xC8, 0x00, 0x53, 0x41, 0x17, 0x90, 0x54, 0x4C, 0xAA, 0x00,
+0x55, 0x20, 0xF9, 0x90, 0x56, 0x2C, 0x8C, 0x00, 0x57, 0x00, 0xDB, 0x90, 0x58, 0x15, 0xA8, 0x80,
+0x58, 0xE0, 0xBD, 0x90, 0x59, 0xF5, 0x8A, 0x80, 0x5A, 0xC0, 0x9F, 0x90, 0x5B, 0xD5, 0x6C, 0x80,
+0x5C, 0xA9, 0xBC, 0x10, 0x5D, 0xB5, 0x4E, 0x80, 0x5E, 0x89, 0x9E, 0x10, 0x5F, 0x95, 0x30, 0x80,
+0x60, 0x69, 0x80, 0x10, 0x61, 0x7E, 0x4D, 0x00, 0x62, 0x49, 0x62, 0x10, 0x63, 0x5E, 0x2F, 0x00,
+0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x9C,
+0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF,
+0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D,
+0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B,
+0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D,
+0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86,
+0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x12,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x74,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x91,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x73,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x55,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x37,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAD, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x19,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x35,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x17,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20, 0xF9,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00, 0xDB,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0, 0xBD,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x8A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0, 0x9F,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x6C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9, 0xBC,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x4E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x9E,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x95, 0x30, 0x80, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x80,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7E, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x62,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
-0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00,
-0x50, 0x53, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0xAC, 0xC1, 0x42, 0x00, 0x70, 0x47, 0x7D,
-0x00, 0x00, 0x00, 0x32, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72,
-0x6E, 0x69, 0x61, 0x20, 0x53, 0x75, 0x72, 0x2C, 0x20, 0x4E, 0x61, 0x79, 0x61, 0x72, 0x69, 0x74,
-0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 0x2C, 0x20, 0x53,
-0x69, 0x6E, 0x61, 0x6C, 0x6F, 0x61, 
+0x9D, 0x90, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
+0x4D, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x4D,
+0x53, 0x54, 0x37, 0x0A, 0x00, 0xAC, 0xC1, 0x42, 0x00, 0x70, 0x47, 0x7D, 0x00, 0x00, 0x00, 0x32,
+0x42, 0x61, 0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E, 0x69, 0x61, 0x20,
+0x53, 0x75, 0x72, 0x2C, 0x20, 0x4E, 0x61, 0x79, 0x61, 0x72, 0x69, 0x74, 0x20, 0x28, 0x6D, 0x6F,
+0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 0x2C, 0x20, 0x53, 0x69, 0x6E, 0x61, 0x6C,
+0x6F, 0x61, 
 
 /* America/Mendoza */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -34826,7 +35102,7 @@
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xA5, 0xB6, 0xDA, 0x60,
-0x16, 0x86, 0xD5, 0x60, 0x18, 0x4C, 0x4B, 0x50, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70,
+0x16, 0x8A, 0xE6, 0x00, 0x18, 0x24, 0xDA, 0x70, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70,
 0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x3A, 0x00, 0x36, 0x32, 0xCC, 0x70,
 0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0,
 0x3A, 0xF5, 0x04, 0x80, 0x3B, 0xB6, 0xC2, 0xF0, 0x3C, 0xAF, 0xFC, 0x80, 0x3D, 0xBB, 0x8E, 0xF0,
@@ -34850,8 +35126,8 @@
 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF,
-0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16, 0x86, 0xD5, 0x60, 0x00, 0x00, 0x00,
-0x00, 0x18, 0x4C, 0x4B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00,
+0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16, 0x8A, 0xE6, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x18, 0x24, 0xDA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00,
@@ -34987,7 +35263,7 @@
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
 0xB8, 0xFD, 0x86, 0xF0, 0xC5, 0xDE, 0xB0, 0x60, 0xC6, 0x97, 0x34, 0x50, 0xC9, 0x55, 0xF1, 0xE0,
 0xC9, 0xEA, 0xDD, 0x50, 0xCF, 0x02, 0xC6, 0xE0, 0xCF, 0xB7, 0x56, 0x50, 0xDA, 0x99, 0x15, 0xE0,
 0xDB, 0x76, 0x83, 0xD0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00,
@@ -35017,8 +35293,8 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x08,
 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
-0xAF, 0xF2, 0x6E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
-0xB7, 0x43, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
+0xAF, 0xF1, 0x2B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB7, 0x41, 0x3D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
 0xB8, 0xFD, 0x86, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0xDE, 0xB0, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
 0xC6, 0x97, 0x34, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x55, 0xF1, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
 0xC9, 0xEA, 0xDD, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x02, 0xC6, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -35375,71 +35651,79 @@
 
 /* America/Monterrey */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0C, 0xA5, 0xB6, 0xDA, 0x60,
-0x22, 0x55, 0xF1, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70,
-0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x3A, 0x00, 0x36, 0x32, 0xCC, 0x70,
-0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0,
-0x3A, 0xF5, 0x04, 0x80, 0x3B, 0xB6, 0xC2, 0xF0, 0x3C, 0xAF, 0xFC, 0x80, 0x3D, 0xBB, 0x8E, 0xF0,
-0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0, 0x40, 0x6F, 0xC0, 0x80, 0x41, 0x84, 0x8D, 0x70,
-0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70, 0x44, 0x2F, 0x84, 0x80, 0x45, 0x44, 0x51, 0x70,
-0x46, 0x0F, 0x66, 0x80, 0x47, 0x24, 0x33, 0x70, 0x47, 0xF8, 0x83, 0x00, 0x49, 0x04, 0x15, 0x70,
-0x49, 0xD8, 0x65, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x4B, 0xB8, 0x47, 0x00, 0x4C, 0xCD, 0x13, 0xF0,
-0x4D, 0x98, 0x29, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x4F, 0x78, 0x0B, 0x00, 0x50, 0x8C, 0xD7, 0xF0,
-0x51, 0x61, 0x27, 0x80, 0x52, 0x6C, 0xB9, 0xF0, 0x53, 0x41, 0x09, 0x80, 0x54, 0x4C, 0x9B, 0xF0,
-0x55, 0x20, 0xEB, 0x80, 0x56, 0x2C, 0x7D, 0xF0, 0x57, 0x00, 0xCD, 0x80, 0x58, 0x15, 0x9A, 0x70,
-0x58, 0xE0, 0xAF, 0x80, 0x59, 0xF5, 0x7C, 0x70, 0x5A, 0xC0, 0x91, 0x80, 0x5B, 0xD5, 0x5E, 0x70,
-0x5C, 0xA9, 0xAE, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x5E, 0x89, 0x90, 0x00, 0x5F, 0x95, 0x22, 0x70,
-0x60, 0x69, 0x72, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x62, 0x49, 0x54, 0x00, 0x63, 0x5E, 0x20, 0xF0,
-0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0xFF, 0xFF, 0xA1, 0xF4, 0x00, 0x00, 0xFF,
-0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x00,
-0x04, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-0x0C, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xDA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xF1,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x3A,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x04,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x66,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x33, 0x70, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x83,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x15, 0x70, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x65,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x47,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x29,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x0B,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x27,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x09,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20, 0xEB,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x7D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00, 0xCD,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x9A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0, 0xAF,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x7C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0, 0x91,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x5E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9, 0xAE,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x95, 0x22, 0x70, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x72,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0xFF, 0xFF, 0xA1, 0xF4, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF,
-0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53,
-0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x0A, 0x43,
-0x53, 0x54, 0x36, 0x0A, 0x00, 0xB0, 0x7E, 0x4A, 0x00, 0x79, 0x96, 0x4D, 0x00, 0x00, 0x00, 0x36,
-0x44, 0x75, 0x72, 0x61, 0x6E, 0x67, 0x6F, 0x3B, 0x20, 0x43, 0x6F, 0x61, 0x68, 0x75, 0x69, 0x6C,
-0x61, 0x2C, 0x20, 0x4E, 0x75, 0x65, 0x76, 0x6F, 0x20, 0x4C, 0x65, 0x6F, 0x6E, 0x2C, 0x20, 0x54,
-0x61, 0x6D, 0x61, 0x75, 0x6C, 0x69, 0x70, 0x61, 0x73, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20,
-0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xDA, 0x60,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
+0xB8, 0xFD, 0x86, 0xF0, 0x22, 0x55, 0xF1, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x31, 0x67, 0x76, 0x00,
+0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x3A, 0x00,
+0x36, 0x32, 0xCC, 0x70, 0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x38, 0xE6, 0xFE, 0x00,
+0x39, 0xFB, 0xCA, 0xF0, 0x3A, 0xF5, 0x04, 0x80, 0x3B, 0xB6, 0xC2, 0xF0, 0x3C, 0xAF, 0xFC, 0x80,
+0x3D, 0xBB, 0x8E, 0xF0, 0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0, 0x40, 0x6F, 0xC0, 0x80,
+0x41, 0x84, 0x8D, 0x70, 0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70, 0x44, 0x2F, 0x84, 0x80,
+0x45, 0x44, 0x51, 0x70, 0x46, 0x0F, 0x66, 0x80, 0x47, 0x24, 0x33, 0x70, 0x47, 0xF8, 0x83, 0x00,
+0x49, 0x04, 0x15, 0x70, 0x49, 0xD8, 0x65, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x4B, 0xB8, 0x47, 0x00,
+0x4C, 0xCD, 0x13, 0xF0, 0x4D, 0x98, 0x29, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x4F, 0x78, 0x0B, 0x00,
+0x50, 0x8C, 0xD7, 0xF0, 0x51, 0x61, 0x27, 0x80, 0x52, 0x6C, 0xB9, 0xF0, 0x53, 0x41, 0x09, 0x80,
+0x54, 0x4C, 0x9B, 0xF0, 0x55, 0x20, 0xEB, 0x80, 0x56, 0x2C, 0x7D, 0xF0, 0x57, 0x00, 0xCD, 0x80,
+0x58, 0x15, 0x9A, 0x70, 0x58, 0xE0, 0xAF, 0x80, 0x59, 0xF5, 0x7C, 0x70, 0x5A, 0xC0, 0x91, 0x80,
+0x5B, 0xD5, 0x5E, 0x70, 0x5C, 0xA9, 0xAE, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x5E, 0x89, 0x90, 0x00,
+0x5F, 0x95, 0x22, 0x70, 0x60, 0x69, 0x72, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x62, 0x49, 0x54, 0x00,
+0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0xFF, 0xFF, 0xA1, 0xF4, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF,
+0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
+0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00,
+0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A,
+0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x3E, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6,
+0xDA, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66,
+0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C,
+0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55,
+0xF1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67,
+0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47,
+0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27,
+0x3A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07,
+0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6,
+0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5,
+0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF,
+0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F,
+0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F,
+0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F,
+0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F,
+0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F,
+0x66, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x33, 0x70, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8,
+0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x15, 0x70, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8,
+0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xF7, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8,
+0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x13, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98,
+0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xF5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78,
+0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xD7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61,
+0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xB9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41,
+0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x9B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20,
+0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x7D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00,
+0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x9A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0,
+0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x7C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0,
+0x91, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x5E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9,
+0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x40, 0x70, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x95, 0x22, 0x70, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69,
+0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7E, 0x3E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5E, 0x20, 0xF0, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0xFF, 0xFF, 0xA1, 0xF4, 0x00, 0x00, 0xFF, 0xFF,
+0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C,
+0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0,
+0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44,
+0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xB0, 0x7E, 0x4A, 0x00, 0x79,
+0x96, 0x4D, 0x00, 0x00, 0x00, 0x36, 0x44, 0x75, 0x72, 0x61, 0x6E, 0x67, 0x6F, 0x3B, 0x20, 0x43,
+0x6F, 0x61, 0x68, 0x75, 0x69, 0x6C, 0x61, 0x2C, 0x20, 0x4E, 0x75, 0x65, 0x76, 0x6F, 0x20, 0x4C,
+0x65, 0x6F, 0x6E, 0x2C, 0x20, 0x54, 0x61, 0x6D, 0x61, 0x75, 0x6C, 0x69, 0x70, 0x61, 0x73, 0x20,
+0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
 
 /* America/Montevideo */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -37164,7 +37448,7 @@
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
 0xB8, 0xFD, 0x86, 0xF0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00,
 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10,
 0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xF5, 0x12, 0x90,
@@ -37200,8 +37484,8 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0x00, 0x00,
 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF,
-0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF,
-0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF,
+0xFF, 0xFF, 0xAF, 0xF1, 0x2B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB7, 0x41, 0x3D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF,
 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00,
@@ -38471,45 +38755,46 @@
 /* America/Santa_Isabel */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
-0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF2, 0x7C, 0xF0, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
-0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x99, 0xBA, 0x70,
-0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90,
-0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90, 0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10,
-0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10, 0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10,
-0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10, 0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10,
-0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10, 0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10,
-0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10, 0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10,
-0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10, 0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10,
-0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90, 0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90,
-0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90, 0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90,
-0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90, 0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90,
-0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10, 0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10,
-0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10, 0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10,
-0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10, 0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90,
-0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90, 0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90,
-0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90, 0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90,
-0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90, 0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10,
-0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10, 0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10,
-0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10, 0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10,
-0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90, 0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90,
-0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90, 0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90,
-0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90, 0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90,
-0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90, 0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90,
-0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90, 0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90,
-0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90, 0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90,
-0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10, 0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10,
-0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10, 0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10,
-0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10, 0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90,
-0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90, 0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90,
-0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90, 0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90,
-0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90, 0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10,
-0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10, 0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10,
-0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10, 0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10,
-0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90, 0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90,
-0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90, 0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90,
-0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90, 0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90,
-0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x00, 0x00, 0x00, 0x9B, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
+0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF1, 0x39, 0x80, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
+0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x9D, 0xAE, 0xF0,
+0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xDB, 0x00, 0x07, 0x00, 0xDB, 0xC0, 0x73, 0xF0,
+0xDC, 0xDE, 0xB3, 0xA0, 0xDD, 0xA9, 0xAC, 0x90, 0xDE, 0xBE, 0x95, 0xA0, 0xDF, 0x89, 0x8E, 0x90,
+0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90, 0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90,
+0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10, 0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10,
+0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10, 0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10,
+0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10, 0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10,
+0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10, 0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10,
+0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10, 0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10,
+0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10, 0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90,
+0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90, 0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90,
+0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90, 0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90,
+0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90, 0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10,
+0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10, 0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10,
+0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10, 0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10,
+0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90, 0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90,
+0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90, 0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90,
+0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90, 0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90,
+0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10, 0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10,
+0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10, 0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10,
+0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10, 0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90,
+0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90, 0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90,
+0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90, 0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90,
+0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90, 0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90,
+0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90, 0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90,
+0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90, 0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90,
+0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90, 0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10,
+0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10, 0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10,
+0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10, 0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10,
+0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90, 0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90,
+0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90, 0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90,
+0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90, 0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90,
+0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10, 0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10,
+0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10, 0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10,
+0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10, 0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90,
+0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90, 0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90,
+0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90, 0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90,
+0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
@@ -38518,90 +38803,94 @@
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
-0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D,
-0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF,
-0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54,
-0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D,
-0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A,
-0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F,
+0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50,
+0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A, 0x90, 0x01,
+0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
@@ -38610,15 +38899,15 @@
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
-0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF,
-0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14,
-0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53,
-0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x50,
-0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00,
+0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90,
+0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF,
+0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53,
+0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50,
+0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
+0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Santarem */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -40072,45 +40361,46 @@
 /* America/Tijuana */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
-0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF2, 0x7C, 0xF0, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
-0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x99, 0xBA, 0x70,
-0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90,
-0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90, 0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10,
-0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10, 0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10,
-0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10, 0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10,
-0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10, 0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10,
-0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10, 0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10,
-0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10, 0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10,
-0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90, 0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90,
-0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90, 0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90,
-0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90, 0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90,
-0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10, 0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10,
-0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10, 0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10,
-0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10, 0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90,
-0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90, 0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90,
-0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90, 0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90,
-0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90, 0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10,
-0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10, 0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10,
-0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10, 0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10,
-0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90, 0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90,
-0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90, 0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90,
-0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90, 0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90,
-0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90, 0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90,
-0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90, 0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90,
-0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90, 0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90,
-0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10, 0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10,
-0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10, 0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10,
-0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10, 0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90,
-0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90, 0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90,
-0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90, 0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90,
-0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90, 0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10,
-0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10, 0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10,
-0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10, 0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10,
-0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90, 0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90,
-0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90, 0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90,
-0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90, 0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90,
-0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x00, 0x00, 0x00, 0x9B, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
+0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF1, 0x39, 0x80, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
+0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x9D, 0xAE, 0xF0,
+0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xDB, 0x00, 0x07, 0x00, 0xDB, 0xC0, 0x73, 0xF0,
+0xDC, 0xDE, 0xB3, 0xA0, 0xDD, 0xA9, 0xAC, 0x90, 0xDE, 0xBE, 0x95, 0xA0, 0xDF, 0x89, 0x8E, 0x90,
+0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90, 0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90,
+0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10, 0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10,
+0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10, 0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10,
+0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10, 0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10,
+0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10, 0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10,
+0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10, 0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10,
+0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10, 0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90,
+0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90, 0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90,
+0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90, 0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90,
+0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90, 0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10,
+0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10, 0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10,
+0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10, 0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10,
+0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90, 0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90,
+0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90, 0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90,
+0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90, 0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90,
+0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10, 0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10,
+0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10, 0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10,
+0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10, 0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90,
+0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90, 0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90,
+0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90, 0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90,
+0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90, 0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90,
+0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90, 0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90,
+0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90, 0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90,
+0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90, 0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10,
+0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10, 0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10,
+0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10, 0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10,
+0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90, 0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90,
+0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90, 0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90,
+0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90, 0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90,
+0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10, 0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10,
+0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10, 0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10,
+0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10, 0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90,
+0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90, 0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90,
+0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90, 0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90,
+0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
@@ -40119,90 +40409,94 @@
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
-0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D,
-0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF,
-0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54,
-0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D,
-0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A,
-0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F,
+0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50,
+0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A, 0x90, 0x01,
+0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
@@ -40211,16 +40505,16 @@
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
-0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF,
-0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14,
-0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53,
-0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x50,
-0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xBA, 0xF8, 0x95, 0x00, 0x60, 0x1A, 0xDD, 0x00, 0x00,
-0x00, 0x0F, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E, 0x69,
-0x61, 
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00,
+0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90,
+0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF,
+0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53,
+0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50,
+0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
+0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xBA, 0xF8, 0x95, 0x00, 0x60,
+0x1A, 0xDD, 0x00, 0x00, 0x00, 0x0F, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66,
+0x6F, 0x72, 0x6E, 0x69, 0x61, 
 
 /* America/Toronto */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -43223,67 +43517,62 @@
 0x79, 0x6B, 0x61, 0x6C, 0x73, 0x6B, 0x79, 
 
 /* Asia/Choibalsan */
-0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0x86, 0xD3, 0xE7, 0x28,
-0x0F, 0x0B, 0xDC, 0x90, 0x18, 0xE9, 0xC8, 0x80, 0x19, 0xDA, 0xEE, 0xE0, 0x1A, 0xCC, 0x3F, 0x70,
-0x1B, 0xBC, 0x22, 0x60, 0x1C, 0xAC, 0x21, 0x70, 0x1D, 0x9C, 0x04, 0x60, 0x1E, 0x8C, 0x03, 0x70,
-0x1F, 0x7B, 0xE6, 0x60, 0x20, 0x6B, 0xE5, 0x70, 0x21, 0x5B, 0xC8, 0x60, 0x22, 0x4B, 0xC7, 0x70,
-0x23, 0x3B, 0xAA, 0x60, 0x24, 0x2B, 0xA9, 0x70, 0x25, 0x1B, 0x8C, 0x60, 0x26, 0x0B, 0x8B, 0x70,
-0x27, 0x04, 0xA8, 0xE0, 0x27, 0xF4, 0xA7, 0xF0, 0x28, 0xE4, 0x8A, 0xE0, 0x29, 0xD4, 0x89, 0xF0,
-0x2A, 0xC4, 0x6C, 0xE0, 0x2B, 0xB4, 0x6B, 0xF0, 0x2C, 0xA4, 0x4E, 0xE0, 0x2D, 0x94, 0x4D, 0xF0,
-0x2E, 0x84, 0x30, 0xE0, 0x2F, 0x74, 0x2F, 0xF0, 0x30, 0x64, 0x12, 0xE0, 0x31, 0x5D, 0x4C, 0x70,
-0x32, 0x4D, 0x2F, 0x60, 0x33, 0x3D, 0x2E, 0x70, 0x34, 0x2D, 0x11, 0x60, 0x35, 0x1D, 0x10, 0x70,
-0x36, 0x0C, 0xF3, 0x60, 0x3A, 0xE9, 0xA5, 0x90, 0x3B, 0xB4, 0x9E, 0x80, 0x3C, 0xA4, 0x9D, 0x90,
-0x3D, 0x94, 0x80, 0x80, 0x3E, 0x84, 0x7F, 0x90, 0x3F, 0x74, 0x62, 0x80, 0x40, 0x64, 0x61, 0x90,
-0x41, 0x54, 0x44, 0x80, 0x42, 0x44, 0x43, 0x90, 0x43, 0x34, 0x26, 0x80, 0x44, 0x24, 0x25, 0x90,
-0x45, 0x1D, 0x43, 0x00, 0x47, 0xEF, 0xAA, 0xF0, 0x55, 0x15, 0x9A, 0xA0, 0x56, 0x05, 0x61, 0x70,
-0x56, 0xF5, 0x7C, 0xA0, 0x57, 0xE5, 0x43, 0x70, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x02, 0x05, 0x02, 0x05, 0x02, 0x00, 0x00, 0x6B, 0x58, 0x00,
-0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x00, 0x00, 0x7E,
-0x90, 0x00, 0x0C, 0x00, 0x00, 0x8C, 0xA0, 0x01, 0x10, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x0C, 0x00,
-0x00, 0x70, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x37, 0x00, 0x2B, 0x30, 0x38,
-0x00, 0x2B, 0x30, 0x39, 0x00, 0x2B, 0x31, 0x30, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x86, 0xD3, 0xEE, 0x4C,
+0x0F, 0x0B, 0xDC, 0x90, 0x18, 0xE9, 0xC8, 0x80, 0x19, 0xDA, 0xFC, 0xF0, 0x1A, 0xCC, 0x4D, 0x80,
+0x1B, 0xBC, 0x30, 0x70, 0x1C, 0xAC, 0x2F, 0x80, 0x1D, 0x9C, 0x12, 0x70, 0x1E, 0x8C, 0x11, 0x80,
+0x1F, 0x7B, 0xF4, 0x70, 0x20, 0x6B, 0xF3, 0x80, 0x21, 0x5B, 0xD6, 0x70, 0x22, 0x4B, 0xD5, 0x80,
+0x23, 0x3B, 0xB8, 0x70, 0x24, 0x2B, 0xB7, 0x80, 0x25, 0x1B, 0x9A, 0x70, 0x26, 0x0B, 0x99, 0x80,
+0x27, 0x04, 0xB6, 0xF0, 0x27, 0xF4, 0xB6, 0x00, 0x28, 0xE4, 0x98, 0xF0, 0x29, 0xD4, 0x98, 0x00,
+0x2A, 0xC4, 0x7A, 0xF0, 0x2B, 0xB4, 0x7A, 0x00, 0x2C, 0xA4, 0x5C, 0xF0, 0x2D, 0x94, 0x5C, 0x00,
+0x2E, 0x84, 0x3E, 0xF0, 0x2F, 0x74, 0x3E, 0x00, 0x30, 0x64, 0x20, 0xF0, 0x31, 0x5D, 0x5A, 0x80,
+0x32, 0x4D, 0x3D, 0x70, 0x33, 0x3D, 0x3C, 0x80, 0x34, 0x2D, 0x1F, 0x70, 0x35, 0x1D, 0x1E, 0x80,
+0x36, 0x0D, 0x01, 0x70, 0x3A, 0xE9, 0xB3, 0xA0, 0x3B, 0xB4, 0xAC, 0x90, 0x3C, 0xA4, 0xAB, 0xA0,
+0x3D, 0x94, 0x8E, 0x90, 0x3E, 0x84, 0x8D, 0xA0, 0x3F, 0x74, 0x70, 0x90, 0x40, 0x64, 0x6F, 0xA0,
+0x41, 0x54, 0x52, 0x90, 0x42, 0x44, 0x51, 0xA0, 0x43, 0x34, 0x34, 0x90, 0x44, 0x24, 0x33, 0xA0,
+0x45, 0x1D, 0x51, 0x10, 0x55, 0x15, 0x9A, 0xA0, 0x56, 0x05, 0x61, 0x70, 0x56, 0xF5, 0x7C, 0xA0,
+0x57, 0xE5, 0x43, 0x70, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x64, 0x34, 0x00, 0x00, 0x00, 0x00, 0x62, 0x70,
+0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x0C, 0x4C, 0x4D,
+0x54, 0x00, 0x2B, 0x30, 0x37, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x54, 0x5A,
+0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00,
-0x07, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0x86, 0xD3, 0xE7, 0x28, 0x00, 0x00, 0x00,
-0x00, 0x0F, 0x0B, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE9, 0xC8, 0x80, 0x00, 0x00, 0x00,
-0x00, 0x19, 0xDA, 0xEE, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xCC, 0x3F, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x1B, 0xBC, 0x22, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0x21, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x1D, 0x9C, 0x04, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x03, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x1F, 0x7B, 0xE6, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6B, 0xE5, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x21, 0x5B, 0xC8, 0x60, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4B, 0xC7, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x23, 0x3B, 0xAA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2B, 0xA9, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x25, 0x1B, 0x8C, 0x60, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0B, 0x8B, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x27, 0x04, 0xA8, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF4, 0xA7, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x28, 0xE4, 0x8A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD4, 0x89, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x2A, 0xC4, 0x6C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0x6B, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x2C, 0xA4, 0x4E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0x4D, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x2E, 0x84, 0x30, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0x2F, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x30, 0x64, 0x12, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0x4C, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x32, 0x4D, 0x2F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0x2E, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x34, 0x2D, 0x11, 0x60, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x10, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x36, 0x0C, 0xF3, 0x60, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xE9, 0xA5, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3B, 0xB4, 0x9E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA4, 0x9D, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3D, 0x94, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x84, 0x7F, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3F, 0x74, 0x62, 0x80, 0x00, 0x00, 0x00, 0x00, 0x40, 0x64, 0x61, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x41, 0x54, 0x44, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x44, 0x43, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x43, 0x34, 0x26, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x24, 0x25, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x45, 0x1D, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEF, 0xAA, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x55, 0x15, 0x9A, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x05, 0x61, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x56, 0xF5, 0x7C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x57, 0xE5, 0x43, 0x70, 0x01, 0x02, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x02, 0x05, 0x02, 0x05, 0x02,
-0x00, 0x00, 0x6B, 0x58, 0x00, 0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x00, 0x00, 0x70, 0x80,
-0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0C, 0x00, 0x00, 0x8C, 0xA0, 0x01, 0x10, 0x00, 0x00,
-0x7E, 0x90, 0x01, 0x0C, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30,
-0x37, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x2B, 0x31, 0x30, 0x00, 0x0A, 0x3C,
-0x2B, 0x30, 0x38, 0x3E, 0x2D, 0x38, 0x0A, 0x00, 0xD2, 0xAC, 0x4A, 0x01, 0xC1, 0x5F, 0x10, 0x00,
-0x00, 0x00, 0x12, 0x44, 0x6F, 0x72, 0x6E, 0x6F, 0x64, 0x2C, 0x20, 0x53, 0x75, 0x6B, 0x68, 0x62,
-0x61, 0x61, 0x74, 0x61, 0x72, 
+0x00, 0x32, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x86, 0xD3,
+0xEE, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0B, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE9,
+0xC8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0xDA, 0xFC, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xCC,
+0x4D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0x30, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC,
+0x2F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x12, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C,
+0x11, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7B, 0xF4, 0x70, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6B,
+0xF3, 0x80, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5B, 0xD6, 0x70, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4B,
+0xD5, 0x80, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3B, 0xB8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2B,
+0xB7, 0x80, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1B, 0x9A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0B,
+0x99, 0x80, 0x00, 0x00, 0x00, 0x00, 0x27, 0x04, 0xB6, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF4,
+0xB6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE4, 0x98, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD4,
+0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC4, 0x7A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4,
+0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0x5C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94,
+0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0x3E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74,
+0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0x20, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D,
+0x5A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x32, 0x4D, 0x3D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D,
+0x3C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x34, 0x2D, 0x1F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D,
+0x1E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x36, 0x0D, 0x01, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xE9,
+0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB4, 0xAC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA4,
+0xAB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x94, 0x8E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x84,
+0x8D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x74, 0x70, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x64,
+0x6F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x54, 0x52, 0x90, 0x00, 0x00, 0x00, 0x00, 0x42, 0x44,
+0x51, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x34, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x44, 0x24,
+0x33, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x1D, 0x51, 0x10, 0x00, 0x00, 0x00, 0x00, 0x55, 0x15,
+0x9A, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x05, 0x61, 0x70, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF5,
+0x7C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x57, 0xE5, 0x43, 0x70, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x64, 0x34,
+0x00, 0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x08, 0x00, 0x00,
+0x70, 0x80, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x37, 0x00, 0x2B, 0x30, 0x39, 0x00,
+0x2B, 0x30, 0x38, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x38, 0x3E, 0x2D, 0x38, 0x0A, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Asia/Chongqing */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -43555,20 +43844,22 @@
 
 /* Asia/Dili */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x54, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x92, 0xE6, 0x18, 0xC4,
-0xCB, 0x99, 0x32, 0xF0, 0x0B, 0xEA, 0x30, 0x70, 0x39, 0xC3, 0x99, 0x00, 0x01, 0x02, 0x01, 0x02,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0C, 0x92, 0xE6, 0x1E, 0x00,
+0xCB, 0x99, 0x32, 0xF0, 0x0B, 0xEA, 0x30, 0x70, 0x39, 0xC3, 0x99, 0x00, 0x01, 0x02, 0x03, 0x02,
 0x00, 0x00, 0x75, 0xBC, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90,
-0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x54, 0x5A,
-0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6,
-0x18, 0xC4, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x99, 0x32, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xEA,
-0x30, 0x70, 0x00, 0x00, 0x00, 0x00, 0x39, 0xC3, 0x99, 0x00, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00,
-0x75, 0xBC, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x08,
-0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x0A, 0x3C, 0x2B, 0x30,
-0x39, 0x3E, 0x2D, 0x39, 0x0A, 0x00, 0x7C, 0x48, 0x68, 0x01, 0xD2, 0x48, 0x7D, 0x00, 0x00, 0x00,
-0x00, 
+0x00, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x08, 0x4C, 0x4D,
+0x54, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0C,
+0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x1E, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x99, 0x32, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x0B, 0xEA, 0x30, 0x70, 0x00, 0x00, 0x00, 0x00, 0x39, 0xC3, 0x99, 0x00,
+0x01, 0x02, 0x03, 0x02, 0x00, 0x00, 0x75, 0xBC, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04,
+0x00, 0x00, 0x7E, 0x90, 0x00, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90,
+0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x00, 0x01,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x39, 0x3E, 0x2D, 0x39,
+0x0A, 0x00, 0x7C, 0x48, 0x68, 0x01, 0xD2, 0x48, 0x7D, 0x00, 0x00, 0x00, 0x00, 
 
 /* Asia/Dubai */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x41, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -44441,10 +44732,8 @@
 0x00, 0x00, 0x00, 0x00, 0x54, 0x60, 0x00, 0x04, 0x00, 0x00, 0x70, 0x80, 0x01, 0x08, 0x00, 0x00,
 0x62, 0x70, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x36, 0x00, 0x2B, 0x30, 0x38, 0x00,
 0x2B, 0x30, 0x37, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x37, 0x3E, 0x2D, 0x37, 0x0A, 0x00, 0xD2, 0x98,
-0xC2, 0x01, 0x9E, 0x81, 0x47, 0x00, 0x00, 0x00, 0x2B, 0x42, 0x61, 0x79, 0x61, 0x6E, 0x2D, 0x4F,
-0x6C, 0x67, 0x69, 0x79, 0x2C, 0x20, 0x47, 0x6F, 0x76, 0x69, 0x2D, 0x41, 0x6C, 0x74, 0x61, 0x69,
-0x2C, 0x20, 0x48, 0x6F, 0x76, 0x64, 0x2C, 0x20, 0x55, 0x76, 0x73, 0x2C, 0x20, 0x5A, 0x61, 0x76,
-0x6B, 0x68, 0x61, 0x6E, 
+0xC2, 0x01, 0x9E, 0x81, 0x47, 0x00, 0x00, 0x00, 0x16, 0x42, 0x61, 0x79, 0x61, 0x6E, 0x2D, 0x4F,
+0x6C, 0x67, 0x69, 0x69, 0x2C, 0x20, 0x48, 0x6F, 0x76, 0x64, 0x2C, 0x20, 0x55, 0x76, 0x73, 
 
 /* Asia/Irkutsk */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -47703,19 +47992,19 @@
 
 /* Atlantic/Azores */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x18, 0x80, 0x00, 0x00, 0x00,
-0x92, 0xE6, 0xAA, 0xA0, 0x9B, 0x4B, 0x89, 0x90, 0x9B, 0xFE, 0xE3, 0xA0, 0x9C, 0x9D, 0x09, 0x90,
-0x9D, 0xC9, 0x9F, 0x90, 0x9E, 0x7F, 0x8E, 0x90, 0x9F, 0xAA, 0xD3, 0x10, 0xA0, 0x5F, 0x70, 0x90,
-0xA1, 0x8C, 0x06, 0x90, 0xA2, 0x41, 0xF5, 0x90, 0xA3, 0x6E, 0x8B, 0x90, 0xA4, 0x23, 0x29, 0x10,
-0xA5, 0x4F, 0xBF, 0x10, 0xAA, 0x06, 0x0B, 0x90, 0xAA, 0xF4, 0xAB, 0x10, 0xAD, 0xC9, 0xC4, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xD8, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x1D, 0x80, 0x00, 0x00, 0x00,
+0x92, 0xE6, 0xAA, 0xA0, 0x9B, 0x4B, 0x89, 0x90, 0x9B, 0xFE, 0xE3, 0xA0, 0x9C, 0x9D, 0x17, 0xA0,
+0x9D, 0xC9, 0x9F, 0x90, 0x9E, 0x7E, 0x4B, 0x20, 0x9F, 0xAA, 0xD3, 0x10, 0xA0, 0x5F, 0x7E, 0xA0,
+0xA1, 0x8C, 0x06, 0x90, 0xA2, 0x42, 0x03, 0xA0, 0xA3, 0x6E, 0x8B, 0x90, 0xA4, 0x23, 0x37, 0x20,
+0xA5, 0x4F, 0xBF, 0x10, 0xAA, 0x06, 0x0B, 0x90, 0xAA, 0xE7, 0x7C, 0x10, 0xAD, 0xC9, 0xC4, 0x10,
 0xAE, 0xA7, 0x40, 0x10, 0xAF, 0xA0, 0x6B, 0x90, 0xB0, 0x87, 0x22, 0x10, 0xB1, 0x89, 0x88, 0x10,
 0xB2, 0x70, 0x3E, 0x90, 0xB3, 0x72, 0xA4, 0x90, 0xB4, 0x50, 0x20, 0x90, 0xB7, 0x32, 0x68, 0x90,
 0xB8, 0x0F, 0xE4, 0x90, 0xB8, 0xFF, 0xD5, 0x90, 0xB9, 0xEF, 0xC6, 0x90, 0xBC, 0xC8, 0xD4, 0x10,
 0xBD, 0xB8, 0xC5, 0x10, 0xBE, 0x9F, 0x7B, 0x90, 0xBF, 0x98, 0xA7, 0x10, 0xC0, 0x9B, 0x0D, 0x10,
 0xC1, 0x78, 0x89, 0x10, 0xC2, 0x68, 0x7A, 0x10, 0xC3, 0x58, 0x6B, 0x10, 0xC4, 0x3F, 0x21, 0x90,
 0xC5, 0x38, 0x4D, 0x10, 0xC6, 0x3A, 0xB3, 0x10, 0xC7, 0x58, 0xC8, 0x90, 0xC7, 0xD9, 0xFB, 0x90,
-0xC9, 0x01, 0x4B, 0x90, 0xC9, 0xF1, 0x3C, 0x90, 0xCA, 0xE2, 0x7F, 0x10, 0xCB, 0xB5, 0x6F, 0x10,
+0xC9, 0x03, 0xEE, 0x90, 0xC9, 0xF1, 0x3C, 0x90, 0xCA, 0xE2, 0x7F, 0x10, 0xCB, 0xB5, 0x6F, 0x10,
 0xCB, 0xEC, 0xC0, 0x00, 0xCC, 0x80, 0x68, 0x00, 0xCC, 0xDC, 0xBF, 0x10, 0xCD, 0x95, 0x51, 0x10,
 0xCD, 0xC3, 0x67, 0x80, 0xCE, 0x72, 0xBF, 0x00, 0xCE, 0xC5, 0xDB, 0x90, 0xCF, 0x75, 0x33, 0x10,
 0xCF, 0xAC, 0x84, 0x00, 0xD0, 0x52, 0xA1, 0x00, 0xD0, 0xA5, 0xBD, 0x90, 0xD1, 0x55, 0x15, 0x10,
@@ -47730,198 +48019,195 @@
 0xEE, 0x9A, 0xCD, 0x40, 0xEF, 0x8A, 0xBE, 0x40, 0xF0, 0x7A, 0xAF, 0x40, 0xF1, 0x6A, 0xA0, 0x40,
 0xF2, 0x63, 0xCB, 0xC0, 0xF3, 0x53, 0xBC, 0xC0, 0xF4, 0x43, 0xAD, 0xC0, 0xF5, 0x33, 0x9E, 0xC0,
 0xF6, 0x23, 0x8F, 0xC0, 0xF7, 0x13, 0x80, 0xC0, 0xF8, 0x03, 0x71, 0xC0, 0xF8, 0xF3, 0x62, 0xC0,
-0x0D, 0x9B, 0x29, 0x10, 0x0E, 0x8B, 0x1A, 0x10, 0x0F, 0x84, 0x45, 0x90, 0x10, 0x74, 0x36, 0x90,
-0x11, 0x64, 0x27, 0x90, 0x12, 0x54, 0x26, 0xA0, 0x13, 0x44, 0x09, 0x90, 0x14, 0x34, 0x08, 0xA0,
-0x15, 0x23, 0xF9, 0xA0, 0x16, 0x13, 0xEA, 0xA0, 0x17, 0x03, 0xDB, 0xA0, 0x17, 0xF3, 0xCC, 0xA0,
-0x18, 0xE3, 0xCB, 0xB0, 0x19, 0xD3, 0xAE, 0xA0, 0x1A, 0xC3, 0x9F, 0xA0, 0x1B, 0xBC, 0xCB, 0x20,
-0x1C, 0xAC, 0xBC, 0x20, 0x1D, 0x9C, 0xAD, 0x20, 0x1E, 0x8C, 0x9E, 0x20, 0x1F, 0x7C, 0x8F, 0x20,
-0x20, 0x6C, 0x80, 0x20, 0x21, 0x5C, 0x71, 0x20, 0x22, 0x4C, 0x62, 0x20, 0x23, 0x3C, 0x53, 0x20,
-0x24, 0x2C, 0x44, 0x20, 0x25, 0x1C, 0x35, 0x20, 0x26, 0x0C, 0x26, 0x20, 0x27, 0x05, 0x51, 0xA0,
-0x27, 0xF5, 0x42, 0xA0, 0x28, 0xE5, 0x33, 0xA0, 0x29, 0xD5, 0x24, 0xA0, 0x2A, 0xC5, 0x15, 0xA0,
-0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0xA4, 0xE9, 0x90, 0x2D, 0x94, 0xDA, 0x90, 0x2E, 0x84, 0xCB, 0x90,
-0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90, 0x31, 0x5D, 0xD9, 0x10, 0x32, 0x72, 0xB4, 0x10,
-0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10, 0x35, 0x1D, 0x9D, 0x10, 0x36, 0x32, 0x78, 0x10,
-0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90, 0x38, 0xDD, 0x61, 0x10, 0x39, 0xFB, 0x76, 0x90,
-0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90, 0x3C, 0xA6, 0x5F, 0x90, 0x3D, 0xBB, 0x3A, 0x90,
-0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90, 0x40, 0x66, 0x23, 0x90, 0x41, 0x84, 0x39, 0x10,
-0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10, 0x44, 0x25, 0xE7, 0x90, 0x45, 0x43, 0xFD, 0x10,
-0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10, 0x47, 0xEE, 0xE6, 0x10, 0x49, 0x03, 0xC1, 0x10,
-0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10, 0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90,
-0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90, 0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90,
-0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90, 0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90,
-0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90, 0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10,
-0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10, 0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10,
-0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10, 0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10,
-0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90, 0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90,
-0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90, 0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90,
-0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90, 0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90,
-0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10, 0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10,
-0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10, 0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10,
-0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90,
-0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90,
-0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90,
-0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x06, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05,
+0xF9, 0xE3, 0x53, 0xC0, 0x17, 0x03, 0xCD, 0x90, 0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xAF, 0x90,
+0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90, 0x1B, 0xBC, 0xBD, 0x10, 0x1C, 0xAC, 0xAE, 0x10,
+0x1D, 0x9C, 0x9F, 0x10, 0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10,
+0x21, 0x5C, 0x63, 0x10, 0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10,
+0x25, 0x1C, 0x27, 0x10, 0x26, 0x0C, 0x18, 0x10, 0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90,
+0x28, 0xE5, 0x25, 0x90, 0x29, 0xD5, 0x16, 0x90, 0x2A, 0xC5, 0x07, 0x90, 0x2B, 0x3D, 0x0E, 0x20,
+0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0x1F, 0xC2, 0x10, 0x2C, 0xA4, 0xE9, 0x90, 0x2D, 0x94, 0xDA, 0x90,
+0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90, 0x31, 0x5D, 0xD9, 0x10,
+0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10, 0x35, 0x1D, 0x9D, 0x10,
+0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90, 0x38, 0xDD, 0x61, 0x10,
+0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90, 0x3C, 0xA6, 0x5F, 0x90,
+0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90, 0x40, 0x66, 0x23, 0x90,
+0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10, 0x44, 0x25, 0xE7, 0x90,
+0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10, 0x47, 0xEE, 0xE6, 0x10,
+0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10, 0x4B, 0xAE, 0xAA, 0x10,
+0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90, 0x4F, 0x6E, 0x6E, 0x10,
+0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90, 0x53, 0x37, 0x6C, 0x90,
+0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90, 0x56, 0xF7, 0x30, 0x90,
+0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10, 0x5A, 0xB6, 0xF4, 0x90,
+0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10, 0x5E, 0x7F, 0xF3, 0x10,
+0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90, 0x62, 0x3F, 0xB7, 0x10,
+0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90, 0x66, 0x08, 0xB5, 0x90,
+0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90, 0x69, 0xC8, 0x79, 0x90,
+0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10, 0x6D, 0x88, 0x3D, 0x90,
+0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10, 0x71, 0x51, 0x3C, 0x10,
+0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10,
+0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10,
+0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90,
+0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x07, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
+0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05,
+0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05,
-0x04, 0x07, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x09, 0x07, 0x08, 0x07,
-0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07,
-0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x0A, 0x0B, 0x0C, 0x0B,
-0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
-0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
-0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
-0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
-0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
-0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0xFF, 0xFF, 0xE7, 0xF0, 0x00, 0x00, 0xFF, 0xFF, 0xE5,
-0x28, 0x00, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x0C, 0xFF,
-0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x0C, 0xFF, 0xFF, 0xE3, 0xE0, 0x00,
-0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0xFF, 0xFF, 0xF1,
-0xF0, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF,
-0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x31,
-0x00, 0x2D, 0x30, 0x32, 0x00, 0x2B, 0x30, 0x30, 0x00, 0x57, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00,
-0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0x0D, 0x00,
-0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x1B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x92,
-0xE6, 0xAA, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x89, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B,
-0xFE, 0xE3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9D, 0x09, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D,
-0xC9, 0x9F, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x8E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F,
-0xAA, 0xD3, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x70, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1,
-0x8C, 0x06, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xF5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3,
-0x6E, 0x8B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x29, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5,
-0x4F, 0xBF, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x06, 0x0B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA,
-0xF4, 0xAB, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xC4, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE,
-0xA7, 0x40, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x6B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0,
-0x87, 0x22, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x88, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2,
-0x70, 0x3E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0xA4, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4,
-0x50, 0x20, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x68, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8,
-0x0F, 0xE4, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xD5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9,
-0xEF, 0xC6, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xD4, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD,
-0xB8, 0xC5, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x7B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF,
-0x98, 0xA7, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9B, 0x0D, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1,
-0x78, 0x89, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x7A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3,
-0x58, 0x6B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x21, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5,
-0x38, 0x4D, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0xB3, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7,
-0x58, 0xC8, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xFB, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9,
-0x01, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x3C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA,
-0xE2, 0x7F, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x6F, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB,
-0xEC, 0xC0, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x68, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC,
-0xDC, 0xBF, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x51, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD,
-0xC3, 0x67, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xBF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE,
-0xC5, 0xDB, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x33, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF,
-0xAC, 0x84, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0xA1, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0,
-0xA5, 0xBD, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x55, 0x15, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1,
-0x8C, 0x66, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x83, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2,
-0x85, 0x9F, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xE1, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4,
-0x49, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xED, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6,
-0x29, 0xDE, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xCF, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8,
-0x09, 0xC0, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0xB1, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9,
-0xE9, 0xA2, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x93, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB,
-0xC9, 0x84, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x75, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD,
-0xB2, 0xA0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x91, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF,
-0x92, 0x82, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x73, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1,
-0x72, 0x64, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x55, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3,
-0x52, 0x46, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x37, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5,
-0x32, 0x28, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x22, 0x19, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7,
-0x1B, 0x45, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x36, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8,
-0xFB, 0x27, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEB, 0x18, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA,
-0xDB, 0x09, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xFA, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC,
-0xBA, 0xEB, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xDC, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE,
-0x9A, 0xCD, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xBE, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0,
-0x7A, 0xAF, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0xA0, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2,
-0x63, 0xCB, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xBC, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4,
-0x43, 0xAD, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x9E, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6,
-0x23, 0x8F, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x80, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8,
-0x03, 0x71, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x62, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x0D,
-0x9B, 0x29, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F,
-0x84, 0x45, 0x90, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11,
-0x64, 0x27, 0x90, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x26, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x13,
-0x44, 0x09, 0x90, 0x00, 0x00, 0x00, 0x00, 0x14, 0x34, 0x08, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x15,
-0x23, 0xF9, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xEA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x17,
-0x03, 0xDB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xCC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x18,
-0xE3, 0xCB, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xAE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1A,
-0xC3, 0x9F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xCB, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1C,
-0xAC, 0xBC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0xAD, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1E,
-0x8C, 0x9E, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x8F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x20,
-0x6C, 0x80, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x71, 0x20, 0x00, 0x00, 0x00, 0x00, 0x22,
-0x4C, 0x62, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x53, 0x20, 0x00, 0x00, 0x00, 0x00, 0x24,
-0x2C, 0x44, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x35, 0x20, 0x00, 0x00, 0x00, 0x00, 0x26,
-0x0C, 0x26, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x51, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x27,
-0xF5, 0x42, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x33, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29,
-0xD5, 0x24, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x15, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2B,
-0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D,
-0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F,
-0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31,
-0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33,
-0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35,
-0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
-0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38,
-0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A,
-0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C,
-0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E,
-0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40,
-0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42,
-0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44,
-0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46,
-0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47,
-0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
-0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B,
-0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D,
-0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F,
-0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51,
-0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53,
-0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55,
-0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56,
-0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58,
-0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A,
-0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C,
-0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E,
-0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60,
-0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62,
-0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64,
-0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66,
-0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67,
-0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69,
-0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B,
-0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D,
-0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F,
-0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71,
-0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73,
-0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75,
-0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76,
-0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78,
-0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A,
-0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C,
-0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E,
-0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x06, 0x02, 0x03, 0x04,
+0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x0C, 0x0B, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0xFF, 0xFF, 0xE7, 0xF0, 0x00, 0x00, 0xFF, 0xFF, 0xE5, 0x28, 0x00, 0x04,
+0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x0C, 0xFF, 0xFF, 0xF1, 0xF0,
+0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF,
+0xE3, 0xE0, 0x00, 0x0C, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10,
+0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x4C, 0x4D,
+0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x31, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x2B, 0x30,
+0x30, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x0F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD8, 0x00, 0x00, 0x00,
+0x0F, 0x00, 0x00, 0x00, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x1B, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0x92, 0xE6, 0xAA, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x89, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0x9B, 0xFE, 0xE3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9D, 0x17, 0xA0, 0xFF, 0xFF, 0xFF,
+0xFF, 0x9D, 0xC9, 0x9F, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x4B, 0x20, 0xFF, 0xFF, 0xFF,
+0xFF, 0x9F, 0xAA, 0xD3, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x7E, 0xA0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xA1, 0x8C, 0x06, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x42, 0x03, 0xA0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xA3, 0x6E, 0x8B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x37, 0x20, 0xFF, 0xFF, 0xFF,
+0xFF, 0xA5, 0x4F, 0xBF, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x06, 0x0B, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xAA, 0xE7, 0x7C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xC4, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xAE, 0xA7, 0x40, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x6B, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB0, 0x87, 0x22, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x88, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB2, 0x70, 0x3E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0xA4, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB4, 0x50, 0x20, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x68, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB8, 0x0F, 0xE4, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xD5, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xB9, 0xEF, 0xC6, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xD4, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xBD, 0xB8, 0xC5, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x7B, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xBF, 0x98, 0xA7, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9B, 0x0D, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xC1, 0x78, 0x89, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x7A, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xC3, 0x58, 0x6B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x21, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xC5, 0x38, 0x4D, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0xB3, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xC7, 0x58, 0xC8, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xFB, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xC9, 0x03, 0xEE, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x3C, 0x90, 0xFF, 0xFF, 0xFF,
+0xFF, 0xCA, 0xE2, 0x7F, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x6F, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xCB, 0xEC, 0xC0, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x68, 0x00, 0xFF, 0xFF, 0xFF,
+0xFF, 0xCC, 0xDC, 0xBF, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x51, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xCD, 0xC3, 0x67, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xBF, 0x00, 0xFF, 0xFF, 0xFF,
+0xFF, 0xCE, 0xC5, 0xDB, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x33, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xCF, 0xAC, 0x84, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0xA1, 0x00, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD0, 0xA5, 0xBD, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x55, 0x15, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD1, 0x8C, 0x66, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x83, 0x00, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD2, 0x85, 0x9F, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xE1, 0x10, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD4, 0x49, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xED, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD6, 0x29, 0xDE, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xCF, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD8, 0x09, 0xC0, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0xB1, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD9, 0xE9, 0xA2, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x93, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xDB, 0xC9, 0x84, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x75, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xDD, 0xB2, 0xA0, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x91, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xDF, 0x92, 0x82, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x73, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xE1, 0x72, 0x64, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x55, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xE3, 0x52, 0x46, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x37, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xE5, 0x32, 0x28, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x22, 0x19, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xE7, 0x1B, 0x45, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x36, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xE8, 0xFB, 0x27, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEB, 0x18, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xEA, 0xDB, 0x09, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xFA, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xEC, 0xBA, 0xEB, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xDC, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xEE, 0x9A, 0xCD, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xBE, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xF0, 0x7A, 0xAF, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0xA0, 0x40, 0xFF, 0xFF, 0xFF,
+0xFF, 0xF2, 0x63, 0xCB, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xBC, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xF4, 0x43, 0xAD, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x9E, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xF6, 0x23, 0x8F, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x80, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xF8, 0x03, 0x71, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x62, 0xC0, 0xFF, 0xFF, 0xFF,
+0xFF, 0xF9, 0xE3, 0x53, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0x3D, 0x0E, 0x20, 0x00, 0x00, 0x00,
+0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0x1F, 0xC2, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x07, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04,
 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
-0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04,
-0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
-0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x09,
-0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08,
-0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x0A,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0xFF, 0xFF, 0xE7, 0xF0, 0x00, 0x00,
-0xFF, 0xFF, 0xE5, 0x28, 0x00, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0,
-0x00, 0x0C, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x0C, 0xFF, 0xFF,
-0xE3, 0xE0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08,
-0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4D, 0x54, 0x00,
-0x2D, 0x30, 0x31, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x2B, 0x30, 0x30, 0x00, 0x57, 0x45, 0x54, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0A, 0x3C, 0x2D, 0x30, 0x31, 0x3E,
-0x31, 0x3C, 0x2B, 0x30, 0x30, 0x3E, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x30, 0x2C,
-0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x0A, 0x00, 0xC2, 0xE7, 0xD5, 0x00, 0xEB,
-0x7E, 0x75, 0x00, 0x00, 0x00, 0x06, 0x41, 0x7A, 0x6F, 0x72, 0x65, 0x73, 
+0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06,
+0x08, 0x06, 0x08, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09,
+0x0A, 0x0C, 0x0B, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09,
+0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09,
+0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09,
+0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09,
+0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09,
+0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0xFF, 0xFF, 0xE7,
+0xF0, 0x00, 0x00, 0xFF, 0xFF, 0xE5, 0x28, 0x00, 0x04, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF,
+0xFF, 0xE3, 0xE0, 0x00, 0x0C, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00,
+0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x0C, 0xFF, 0xFF, 0xF1,
+0xF0, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x00,
+0x00, 0x0E, 0x10, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x4D, 0x54, 0x00, 0x2D,
+0x30, 0x31, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x2B, 0x30, 0x30, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00,
+0x57, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00,
+0x01, 0x01, 0x0A, 0x3C, 0x2D, 0x30, 0x31, 0x3E, 0x31, 0x3C, 0x2B, 0x30, 0x30, 0x3E, 0x2C, 0x4D,
+0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F,
+0x31, 0x0A, 0x00, 0xC2, 0xE7, 0xD5, 0x00, 0xEB, 0x7E, 0x75, 0x00, 0x00, 0x00, 0x06, 0x41, 0x7A,
+0x6F, 0x72, 0x65, 0x73, 
 
 /* Atlantic/Bermuda */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -48602,18 +48888,18 @@
 /* Atlantic/Madeira */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1D, 0x80, 0x00, 0x00, 0x00,
-0x92, 0xE6, 0x9C, 0x90, 0x9B, 0x4B, 0x7B, 0x80, 0x9B, 0xFE, 0xD5, 0x90, 0x9C, 0x9C, 0xFB, 0x80,
-0x9D, 0xC9, 0x91, 0x80, 0x9E, 0x7F, 0x80, 0x80, 0x9F, 0xAA, 0xC5, 0x00, 0xA0, 0x5F, 0x62, 0x80,
-0xA1, 0x8B, 0xF8, 0x80, 0xA2, 0x41, 0xE7, 0x80, 0xA3, 0x6E, 0x7D, 0x80, 0xA4, 0x23, 0x1B, 0x00,
-0xA5, 0x4F, 0xB1, 0x00, 0xAA, 0x05, 0xFD, 0x80, 0xAA, 0xF4, 0x9D, 0x00, 0xAD, 0xC9, 0xB6, 0x00,
+0x00, 0x00, 0x00, 0xD6, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1D, 0x80, 0x00, 0x00, 0x00,
+0x92, 0xE6, 0x9C, 0x90, 0x9B, 0x4B, 0x7B, 0x80, 0x9B, 0xFE, 0xD5, 0x90, 0x9C, 0x9D, 0x09, 0x90,
+0x9D, 0xC9, 0x91, 0x80, 0x9E, 0x7E, 0x3D, 0x10, 0x9F, 0xAA, 0xC5, 0x00, 0xA0, 0x5F, 0x70, 0x90,
+0xA1, 0x8B, 0xF8, 0x80, 0xA2, 0x41, 0xF5, 0x90, 0xA3, 0x6E, 0x7D, 0x80, 0xA4, 0x23, 0x29, 0x10,
+0xA5, 0x4F, 0xB1, 0x00, 0xAA, 0x05, 0xFD, 0x80, 0xAA, 0xE7, 0x6E, 0x00, 0xAD, 0xC9, 0xB6, 0x00,
 0xAE, 0xA7, 0x32, 0x00, 0xAF, 0xA0, 0x5D, 0x80, 0xB0, 0x87, 0x14, 0x00, 0xB1, 0x89, 0x7A, 0x00,
 0xB2, 0x70, 0x30, 0x80, 0xB3, 0x72, 0x96, 0x80, 0xB4, 0x50, 0x12, 0x80, 0xB7, 0x32, 0x5A, 0x80,
 0xB8, 0x0F, 0xD6, 0x80, 0xB8, 0xFF, 0xC7, 0x80, 0xB9, 0xEF, 0xB8, 0x80, 0xBC, 0xC8, 0xC6, 0x00,
 0xBD, 0xB8, 0xB7, 0x00, 0xBE, 0x9F, 0x6D, 0x80, 0xBF, 0x98, 0x99, 0x00, 0xC0, 0x9A, 0xFF, 0x00,
 0xC1, 0x78, 0x7B, 0x00, 0xC2, 0x68, 0x6C, 0x00, 0xC3, 0x58, 0x5D, 0x00, 0xC4, 0x3F, 0x13, 0x80,
 0xC5, 0x38, 0x3F, 0x00, 0xC6, 0x3A, 0xA5, 0x00, 0xC7, 0x58, 0xBA, 0x80, 0xC7, 0xD9, 0xED, 0x80,
-0xC9, 0x01, 0x3D, 0x80, 0xC9, 0xF1, 0x2E, 0x80, 0xCA, 0xE2, 0x71, 0x00, 0xCB, 0xB5, 0x61, 0x00,
+0xC9, 0x03, 0xE0, 0x80, 0xC9, 0xF1, 0x2E, 0x80, 0xCA, 0xE2, 0x71, 0x00, 0xCB, 0xB5, 0x61, 0x00,
 0xCB, 0xEC, 0xB1, 0xF0, 0xCC, 0x80, 0x59, 0xF0, 0xCC, 0xDC, 0xB1, 0x00, 0xCD, 0x95, 0x43, 0x00,
 0xCD, 0xC3, 0x59, 0x70, 0xCE, 0x72, 0xB0, 0xF0, 0xCE, 0xC5, 0xCD, 0x80, 0xCF, 0x75, 0x25, 0x00,
 0xCF, 0xAC, 0x75, 0xF0, 0xD0, 0x52, 0x92, 0xF0, 0xD0, 0xA5, 0xAF, 0x80, 0xD1, 0x55, 0x07, 0x00,
@@ -48628,199 +48914,191 @@
 0xEE, 0x9A, 0xBF, 0x30, 0xEF, 0x8A, 0xB0, 0x30, 0xF0, 0x7A, 0xA1, 0x30, 0xF1, 0x6A, 0x92, 0x30,
 0xF2, 0x63, 0xBD, 0xB0, 0xF3, 0x53, 0xAE, 0xB0, 0xF4, 0x43, 0x9F, 0xB0, 0xF5, 0x33, 0x90, 0xB0,
 0xF6, 0x23, 0x81, 0xB0, 0xF7, 0x13, 0x72, 0xB0, 0xF8, 0x03, 0x63, 0xB0, 0xF8, 0xF3, 0x54, 0xB0,
-0x0D, 0x9B, 0x1B, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x10, 0x74, 0x28, 0x80,
-0x11, 0x64, 0x19, 0x80, 0x12, 0x54, 0x18, 0x90, 0x13, 0x43, 0xFB, 0x80, 0x14, 0x33, 0xFA, 0x90,
-0x15, 0x23, 0xEB, 0x90, 0x16, 0x13, 0xDC, 0x90, 0x17, 0x03, 0xCD, 0x90, 0x17, 0xF3, 0xBE, 0x90,
-0x18, 0xE3, 0xBD, 0xA0, 0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90, 0x1B, 0xBC, 0xBD, 0x10,
-0x1C, 0xAC, 0xAE, 0x10, 0x1D, 0x9C, 0x9F, 0x10, 0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10,
-0x20, 0x6C, 0x72, 0x10, 0x21, 0x5C, 0x63, 0x10, 0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10,
-0x24, 0x2C, 0x36, 0x10, 0x25, 0x1C, 0x27, 0x10, 0x26, 0x0C, 0x18, 0x10, 0x27, 0x05, 0x43, 0x90,
-0x27, 0xF5, 0x34, 0x90, 0x28, 0xE5, 0x25, 0x90, 0x29, 0xD5, 0x16, 0x90, 0x2A, 0xC5, 0x07, 0x90,
-0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0xA4, 0xE9, 0x90, 0x2D, 0x94, 0xDA, 0x90, 0x2E, 0x84, 0xCB, 0x90,
-0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90, 0x31, 0x5D, 0xD9, 0x10, 0x32, 0x72, 0xB4, 0x10,
-0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10, 0x35, 0x1D, 0x9D, 0x10, 0x36, 0x32, 0x78, 0x10,
-0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90, 0x38, 0xDD, 0x61, 0x10, 0x39, 0xFB, 0x76, 0x90,
-0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90, 0x3C, 0xA6, 0x5F, 0x90, 0x3D, 0xBB, 0x3A, 0x90,
-0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90, 0x40, 0x66, 0x23, 0x90, 0x41, 0x84, 0x39, 0x10,
-0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10, 0x44, 0x25, 0xE7, 0x90, 0x45, 0x43, 0xFD, 0x10,
-0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10, 0x47, 0xEE, 0xE6, 0x10, 0x49, 0x03, 0xC1, 0x10,
-0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10, 0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90,
-0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90, 0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90,
-0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90, 0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90,
-0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90, 0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10,
-0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10, 0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10,
-0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10, 0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10,
-0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90, 0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90,
-0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90, 0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90,
-0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90, 0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90,
-0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10, 0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10,
-0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10, 0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10,
-0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90,
-0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90,
-0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90,
-0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x06, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05,
+0xF9, 0xE3, 0x45, 0xB0, 0x17, 0x0C, 0xFA, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x18, 0xE3, 0xA1, 0x80,
+0x19, 0xD3, 0x92, 0x80, 0x1A, 0xC3, 0x83, 0x80, 0x1B, 0xBC, 0xAF, 0x00, 0x1C, 0xAC, 0xA0, 0x00,
+0x1D, 0x9C, 0x91, 0x00, 0x1E, 0x8C, 0x82, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10,
+0x21, 0x5C, 0x63, 0x10, 0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10,
+0x25, 0x1C, 0x27, 0x10, 0x26, 0x0C, 0x18, 0x10, 0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90,
+0x28, 0xE5, 0x25, 0x90, 0x29, 0xD5, 0x16, 0x90, 0x2A, 0xC5, 0x07, 0x90, 0x2B, 0xB4, 0xF8, 0x90,
+0x2C, 0xA4, 0xE9, 0x90, 0x2D, 0x94, 0xDA, 0x90, 0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90,
+0x30, 0x64, 0xAD, 0x90, 0x31, 0x5D, 0xD9, 0x10, 0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10,
+0x34, 0x52, 0x96, 0x10, 0x35, 0x1D, 0x9D, 0x10, 0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10,
+0x38, 0x1B, 0x94, 0x90, 0x38, 0xDD, 0x61, 0x10, 0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10,
+0x3B, 0xDB, 0x58, 0x90, 0x3C, 0xA6, 0x5F, 0x90, 0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90,
+0x3F, 0x9B, 0x1C, 0x90, 0x40, 0x66, 0x23, 0x90, 0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90,
+0x43, 0x64, 0x1B, 0x10, 0x44, 0x25, 0xE7, 0x90, 0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90,
+0x47, 0x23, 0xDF, 0x10, 0x47, 0xEE, 0xE6, 0x10, 0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10,
+0x4A, 0xE3, 0xA3, 0x10, 0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10,
+0x4E, 0xAC, 0xA1, 0x90, 0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90,
+0x52, 0x6C, 0x65, 0x90, 0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90,
+0x56, 0x2C, 0x29, 0x90, 0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90,
+0x59, 0xF5, 0x28, 0x10, 0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10,
+0x5D, 0xB4, 0xEC, 0x10, 0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10,
+0x61, 0x7D, 0xEA, 0x90, 0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10,
+0x65, 0x3D, 0xAE, 0x90, 0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90,
+0x68, 0xFD, 0x72, 0x90, 0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90,
+0x6C, 0xC6, 0x71, 0x10, 0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90,
+0x70, 0x86, 0x35, 0x10, 0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10,
+0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10,
+0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10,
+0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90,
+0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x07, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
+0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05,
 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05,
-0x04, 0x07, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x0A, 0x08, 0x09, 0x08,
-0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
+0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x08, 0x0A, 0x08, 0x09, 0x08, 0x09, 0x08,
+0x09, 0x08, 0x09, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
+0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
+0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
+0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
+0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
+0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B,
+0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x00,
+0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1, 0xF0,
+0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0x00, 0x00,
+0x0E, 0x10, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,
+0x00, 0x00, 0x0E, 0x10, 0x01, 0x18, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x18, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x14, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x18, 0x4C, 0x4D, 0x54, 0x00, 0x46, 0x4D, 0x54, 0x00,
+0x2B, 0x30, 0x30, 0x00, 0x2D, 0x30, 0x31, 0x00, 0x2B, 0x30, 0x31, 0x00, 0x57, 0x45, 0x54, 0x00,
+0x57, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54,
+0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0xD6, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E,
+0x3D, 0x13, 0x58, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x9C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B,
+0x4B, 0x7B, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xD5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C,
+0x9D, 0x09, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x91, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E,
+0x7E, 0x3D, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xC5, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0,
+0x5F, 0x70, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xF8, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2,
+0x41, 0xF5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x7D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4,
+0x23, 0x29, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xB1, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA,
+0x05, 0xFD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x6E, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD,
+0xC9, 0xB6, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x32, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF,
+0xA0, 0x5D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x14, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1,
+0x89, 0x7A, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x30, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3,
+0x72, 0x96, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x12, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7,
+0x32, 0x5A, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xD6, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8,
+0xFF, 0xC7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xB8, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC,
+0xC8, 0xC6, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xB7, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE,
+0x9F, 0x6D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0x99, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0,
+0x9A, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x7B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2,
+0x68, 0x6C, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x5D, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4,
+0x3F, 0x13, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x3F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6,
+0x3A, 0xA5, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xBA, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7,
+0xD9, 0xED, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xE0, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9,
+0xF1, 0x2E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x71, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB,
+0xB5, 0x61, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xB1, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC,
+0x80, 0x59, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xB1, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD,
+0x95, 0x43, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xC3, 0x59, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE,
+0x72, 0xB0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xC5, 0xCD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF,
+0x75, 0x25, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0xAC, 0x75, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0,
+0x52, 0x92, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xA5, 0xAF, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1,
+0x55, 0x07, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x8C, 0x57, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2,
+0x32, 0x74, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x85, 0x91, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3,
+0x59, 0xD3, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x49, 0xC4, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5,
+0x39, 0xDF, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x29, 0xD0, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7,
+0x19, 0xC1, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x09, 0xB2, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8,
+0xF9, 0xA3, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE9, 0x94, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA,
+0xD9, 0x85, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC9, 0x76, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC,
+0xB9, 0x67, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xB2, 0x92, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE,
+0xA2, 0x83, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x92, 0x74, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0,
+0x82, 0x65, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x72, 0x56, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2,
+0x62, 0x47, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x52, 0x38, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4,
+0x42, 0x29, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x32, 0x1A, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6,
+0x22, 0x0B, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x1B, 0x37, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8,
+0x0B, 0x28, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xFB, 0x19, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9,
+0xEB, 0x0A, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xDA, 0xFB, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB,
+0xCA, 0xEC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xBA, 0xDD, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xED,
+0xAA, 0xCE, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x9A, 0xBF, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF,
+0x8A, 0xB0, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x7A, 0xA1, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1,
+0x6A, 0x92, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x63, 0xBD, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3,
+0x53, 0xAE, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x9F, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5,
+0x33, 0x90, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x81, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7,
+0x13, 0x72, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x63, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8,
+0xF3, 0x54, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x45, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x17,
+0x0C, 0xFA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x18,
+0xE3, 0xA1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A,
+0xC3, 0x83, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C,
+0xAC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E,
+0x8C, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20,
+0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22,
+0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24,
+0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26,
+0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27,
+0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29,
+0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B,
+0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D,
+0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F,
+0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31,
+0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33,
+0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35,
+0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
+0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38,
+0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A,
+0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C,
+0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E,
+0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40,
+0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42,
+0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44,
+0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46,
+0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47,
+0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
+0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B,
+0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D,
+0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F,
+0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51,
+0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53,
+0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55,
+0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56,
+0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58,
+0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A,
+0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C,
+0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E,
+0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60,
+0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62,
+0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64,
+0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66,
+0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67,
+0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69,
+0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B,
+0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D,
+0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F,
+0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71,
+0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73,
+0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75,
+0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76,
+0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78,
+0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A,
+0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C,
+0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E,
+0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x07, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04,
+0x06, 0x04, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x08, 0x0A, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x00, 0xFF, 0xFF, 0xF0,
-0x28, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0xFF, 0xFF, 0xF1, 0xF0, 0x00,
-0x0C, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x10, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x14, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00,
-0x00, 0x0E, 0x10, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x46, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x30,
-0x00, 0x2D, 0x30, 0x31, 0x00, 0x2B, 0x30, 0x31, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45,
-0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66,
-0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDF,
-0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x13, 0x58,
-0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x9C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x7B, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xD5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x91, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x80, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xC5, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xF8, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x7D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xB1, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xFD, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xF4, 0x9D, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xB6, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x32, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x5D, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x14, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x7A, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x30, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0x96, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x12, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x5A, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xD6, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xC7, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xB8, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xC6, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xB7, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x6D, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0x99, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9A, 0xFF, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x7B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x6C, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x5D, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x13, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x3F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0xA5, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xBA, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xED, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x01, 0x3D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x2E, 0x80,
-0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x71, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x61, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xB1, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x59, 0xF0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xB1, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x43, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xC3, 0x59, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xB0, 0xF0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xC5, 0xCD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x25, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0xAC, 0x75, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0x92, 0xF0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xA5, 0xAF, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x55, 0x07, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x8C, 0x57, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x74, 0xF0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x85, 0x91, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xD3, 0x00,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x49, 0xC4, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xDF, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x29, 0xD0, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xC1, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x09, 0xB2, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0xA3, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE9, 0x94, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x85, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC9, 0x76, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x67, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xB2, 0x92, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x83, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x92, 0x74, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x65, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x72, 0x56, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x47, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x52, 0x38, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x29, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x32, 0x1A, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x22, 0x0B, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x1B, 0x37, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x28, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xFB, 0x19, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEB, 0x0A, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xDA, 0xFB, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xEC, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xBA, 0xDD, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xCE, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x9A, 0xBF, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xB0, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x7A, 0xA1, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0x92, 0x30,
-0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x63, 0xBD, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xAE, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x9F, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x90, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x81, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x72, 0xB0,
-0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x63, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x54, 0xB0,
-0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x28, 0x80,
-0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x19, 0x80, 0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x13, 0x43, 0xFB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xBD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90,
-0x01, 0x06, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05,
-0x04, 0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x07, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
-0x04, 0x05, 0x04, 0x05, 0x0A, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08,
-0x09, 0x08, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C,
-0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0x0C, 0x0B, 0xFF,
-0xFF, 0xF0, 0x28, 0x00, 0x00, 0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x08, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1,
-0xF0, 0x00, 0x0C, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x10, 0x00,
-0x00, 0x0E, 0x10, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x14, 0x4C, 0x4D, 0x54,
-0x00, 0x46, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x30, 0x00, 0x2D, 0x30, 0x31, 0x00, 0x2B, 0x30, 0x31,
-0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
-0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33,
-0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00,
-0xBB, 0x1F, 0xA5, 0x00, 0xF8, 0xDE, 0xF0, 0x00, 0x00, 0x00, 0x0F, 0x4D, 0x61, 0x64, 0x65, 0x69,
-0x72, 0x61, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73, 
+0x0B, 0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x00, 0xFF, 0xFF, 0xF0, 0x28, 0x00, 0x04, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x08, 0xFF, 0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0xFF,
+0xFF, 0xF1, 0xF0, 0x00, 0x0C, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x10, 0xFF, 0xFF, 0xF1, 0xF0, 0x00,
+0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x18, 0x00, 0x00, 0x0E,
+0x10, 0x01, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x18, 0x4C,
+0x4D, 0x54, 0x00, 0x46, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x30, 0x00, 0x2D, 0x30, 0x31, 0x00, 0x2B,
+0x30, 0x31, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C,
+0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30,
+0x0A, 0x00, 0xBB, 0x1F, 0xA5, 0x00, 0xF8, 0xDE, 0xF0, 0x00, 0x00, 0x00, 0x0F, 0x4D, 0x61, 0x64,
+0x65, 0x69, 0x72, 0x61, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73, 
 
 /* Atlantic/Reykjavik */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x49, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -52930,12 +53208,24 @@
 
 /* CET */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0x9B, 0x0C, 0x17, 0x60,
-0x9B, 0xD5, 0xDA, 0xF0, 0x9C, 0xD9, 0xAE, 0x90, 0x9D, 0xA4, 0xB5, 0x90, 0x9E, 0xB9, 0x90, 0x90,
-0x9F, 0x84, 0x97, 0x90, 0xC8, 0x09, 0x71, 0x90, 0xCC, 0xE7, 0x4B, 0x10, 0xCD, 0xA9, 0x17, 0x90,
-0xCE, 0xA2, 0x43, 0x10, 0xCF, 0x92, 0x34, 0x10, 0xD0, 0x82, 0x25, 0x10, 0xD1, 0x72, 0x16, 0x10,
-0xD2, 0x4E, 0x40, 0x90, 0x0D, 0xA4, 0x63, 0x90, 0x0E, 0x8B, 0x1A, 0x10, 0x0F, 0x84, 0x45, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x16, 0x80, 0x00, 0x00, 0x00,
+0x98, 0x44, 0x49, 0x80, 0x9B, 0x0C, 0x25, 0x70, 0x9B, 0xD5, 0xDA, 0xF0, 0x9C, 0xD9, 0xAE, 0x90,
+0x9D, 0xA4, 0xB5, 0x90, 0x9E, 0xB9, 0x90, 0x90, 0x9F, 0x84, 0x97, 0x90, 0x9F, 0xCE, 0xF8, 0x30,
+0xA0, 0x60, 0xA5, 0xF0, 0xA1, 0x7E, 0xBB, 0x70, 0xA2, 0x2E, 0x12, 0xF0, 0xA3, 0x7A, 0x4C, 0xF0,
+0xA4, 0x35, 0x81, 0xF0, 0xA5, 0x5E, 0x23, 0x70, 0xA6, 0x25, 0x35, 0xF0, 0xA7, 0x27, 0x9B, 0xF0,
+0xA8, 0x2A, 0x01, 0xF0, 0xA9, 0x07, 0x7D, 0xF0, 0xA9, 0xEE, 0x34, 0x70, 0xAA, 0xE7, 0x5F, 0xF0,
+0xAB, 0xD7, 0x50, 0xF0, 0xAC, 0xC7, 0x41, 0xF0, 0xAD, 0xC9, 0xA7, 0xF0, 0xAE, 0xA7, 0x23, 0xF0,
+0xAF, 0xA0, 0x4F, 0x70, 0xB0, 0x87, 0x05, 0xF0, 0xB1, 0x89, 0x6B, 0xF0, 0xB2, 0x70, 0x4C, 0xA0,
+0xB3, 0x72, 0xB2, 0xA0, 0xB4, 0x50, 0x2E, 0xA0, 0xB5, 0x49, 0x5A, 0x20, 0xB6, 0x30, 0x10, 0xA0,
+0xB7, 0x32, 0x76, 0xA0, 0xB8, 0x0F, 0xF2, 0xA0, 0xB8, 0xFF, 0xE3, 0xA0, 0xB9, 0xEF, 0xD4, 0xA0,
+0xBA, 0xD6, 0x8B, 0x20, 0xBB, 0xD8, 0xF1, 0x20, 0xBC, 0xC8, 0xE2, 0x20, 0xBD, 0xB8, 0xD3, 0x20,
+0xBE, 0x9F, 0x89, 0xA0, 0xBF, 0x98, 0xB5, 0x20, 0xC0, 0x9B, 0x1B, 0x20, 0xC1, 0x78, 0x97, 0x20,
+0xC2, 0x68, 0x88, 0x20, 0xC3, 0x58, 0x79, 0x20, 0xC4, 0x3F, 0x2F, 0xA0, 0xC5, 0x38, 0x5B, 0x20,
+0xC6, 0x3A, 0xC1, 0x20, 0xC7, 0x58, 0xD6, 0xA0, 0xC7, 0xDA, 0x09, 0xA0, 0xC8, 0x4A, 0x19, 0x20,
+0xCC, 0xE7, 0x4B, 0x10, 0xCD, 0xA9, 0x17, 0x90, 0xCE, 0xA2, 0x43, 0x10, 0xCF, 0x92, 0x34, 0x10,
+0xD0, 0x6E, 0x5E, 0x90, 0xD1, 0x72, 0x16, 0x10, 0xD2, 0x4E, 0x40, 0x90, 0xD3, 0x91, 0x40, 0x10,
+0xD4, 0x4B, 0x23, 0x90, 0x0D, 0xA4, 0x63, 0x90, 0x0E, 0x8B, 0x1A, 0x10, 0x0F, 0x84, 0x45, 0x90,
 0x10, 0x74, 0x36, 0x90, 0x11, 0x64, 0x27, 0x90, 0x12, 0x54, 0x18, 0x90, 0x13, 0x4D, 0x44, 0x10,
 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xEB, 0x90, 0x16, 0x13, 0xDC, 0x90, 0x17, 0x03, 0xCD, 0x90,
 0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xAF, 0x90, 0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90,
@@ -52965,102 +53255,143 @@
 0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10,
 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10,
 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90,
-0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x00, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00,
-0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x43, 0x45, 0x53, 0x54,
-0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00,
-0x04, 0x00, 0x00, 0x00, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x17, 0x60, 0xFF, 0xFF, 0xFF,
-0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x09, 0x71, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF, 0xFF, 0xFF,
-0xFF, 0xD0, 0x82, 0x25, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF, 0xFF, 0xFF,
-0xFF, 0xD2, 0x4E, 0x40, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x0E,
-0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00,
-0x00, 0x0E, 0x10, 0x00, 0x05, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x0A, 0x43, 0x45, 0x54, 0x2D, 0x31, 0x43, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E,
-0x35, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x02, 0x05, 0x02,
+0x03, 0x04, 0x03, 0x04, 0x08, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
+0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
+0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x00, 0x00, 0x04, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
+0x00, 0x00, 0x0E, 0x10, 0x00, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0C, 0x00, 0x00, 0x0E, 0x10,
+0x00, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0C, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x11, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0C,
+0x00, 0x00, 0x0E, 0x10, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x43, 0x45,
+0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xB9, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x1A, 0xFF, 0xFF,
+0xFF, 0xFF, 0x56, 0xB6, 0xDF, 0xE6, 0xFF, 0xFF, 0xFF, 0xFF, 0x6D, 0xE8, 0xC8, 0x00, 0xFF, 0xFF,
+0xFF, 0xFF, 0x98, 0x44, 0x49, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x25, 0x70, 0xFF, 0xFF,
+0xFF, 0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xCE, 0xF8, 0x30, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA0, 0x60, 0xA5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x7E, 0xBB, 0x70, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA2, 0x2E, 0x12, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x7A, 0x4C, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA4, 0x35, 0x81, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x5E, 0x23, 0x70, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA6, 0x25, 0x35, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0x27, 0x9B, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA8, 0x2A, 0x01, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x07, 0x7D, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA9, 0xEE, 0x34, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xAB, 0xD7, 0x50, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAC, 0xC7, 0x41, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x4C, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB3, 0x72, 0xB2, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x2E, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB5, 0x49, 0x5A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x30, 0x10, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB7, 0x32, 0x76, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xF2, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB8, 0xFF, 0xE3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xD4, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xBA, 0xD6, 0x8B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0xD8, 0xF1, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xBC, 0xC8, 0xE2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xD3, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xBE, 0x9F, 0x89, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0xB5, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC0, 0x9B, 0x1B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x97, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC2, 0x68, 0x88, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x79, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC4, 0x3F, 0x2F, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x5B, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC6, 0x3A, 0xC1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xD6, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC7, 0xDA, 0x09, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x4A, 0x19, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD0, 0x6E, 0x5E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD2, 0x4E, 0x40, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x91, 0x40, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD4, 0x4B, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x02, 0x03, 0x06, 0x03, 0x04, 0x05, 0x04, 0x05, 0x09,
+0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08,
+0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08,
+0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x04, 0x05, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x00,
+0x00, 0x04, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x04, 0x1A, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x10, 0x00, 0x00, 0x0E,
+0x10, 0x00, 0x0C, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x10, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x15, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x01,
+0x10, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x4D, 0x54, 0x00, 0x57,
+0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x0A, 0x43, 0x45, 0x54, 0x2D, 0x31, 0x43,
+0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35,
+0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 
 
 /* Chile/Continental */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -53366,151 +53697,231 @@
 
 /* CST6CDT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x9E, 0xA6, 0x2C, 0x80,
-0x9F, 0xBA, 0xF9, 0x70, 0xA0, 0x86, 0x0E, 0x80, 0xA1, 0x9A, 0xDB, 0x70, 0xCB, 0x88, 0xFE, 0x80,
-0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x09, 0xF0, 0xFA, 0xF8, 0x67, 0x00, 0xFB, 0xE8, 0x49, 0xF0,
-0xFC, 0xD8, 0x49, 0x00, 0xFD, 0xC8, 0x2B, 0xF0, 0xFE, 0xB8, 0x2B, 0x00, 0xFF, 0xA8, 0x0D, 0xF0,
-0x00, 0x98, 0x0D, 0x00, 0x01, 0x87, 0xEF, 0xF0, 0x02, 0x77, 0xEF, 0x00, 0x03, 0x71, 0x0C, 0x70,
-0x04, 0x61, 0x0B, 0x80, 0x05, 0x50, 0xEE, 0x70, 0x06, 0x40, 0xED, 0x80, 0x07, 0x30, 0xD0, 0x70,
-0x07, 0x8D, 0x27, 0x80, 0x09, 0x10, 0xB2, 0x70, 0x09, 0xAD, 0xA3, 0x00, 0x0A, 0xF0, 0x94, 0x70,
-0x0B, 0xE0, 0x93, 0x80, 0x0C, 0xD9, 0xB0, 0xF0, 0x0D, 0xC0, 0x75, 0x80, 0x0E, 0xB9, 0x92, 0xF0,
-0x0F, 0xA9, 0x92, 0x00, 0x10, 0x99, 0x74, 0xF0, 0x11, 0x89, 0x74, 0x00, 0x12, 0x79, 0x56, 0xF0,
-0x13, 0x69, 0x56, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x15, 0x49, 0x38, 0x00, 0x16, 0x39, 0x1A, 0xF0,
-0x17, 0x29, 0x1A, 0x00, 0x18, 0x22, 0x37, 0x70, 0x19, 0x08, 0xFC, 0x00, 0x1A, 0x02, 0x19, 0x70,
-0x1A, 0xF2, 0x18, 0x80, 0x1B, 0xE1, 0xFB, 0x70, 0x1C, 0xD1, 0xFA, 0x80, 0x1D, 0xC1, 0xDD, 0x70,
-0x1E, 0xB1, 0xDC, 0x80, 0x1F, 0xA1, 0xBF, 0x70, 0x20, 0x76, 0x0F, 0x00, 0x21, 0x81, 0xA1, 0x70,
-0x22, 0x55, 0xF1, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x24, 0x35, 0xD3, 0x00, 0x25, 0x4A, 0x9F, 0xF0,
-0x26, 0x15, 0xB5, 0x00, 0x27, 0x2A, 0x81, 0xF0, 0x27, 0xFE, 0xD1, 0x80, 0x29, 0x0A, 0x63, 0xF0,
-0x29, 0xDE, 0xB3, 0x80, 0x2A, 0xEA, 0x45, 0xF0, 0x2B, 0xBE, 0x95, 0x80, 0x2C, 0xD3, 0x62, 0x70,
-0x2D, 0x9E, 0x77, 0x80, 0x2E, 0xB3, 0x44, 0x70, 0x2F, 0x7E, 0x59, 0x80, 0x30, 0x93, 0x26, 0x70,
-0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70,
-0x35, 0x27, 0x3A, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0,
-0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x3A, 0xC6, 0xE0, 0x00, 0x3B, 0xDB, 0xAC, 0xF0,
-0x3C, 0xAF, 0xFC, 0x80, 0x3D, 0xBB, 0x8E, 0xF0, 0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0,
-0x40, 0x6F, 0xC0, 0x80, 0x41, 0x84, 0x8D, 0x70, 0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70,
-0x44, 0x2F, 0x84, 0x80, 0x45, 0x44, 0x51, 0x70, 0x45, 0xF3, 0xB7, 0x00, 0x47, 0x2D, 0x6D, 0xF0,
-0x47, 0xD3, 0x99, 0x00, 0x49, 0x0D, 0x4F, 0xF0, 0x49, 0xB3, 0x7B, 0x00, 0x4A, 0xED, 0x31, 0xF0,
-0x4B, 0x9C, 0x97, 0x80, 0x4C, 0xD6, 0x4E, 0x70, 0x4D, 0x7C, 0x79, 0x80, 0x4E, 0xB6, 0x30, 0x70,
-0x4F, 0x5C, 0x5B, 0x80, 0x50, 0x96, 0x12, 0x70, 0x51, 0x3C, 0x3D, 0x80, 0x52, 0x75, 0xF4, 0x70,
-0x53, 0x1C, 0x1F, 0x80, 0x54, 0x55, 0xD6, 0x70, 0x54, 0xFC, 0x01, 0x80, 0x56, 0x35, 0xB8, 0x70,
-0x56, 0xE5, 0x1E, 0x00, 0x58, 0x1E, 0xD4, 0xF0, 0x58, 0xC5, 0x00, 0x00, 0x59, 0xFE, 0xB6, 0xF0,
-0x5A, 0xA4, 0xE2, 0x00, 0x5B, 0xDE, 0x98, 0xF0, 0x5C, 0x84, 0xC4, 0x00, 0x5D, 0xBE, 0x7A, 0xF0,
-0x5E, 0x64, 0xA6, 0x00, 0x5F, 0x9E, 0x5C, 0xF0, 0x60, 0x4D, 0xC2, 0x80, 0x61, 0x87, 0x79, 0x70,
-0x62, 0x2D, 0xA4, 0x80, 0x63, 0x67, 0x5B, 0x70, 0x64, 0x0D, 0x86, 0x80, 0x65, 0x47, 0x3D, 0x70,
-0x65, 0xED, 0x68, 0x80, 0x67, 0x27, 0x1F, 0x70, 0x67, 0xCD, 0x4A, 0x80, 0x69, 0x07, 0x01, 0x70,
-0x69, 0xAD, 0x2C, 0x80, 0x6A, 0xE6, 0xE3, 0x70, 0x6B, 0x96, 0x49, 0x00, 0x6C, 0xCF, 0xFF, 0xF0,
-0x6D, 0x76, 0x2B, 0x00, 0x6E, 0xAF, 0xE1, 0xF0, 0x6F, 0x56, 0x0D, 0x00, 0x70, 0x8F, 0xC3, 0xF0,
-0x71, 0x35, 0xEF, 0x00, 0x72, 0x6F, 0xA5, 0xF0, 0x73, 0x15, 0xD1, 0x00, 0x74, 0x4F, 0x87, 0xF0,
-0x74, 0xFE, 0xED, 0x80, 0x76, 0x38, 0xA4, 0x70, 0x76, 0xDE, 0xCF, 0x80, 0x78, 0x18, 0x86, 0x70,
-0x78, 0xBE, 0xB1, 0x80, 0x79, 0xF8, 0x68, 0x70, 0x7A, 0x9E, 0x93, 0x80, 0x7B, 0xD8, 0x4A, 0x70,
-0x7C, 0x7E, 0x75, 0x80, 0x7D, 0xB8, 0x2C, 0x70, 0x7E, 0x5E, 0x57, 0x80, 0x7F, 0x98, 0x0E, 0x70,
-0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01,
-0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xAB,
-0xA0, 0x00, 0x04, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43,
-0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x2C,
-0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBA, 0xF9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x0E,
-0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xDB, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xFE,
-0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x09,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x67, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x49,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x49, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x2B,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x2B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x0D,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xEF,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x0C,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x0B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xEE,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xED, 0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xD0,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xB2,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0xA3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0x94,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x93, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xB0,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x75, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0x92,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x74,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x56,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x38,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x1A,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x37,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x19,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x18, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xFB,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xFA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xDD,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xDC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xBF,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xA1,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xF1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x9F,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xB5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x81,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xD1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x63,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xB3, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x45,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x95, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x62,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x77, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x44,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x59, 0x80, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x26,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xAC,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xB7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x6D,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0x99, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x4F,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x31,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0x97, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x4E,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x79, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x30,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x5B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x12,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x3D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x75, 0xF4,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x1F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xD6,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xB8,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xD4,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xB6,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0x98,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xC4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x7A,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xA6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x5C,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xC2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x79,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xA4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x5B,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x86, 0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x3D,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x68, 0x80, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x1F,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x4A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x01,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x2C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xE3,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xCF, 0xFF,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xE1,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xC3,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xA5,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x87,
-0xF0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xED, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xA4,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xCF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x86,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xB1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x68,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0x93, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x4A,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x75, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x2C,
-0x70, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x57, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x0E,
-0x70, 0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0,
-0x01, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF,
-0xAB, 0xA0, 0x00, 0x04, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00,
-0x43, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x43,
-0x53, 0x54, 0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xEC, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0x80, 0x00, 0x00, 0x00,
+0x9E, 0xA6, 0x2C, 0x80, 0x9F, 0xBA, 0xF9, 0x70, 0xA0, 0x86, 0x0E, 0x80, 0xA1, 0x9A, 0xDB, 0x70,
+0xA2, 0xCB, 0x74, 0x00, 0xA3, 0x83, 0xF7, 0xF0, 0xA4, 0x45, 0xD2, 0x80, 0xA5, 0x63, 0xD9, 0xF0,
+0xA6, 0x53, 0xD9, 0x00, 0xA7, 0x15, 0x97, 0x70, 0xA8, 0x33, 0xBB, 0x00, 0xA8, 0xFE, 0xB3, 0xF0,
+0xAA, 0x13, 0x9D, 0x00, 0xAA, 0xDE, 0x95, 0xF0, 0xAB, 0xF3, 0x7F, 0x00, 0xAC, 0xBE, 0x77, 0xF0,
+0xAD, 0xD3, 0x61, 0x00, 0xAE, 0x9E, 0x59, 0xF0, 0xAF, 0xB3, 0x43, 0x00, 0xB0, 0x7E, 0x3B, 0xF0,
+0xB1, 0x9C, 0x5F, 0x80, 0xB2, 0x67, 0x58, 0x70, 0xB3, 0x7C, 0x41, 0x80, 0xB4, 0x47, 0x3A, 0x70,
+0xB5, 0x5C, 0x23, 0x80, 0xB6, 0x27, 0x1C, 0x70, 0xB7, 0x3C, 0x05, 0x80, 0xB8, 0x06, 0xFE, 0x70,
+0xB9, 0x1B, 0xE7, 0x80, 0xB9, 0xE6, 0xE0, 0x70, 0xBB, 0x05, 0x04, 0x00, 0xBB, 0xC6, 0xC2, 0x70,
+0xBC, 0xE4, 0xE6, 0x00, 0xBD, 0xAF, 0xDE, 0xF0, 0xBE, 0xC4, 0xC8, 0x00, 0xBF, 0x8F, 0xC0, 0xF0,
+0xC0, 0x5A, 0xD6, 0x00, 0xC1, 0xB0, 0x3C, 0x70, 0xC2, 0x84, 0x8C, 0x00, 0xC3, 0x4F, 0x84, 0xF0,
+0xC4, 0x64, 0x6E, 0x00, 0xC5, 0x2F, 0x66, 0xF0, 0xC6, 0x4D, 0x8A, 0x80, 0xC7, 0x0F, 0x48, 0xF0,
+0xC8, 0x2D, 0x6C, 0x80, 0xC8, 0xF8, 0x65, 0x70, 0xCA, 0x0D, 0x4E, 0x80, 0xCA, 0xD8, 0x47, 0x70,
+0xCB, 0x88, 0xFE, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x09, 0xF0, 0xD3, 0x75, 0xF3, 0x00,
+0xD4, 0x40, 0xEB, 0xF0, 0xD5, 0x55, 0xD5, 0x00, 0xD6, 0x20, 0xCD, 0xF0, 0xD7, 0x35, 0xB7, 0x00,
+0xD8, 0x00, 0xAF, 0xF0, 0xD9, 0x15, 0x99, 0x00, 0xD9, 0xE0, 0x91, 0xF0, 0xDA, 0xFE, 0xB5, 0x80,
+0xDB, 0xC0, 0x73, 0xF0, 0xDC, 0xDE, 0x97, 0x80, 0xDD, 0xA9, 0x90, 0x70, 0xDE, 0xBE, 0x79, 0x80,
+0xDF, 0x89, 0x72, 0x70, 0xE0, 0x9E, 0x5B, 0x80, 0xE1, 0x69, 0x54, 0x70, 0xE2, 0x7E, 0x3D, 0x80,
+0xE3, 0x49, 0x36, 0x70, 0xE4, 0x5E, 0x1F, 0x80, 0xE5, 0x57, 0x3C, 0xF0, 0xE6, 0x47, 0x3C, 0x00,
+0xE7, 0x37, 0x1E, 0xF0, 0xE8, 0x27, 0x1E, 0x00, 0xE9, 0x17, 0x00, 0xF0, 0xEA, 0x07, 0x00, 0x00,
+0xEA, 0xF6, 0xE2, 0xF0, 0xEB, 0xE6, 0xE2, 0x00, 0xEC, 0xD6, 0xC4, 0xF0, 0xED, 0xC6, 0xC4, 0x00,
+0xEE, 0xBF, 0xE1, 0x70, 0xEF, 0xAF, 0xE0, 0x80, 0xF0, 0x9F, 0xC3, 0x70, 0xF1, 0x8F, 0xC2, 0x80,
+0xF2, 0x7F, 0xA5, 0x70, 0xF3, 0x6F, 0xA4, 0x80, 0xF4, 0x5F, 0x87, 0x70, 0xF5, 0x4F, 0x86, 0x80,
+0xF6, 0x3F, 0x69, 0x70, 0xF7, 0x2F, 0x68, 0x80, 0xF8, 0x28, 0x85, 0xF0, 0xF9, 0x0F, 0x4A, 0x80,
+0xFA, 0x08, 0x67, 0xF0, 0xFA, 0xF8, 0x67, 0x00, 0xFB, 0xE8, 0x49, 0xF0, 0xFC, 0xD8, 0x49, 0x00,
+0xFD, 0xC8, 0x2B, 0xF0, 0xFE, 0xB8, 0x2B, 0x00, 0xFF, 0xA8, 0x0D, 0xF0, 0x00, 0x98, 0x0D, 0x00,
+0x01, 0x87, 0xEF, 0xF0, 0x02, 0x77, 0xEF, 0x00, 0x03, 0x71, 0x0C, 0x70, 0x04, 0x61, 0x0B, 0x80,
+0x05, 0x50, 0xEE, 0x70, 0x06, 0x40, 0xED, 0x80, 0x07, 0x30, 0xD0, 0x70, 0x07, 0x8D, 0x27, 0x80,
+0x09, 0x10, 0xB2, 0x70, 0x09, 0xAD, 0xA3, 0x00, 0x0A, 0xF0, 0x94, 0x70, 0x0B, 0xE0, 0x93, 0x80,
+0x0C, 0xD9, 0xB0, 0xF0, 0x0D, 0xC0, 0x75, 0x80, 0x0E, 0xB9, 0x92, 0xF0, 0x0F, 0xA9, 0x92, 0x00,
+0x10, 0x99, 0x74, 0xF0, 0x11, 0x89, 0x74, 0x00, 0x12, 0x79, 0x56, 0xF0, 0x13, 0x69, 0x56, 0x00,
+0x14, 0x59, 0x38, 0xF0, 0x15, 0x49, 0x38, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x17, 0x29, 0x1A, 0x00,
+0x18, 0x22, 0x37, 0x70, 0x19, 0x08, 0xFC, 0x00, 0x1A, 0x02, 0x19, 0x70, 0x1A, 0xF2, 0x18, 0x80,
+0x1B, 0xE1, 0xFB, 0x70, 0x1C, 0xD1, 0xFA, 0x80, 0x1D, 0xC1, 0xDD, 0x70, 0x1E, 0xB1, 0xDC, 0x80,
+0x1F, 0xA1, 0xBF, 0x70, 0x20, 0x76, 0x0F, 0x00, 0x21, 0x81, 0xA1, 0x70, 0x22, 0x55, 0xF1, 0x00,
+0x23, 0x6A, 0xBD, 0xF0, 0x24, 0x35, 0xD3, 0x00, 0x25, 0x4A, 0x9F, 0xF0, 0x26, 0x15, 0xB5, 0x00,
+0x27, 0x2A, 0x81, 0xF0, 0x27, 0xFE, 0xD1, 0x80, 0x29, 0x0A, 0x63, 0xF0, 0x29, 0xDE, 0xB3, 0x80,
+0x2A, 0xEA, 0x45, 0xF0, 0x2B, 0xBE, 0x95, 0x80, 0x2C, 0xD3, 0x62, 0x70, 0x2D, 0x9E, 0x77, 0x80,
+0x2E, 0xB3, 0x44, 0x70, 0x2F, 0x7E, 0x59, 0x80, 0x30, 0x93, 0x26, 0x70, 0x31, 0x67, 0x76, 0x00,
+0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x3A, 0x00,
+0x36, 0x32, 0xCC, 0x70, 0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x38, 0xE6, 0xFE, 0x00,
+0x39, 0xFB, 0xCA, 0xF0, 0x3A, 0xC6, 0xE0, 0x00, 0x3B, 0xDB, 0xAC, 0xF0, 0x3C, 0xAF, 0xFC, 0x80,
+0x3D, 0xBB, 0x8E, 0xF0, 0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0, 0x40, 0x6F, 0xC0, 0x80,
+0x41, 0x84, 0x8D, 0x70, 0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70, 0x44, 0x2F, 0x84, 0x80,
+0x45, 0x44, 0x51, 0x70, 0x45, 0xF3, 0xB7, 0x00, 0x47, 0x2D, 0x6D, 0xF0, 0x47, 0xD3, 0x99, 0x00,
+0x49, 0x0D, 0x4F, 0xF0, 0x49, 0xB3, 0x7B, 0x00, 0x4A, 0xED, 0x31, 0xF0, 0x4B, 0x9C, 0x97, 0x80,
+0x4C, 0xD6, 0x4E, 0x70, 0x4D, 0x7C, 0x79, 0x80, 0x4E, 0xB6, 0x30, 0x70, 0x4F, 0x5C, 0x5B, 0x80,
+0x50, 0x96, 0x12, 0x70, 0x51, 0x3C, 0x3D, 0x80, 0x52, 0x75, 0xF4, 0x70, 0x53, 0x1C, 0x1F, 0x80,
+0x54, 0x55, 0xD6, 0x70, 0x54, 0xFC, 0x01, 0x80, 0x56, 0x35, 0xB8, 0x70, 0x56, 0xE5, 0x1E, 0x00,
+0x58, 0x1E, 0xD4, 0xF0, 0x58, 0xC5, 0x00, 0x00, 0x59, 0xFE, 0xB6, 0xF0, 0x5A, 0xA4, 0xE2, 0x00,
+0x5B, 0xDE, 0x98, 0xF0, 0x5C, 0x84, 0xC4, 0x00, 0x5D, 0xBE, 0x7A, 0xF0, 0x5E, 0x64, 0xA6, 0x00,
+0x5F, 0x9E, 0x5C, 0xF0, 0x60, 0x4D, 0xC2, 0x80, 0x61, 0x87, 0x79, 0x70, 0x62, 0x2D, 0xA4, 0x80,
+0x63, 0x67, 0x5B, 0x70, 0x64, 0x0D, 0x86, 0x80, 0x65, 0x47, 0x3D, 0x70, 0x65, 0xED, 0x68, 0x80,
+0x67, 0x27, 0x1F, 0x70, 0x67, 0xCD, 0x4A, 0x80, 0x69, 0x07, 0x01, 0x70, 0x69, 0xAD, 0x2C, 0x80,
+0x6A, 0xE6, 0xE3, 0x70, 0x6B, 0x96, 0x49, 0x00, 0x6C, 0xCF, 0xFF, 0xF0, 0x6D, 0x76, 0x2B, 0x00,
+0x6E, 0xAF, 0xE1, 0xF0, 0x6F, 0x56, 0x0D, 0x00, 0x70, 0x8F, 0xC3, 0xF0, 0x71, 0x35, 0xEF, 0x00,
+0x72, 0x6F, 0xA5, 0xF0, 0x73, 0x15, 0xD1, 0x00, 0x74, 0x4F, 0x87, 0xF0, 0x74, 0xFE, 0xED, 0x80,
+0x76, 0x38, 0xA4, 0x70, 0x76, 0xDE, 0xCF, 0x80, 0x78, 0x18, 0x86, 0x70, 0x78, 0xBE, 0xB1, 0x80,
+0x79, 0xF8, 0x68, 0x70, 0x7A, 0x9E, 0x93, 0x80, 0x7B, 0xD8, 0x4A, 0x70, 0x7C, 0x7E, 0x75, 0x80,
+0x7D, 0xB8, 0x2C, 0x70, 0x7E, 0x5E, 0x57, 0x80, 0x7F, 0x98, 0x0E, 0x70, 0x03, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x05, 0x06, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xAD, 0xD4, 0x00, 0x00, 0xFF, 0xFF,
+0xB9, 0xB0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08,
+0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0,
+0x01, 0x14, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00,
+0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50, 0x54, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00,
+0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xEC, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF,
+0x5E, 0x03, 0xFE, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x2C, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0x9F, 0xBA, 0xF9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x0E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xA1, 0x9A, 0xDB, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0xCB, 0x74, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xA3, 0x83, 0xF7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x45, 0xD2, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xA5, 0x63, 0xD9, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA6, 0x53, 0xD9, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xA7, 0x15, 0x97, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x33, 0xBB, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xA8, 0xFE, 0xB3, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x13, 0x9D, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xAA, 0xDE, 0x95, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAB, 0xF3, 0x7F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xAC, 0xBE, 0x77, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xD3, 0x61, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xAE, 0x9E, 0x59, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xB3, 0x43, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB0, 0x7E, 0x3B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x9C, 0x5F, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB2, 0x67, 0x58, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x7C, 0x41, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB4, 0x47, 0x3A, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB5, 0x5C, 0x23, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB6, 0x27, 0x1C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x3C, 0x05, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB8, 0x06, 0xFE, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0x1B, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB9, 0xE6, 0xE0, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0x05, 0x04, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xBB, 0xC6, 0xC2, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xE4, 0xE6, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xBD, 0xAF, 0xDE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0xC4, 0xC8, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xBF, 0x8F, 0xC0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x5A, 0xD6, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xC1, 0xB0, 0x3C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x84, 0x8C, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xC3, 0x4F, 0x84, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x64, 0x6E, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
+0xC5, 0x2F, 0x66, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x4D, 0x8A, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xC7, 0x0F, 0x48, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x2D, 0x6C, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xC8, 0xF8, 0x65, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0x0D, 0x4E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xCA, 0xD8, 0x47, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xFE, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
+0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x09, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xD3, 0x75, 0xF3, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x40, 0xEB, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xD5, 0x55, 0xD5, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x20, 0xCD, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xD7, 0x35, 0xB7, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x00, 0xAF, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xD9, 0x15, 0x99, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE0, 0x91, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xDA, 0xFE, 0xB5, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xDC, 0xDE, 0x97, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0x90, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xDE, 0xBE, 0x79, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x72, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xE0, 0x9E, 0x5B, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x69, 0x54, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xE2, 0x7E, 0x3D, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x36, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xE4, 0x5E, 0x1F, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x57, 0x3C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xE6, 0x47, 0x3C, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x37, 0x1E, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xE8, 0x27, 0x1E, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0x17, 0x00, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xEA, 0x07, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xF6, 0xE2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xEB, 0xE6, 0xE2, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xD6, 0xC4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xED, 0xC6, 0xC4, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0xBF, 0xE1, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xEF, 0xAF, 0xE0, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x9F, 0xC3, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xF1, 0x8F, 0xC2, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x7F, 0xA5, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xF3, 0x6F, 0xA4, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5F, 0x87, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xF5, 0x4F, 0x86, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x3F, 0x69, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
+0xF7, 0x2F, 0x68, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x85, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xF9, 0x0F, 0x4A, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08, 0x67, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFA, 0xF8, 0x67, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x49, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFC, 0xD8, 0x49, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x2B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xFE, 0xB8, 0x2B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x0D, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x98, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xEF, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x02, 0x77, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x0C, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x04, 0x61, 0x0B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x06, 0x40, 0xED, 0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xD0, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x07, 0x8D, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x09, 0xAD, 0xA3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x0B, 0xE0, 0x93, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xB0, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x0D, 0xC0, 0x75, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0x92, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x0F, 0xA9, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x74, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x11, 0x89, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x56, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x13, 0x69, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x15, 0x49, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x17, 0x29, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x37, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x19, 0x08, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x19, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x1A, 0xF2, 0x18, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xFB, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x1C, 0xD1, 0xFA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xDD, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x1E, 0xB1, 0xDC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xBF, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x20, 0x76, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xA1, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x22, 0x55, 0xF1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x24, 0x35, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x9F, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x26, 0x15, 0xB5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x81, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x27, 0xFE, 0xD1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x63, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x29, 0xDE, 0xB3, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x45, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x2B, 0xBE, 0x95, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x62, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x2D, 0x9E, 0x77, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x44, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x2F, 0x7E, 0x59, 0x80, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x26, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x35, 0x27, 0x3A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x3A, 0xC6, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xAC, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x45, 0xF3, 0xB7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x47, 0xD3, 0x99, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x4F, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x49, 0xB3, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x31, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x4B, 0x9C, 0x97, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x4E, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x4D, 0x7C, 0x79, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x30, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x4F, 0x5C, 0x5B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x12, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x51, 0x3C, 0x3D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x75, 0xF4, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x53, 0x1C, 0x1F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xD6, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x54, 0xFC, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xB8, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x56, 0xE5, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xD4, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x58, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xB6, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x5A, 0xA4, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0x98, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x5C, 0x84, 0xC4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x7A, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x5E, 0x64, 0xA6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x5C, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x60, 0x4D, 0xC2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x79, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x62, 0x2D, 0xA4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x5B, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x64, 0x0D, 0x86, 0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x3D, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x65, 0xED, 0x68, 0x80, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x1F, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x67, 0xCD, 0x4A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x01, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x69, 0xAD, 0x2C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xE3, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x6B, 0x96, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xCF, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x6D, 0x76, 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xE1, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x6F, 0x56, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xC3, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x71, 0x35, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xA5, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x73, 0x15, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x87, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x74, 0xFE, 0xED, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xA4, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x76, 0xDE, 0xCF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x86, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x78, 0xBE, 0xB1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x68, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x7A, 0x9E, 0x93, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x4A, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x7C, 0x7E, 0x75, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x2C, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x7E, 0x5E, 0x57, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x0E, 0x70, 0x03, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x05, 0x06, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xAD, 0xD4, 0x00, 0x00, 0xFF, 0xFF,
+0xB9, 0xB0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08,
+0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0,
+0x01, 0x14, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00,
+0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x43, 0x50, 0x54, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00,
+0x0A, 0x43, 0x53, 0x54, 0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C,
+0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 
 
 /* Cuba */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -53668,10 +54079,14 @@
 
 /* EET */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0x0D, 0xA4, 0x63, 0x90,
-0x0E, 0x8B, 0x1A, 0x10, 0x0F, 0x84, 0x45, 0x90, 0x10, 0x74, 0x36, 0x90, 0x11, 0x64, 0x27, 0x90,
-0x12, 0x54, 0x18, 0x90, 0x13, 0x4D, 0x44, 0x10, 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xEB, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x8A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x1A, 0x80, 0x00, 0x00, 0x00,
+0x9B, 0x80, 0x21, 0x80, 0xB9, 0x7C, 0xE9, 0xE0, 0xB9, 0xC6, 0xAF, 0xD0, 0xC9, 0xF2, 0x63, 0xE0,
+0xCA, 0x10, 0xA8, 0x50, 0xCC, 0xE7, 0x4B, 0x10, 0xCD, 0xAA, 0x4C, 0xF0, 0xCE, 0xA2, 0x18, 0xE0,
+0xCF, 0x93, 0x69, 0x70, 0xDF, 0x13, 0x9E, 0x60, 0xDF, 0xB7, 0x0A, 0x50, 0x09, 0xEC, 0x5E, 0x60,
+0x0B, 0x18, 0xF4, 0x60, 0x0B, 0xCD, 0xAE, 0x00, 0x0C, 0xBD, 0x9F, 0x00, 0x0D, 0xA4, 0x55, 0x80,
+0x0E, 0x8C, 0x5D, 0x80, 0x0F, 0x84, 0x37, 0x80, 0x10, 0x6A, 0xFC, 0x10, 0x11, 0x64, 0x7B, 0xF0,
+0x12, 0x52, 0xAA, 0xF0, 0x13, 0x46, 0x82, 0x60, 0x14, 0x33, 0xC2, 0x50, 0x15, 0x23, 0xEB, 0x90,
 0x16, 0x13, 0xDC, 0x90, 0x17, 0x03, 0xCD, 0x90, 0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xAF, 0x90,
 0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90, 0x1B, 0xBC, 0xBD, 0x10, 0x1C, 0xAC, 0xAE, 0x10,
 0x1D, 0x9C, 0x9F, 0x10, 0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10,
@@ -53700,94 +54115,112 @@
 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10,
 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10,
 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90,
-0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x1C, 0x20, 0x00, 0x05, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00,
-0x00, 0x00, 0x1C, 0x20, 0x00, 0x05, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x01,
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,
-0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x04, 0x00,
-0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E,
-0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00, 0x00, 0x10,
-0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00, 0x00, 0x12,
-0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14,
-0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16,
-0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17,
-0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19,
-0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B,
-0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D,
-0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F,
-0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21,
-0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23,
-0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25,
-0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27,
-0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28,
-0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A,
-0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C,
-0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E,
-0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30,
-0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32,
-0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34,
-0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
-0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38,
-0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39,
-0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B,
-0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D,
-0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F,
-0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41,
-0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43,
-0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45,
-0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47,
-0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
-0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A,
-0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C,
-0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E,
-0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50,
-0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52,
-0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54,
-0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56,
-0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58,
-0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59,
-0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B,
-0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D,
-0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F,
-0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61,
-0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63,
-0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65,
-0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67,
-0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68,
-0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A,
-0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C,
-0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E,
-0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70,
-0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72,
-0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74,
-0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76,
-0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78,
-0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79,
-0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B,
-0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D,
-0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F,
-0x8E, 0x7F, 0x90, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1C,
-0x20, 0x00, 0x05, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00, 0x00,
-0x00, 0x1C, 0x20, 0x00, 0x05, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x01, 0x01,
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45, 0x53, 0x54,
-0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E,
-0x30, 0x2F, 0x34, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-
+0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x03, 0x02, 0x03, 0x02, 0x05, 0x04, 0x05, 0x04, 0x03, 0x02, 0x03,
+0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x03, 0x02, 0x03, 0x02, 0x03, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x00, 0x00,
+0x16, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x16, 0x3C, 0x00, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x08,
+0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x11, 0x00, 0x00, 0x1C, 0x20,
+0x01, 0x15, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x00, 0x00,
+0x2A, 0x30, 0x01, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4D,
+0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43,
+0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A,
+0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8A, 0x00, 0x00, 0x00, 0x0A,
+0x00, 0x00, 0x00, 0x1A, 0xFF, 0xFF, 0xFF, 0xFF, 0x74, 0x3F, 0x98, 0x44, 0xFF, 0xFF, 0xFF, 0xFF,
+0x9B, 0x80, 0x21, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0x7C, 0xE9, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB9, 0xC6, 0xAF, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF2, 0x63, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xCA, 0x10, 0xA8, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF,
+0xCD, 0xAA, 0x4C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xA2, 0x18, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
+0xCF, 0x93, 0x69, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x13, 0x9E, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
+0xDF, 0xB7, 0x0A, 0x50, 0x00, 0x00, 0x00, 0x00, 0x09, 0xEC, 0x5E, 0x60, 0x00, 0x00, 0x00, 0x00,
+0x0B, 0x18, 0xF4, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xCD, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x0C, 0xBD, 0x9F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x55, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x0E, 0x8C, 0x5D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00, 0x00, 0x00, 0x00,
+0x10, 0x6A, 0xFC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x7B, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x12, 0x52, 0xAA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x46, 0x82, 0x60, 0x00, 0x00, 0x00, 0x00,
+0x14, 0x33, 0xC2, 0x50, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00,
+0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x03, 0x02, 0x03, 0x02, 0x05, 0x04, 0x05, 0x04, 0x03, 0x02, 0x03,
+0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x03, 0x02, 0x03, 0x02, 0x03, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09,
+0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x00, 0x00,
+0x16, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x16, 0x3C, 0x00, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x08,
+0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x11, 0x00, 0x00, 0x1C, 0x20,
+0x01, 0x15, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x00, 0x00,
+0x2A, 0x30, 0x01, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4D,
+0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43,
+0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45,
+0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x2C, 0x4D, 0x31, 0x30, 0x2E,
+0x35, 0x2E, 0x30, 0x2F, 0x34, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 
 
 /* Egypt */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -54167,160 +54600,242 @@
 /* EST */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0,
-0x00, 0x00, 0x45, 0x53, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x80, 0x00, 0x00, 0x00,
+0x8B, 0xF4, 0x61, 0xE8, 0x01, 0x02, 0xFF, 0xFF, 0xB5, 0x70, 0x00, 0x00, 0xFF, 0xFF, 0xB5, 0x18,
+0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x4D, 0x54, 0x00,
+0x45, 0x53, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x45, 0x53, 0x54,
-0x35, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C,
+0xFF, 0xFF, 0xFF, 0xFF, 0x69, 0x87, 0x26, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x8B, 0xF4, 0x61, 0xE8,
+0x01, 0x02, 0xFF, 0xFF, 0xB5, 0x70, 0x00, 0x00, 0xFF, 0xFF, 0xB5, 0x18, 0x00, 0x04, 0xFF, 0xFF,
+0xB9, 0xB0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x4D, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00,
+0x0A, 0x45, 0x53, 0x54, 0x35, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 
 
 /* EST5EDT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x9E, 0xA6, 0x1E, 0x70,
-0x9F, 0xBA, 0xEB, 0x60, 0xA0, 0x86, 0x00, 0x70, 0xA1, 0x9A, 0xCD, 0x60, 0xCB, 0x88, 0xF0, 0x70,
-0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x60, 0xFB, 0xE0, 0xFA, 0xF8, 0x58, 0xF0, 0xFB, 0xE8, 0x3B, 0xE0,
-0xFC, 0xD8, 0x3A, 0xF0, 0xFD, 0xC8, 0x1D, 0xE0, 0xFE, 0xB8, 0x1C, 0xF0, 0xFF, 0xA7, 0xFF, 0xE0,
-0x00, 0x97, 0xFE, 0xF0, 0x01, 0x87, 0xE1, 0xE0, 0x02, 0x77, 0xE0, 0xF0, 0x03, 0x70, 0xFE, 0x60,
-0x04, 0x60, 0xFD, 0x70, 0x05, 0x50, 0xE0, 0x60, 0x06, 0x40, 0xDF, 0x70, 0x07, 0x30, 0xC2, 0x60,
-0x07, 0x8D, 0x19, 0x70, 0x09, 0x10, 0xA4, 0x60, 0x09, 0xAD, 0x94, 0xF0, 0x0A, 0xF0, 0x86, 0x60,
-0x0B, 0xE0, 0x85, 0x70, 0x0C, 0xD9, 0xA2, 0xE0, 0x0D, 0xC0, 0x67, 0x70, 0x0E, 0xB9, 0x84, 0xE0,
-0x0F, 0xA9, 0x83, 0xF0, 0x10, 0x99, 0x66, 0xE0, 0x11, 0x89, 0x65, 0xF0, 0x12, 0x79, 0x48, 0xE0,
-0x13, 0x69, 0x47, 0xF0, 0x14, 0x59, 0x2A, 0xE0, 0x15, 0x49, 0x29, 0xF0, 0x16, 0x39, 0x0C, 0xE0,
-0x17, 0x29, 0x0B, 0xF0, 0x18, 0x22, 0x29, 0x60, 0x19, 0x08, 0xED, 0xF0, 0x1A, 0x02, 0x0B, 0x60,
-0x1A, 0xF2, 0x0A, 0x70, 0x1B, 0xE1, 0xED, 0x60, 0x1C, 0xD1, 0xEC, 0x70, 0x1D, 0xC1, 0xCF, 0x60,
-0x1E, 0xB1, 0xCE, 0x70, 0x1F, 0xA1, 0xB1, 0x60, 0x20, 0x76, 0x00, 0xF0, 0x21, 0x81, 0x93, 0x60,
-0x22, 0x55, 0xE2, 0xF0, 0x23, 0x6A, 0xAF, 0xE0, 0x24, 0x35, 0xC4, 0xF0, 0x25, 0x4A, 0x91, 0xE0,
-0x26, 0x15, 0xA6, 0xF0, 0x27, 0x2A, 0x73, 0xE0, 0x27, 0xFE, 0xC3, 0x70, 0x29, 0x0A, 0x55, 0xE0,
-0x29, 0xDE, 0xA5, 0x70, 0x2A, 0xEA, 0x37, 0xE0, 0x2B, 0xBE, 0x87, 0x70, 0x2C, 0xD3, 0x54, 0x60,
-0x2D, 0x9E, 0x69, 0x70, 0x2E, 0xB3, 0x36, 0x60, 0x2F, 0x7E, 0x4B, 0x70, 0x30, 0x93, 0x18, 0x60,
-0x31, 0x67, 0x67, 0xF0, 0x32, 0x72, 0xFA, 0x60, 0x33, 0x47, 0x49, 0xF0, 0x34, 0x52, 0xDC, 0x60,
-0x35, 0x27, 0x2B, 0xF0, 0x36, 0x32, 0xBE, 0x60, 0x37, 0x07, 0x0D, 0xF0, 0x38, 0x1B, 0xDA, 0xE0,
-0x38, 0xE6, 0xEF, 0xF0, 0x39, 0xFB, 0xBC, 0xE0, 0x3A, 0xC6, 0xD1, 0xF0, 0x3B, 0xDB, 0x9E, 0xE0,
-0x3C, 0xAF, 0xEE, 0x70, 0x3D, 0xBB, 0x80, 0xE0, 0x3E, 0x8F, 0xD0, 0x70, 0x3F, 0x9B, 0x62, 0xE0,
-0x40, 0x6F, 0xB2, 0x70, 0x41, 0x84, 0x7F, 0x60, 0x42, 0x4F, 0x94, 0x70, 0x43, 0x64, 0x61, 0x60,
-0x44, 0x2F, 0x76, 0x70, 0x45, 0x44, 0x43, 0x60, 0x45, 0xF3, 0xA8, 0xF0, 0x47, 0x2D, 0x5F, 0xE0,
-0x47, 0xD3, 0x8A, 0xF0, 0x49, 0x0D, 0x41, 0xE0, 0x49, 0xB3, 0x6C, 0xF0, 0x4A, 0xED, 0x23, 0xE0,
-0x4B, 0x9C, 0x89, 0x70, 0x4C, 0xD6, 0x40, 0x60, 0x4D, 0x7C, 0x6B, 0x70, 0x4E, 0xB6, 0x22, 0x60,
-0x4F, 0x5C, 0x4D, 0x70, 0x50, 0x96, 0x04, 0x60, 0x51, 0x3C, 0x2F, 0x70, 0x52, 0x75, 0xE6, 0x60,
-0x53, 0x1C, 0x11, 0x70, 0x54, 0x55, 0xC8, 0x60, 0x54, 0xFB, 0xF3, 0x70, 0x56, 0x35, 0xAA, 0x60,
-0x56, 0xE5, 0x0F, 0xF0, 0x58, 0x1E, 0xC6, 0xE0, 0x58, 0xC4, 0xF1, 0xF0, 0x59, 0xFE, 0xA8, 0xE0,
-0x5A, 0xA4, 0xD3, 0xF0, 0x5B, 0xDE, 0x8A, 0xE0, 0x5C, 0x84, 0xB5, 0xF0, 0x5D, 0xBE, 0x6C, 0xE0,
-0x5E, 0x64, 0x97, 0xF0, 0x5F, 0x9E, 0x4E, 0xE0, 0x60, 0x4D, 0xB4, 0x70, 0x61, 0x87, 0x6B, 0x60,
-0x62, 0x2D, 0x96, 0x70, 0x63, 0x67, 0x4D, 0x60, 0x64, 0x0D, 0x78, 0x70, 0x65, 0x47, 0x2F, 0x60,
-0x65, 0xED, 0x5A, 0x70, 0x67, 0x27, 0x11, 0x60, 0x67, 0xCD, 0x3C, 0x70, 0x69, 0x06, 0xF3, 0x60,
-0x69, 0xAD, 0x1E, 0x70, 0x6A, 0xE6, 0xD5, 0x60, 0x6B, 0x96, 0x3A, 0xF0, 0x6C, 0xCF, 0xF1, 0xE0,
-0x6D, 0x76, 0x1C, 0xF0, 0x6E, 0xAF, 0xD3, 0xE0, 0x6F, 0x55, 0xFE, 0xF0, 0x70, 0x8F, 0xB5, 0xE0,
-0x71, 0x35, 0xE0, 0xF0, 0x72, 0x6F, 0x97, 0xE0, 0x73, 0x15, 0xC2, 0xF0, 0x74, 0x4F, 0x79, 0xE0,
-0x74, 0xFE, 0xDF, 0x70, 0x76, 0x38, 0x96, 0x60, 0x76, 0xDE, 0xC1, 0x70, 0x78, 0x18, 0x78, 0x60,
-0x78, 0xBE, 0xA3, 0x70, 0x79, 0xF8, 0x5A, 0x60, 0x7A, 0x9E, 0x85, 0x70, 0x7B, 0xD8, 0x3C, 0x60,
-0x7C, 0x7E, 0x67, 0x70, 0x7D, 0xB8, 0x1E, 0x60, 0x7E, 0x5E, 0x49, 0x70, 0x7F, 0x98, 0x00, 0x60,
-0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01,
-0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9,
-0xB0, 0x00, 0x04, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45,
-0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x1E,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBA, 0xEB, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x00,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xCD, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xF0,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x60, 0xFB,
-0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x58, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x3B,
-0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x3A, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x1D,
-0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x1C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0xFF,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0xFE, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xE1,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xE0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x03, 0x70, 0xFE,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x04, 0x60, 0xFD, 0x70, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xE0,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xDF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xC2,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x19, 0x70, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xA4,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0x94, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0x86,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x85, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xA2,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x67, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0x84,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x83, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x66,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x65, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x48,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x47, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x2A,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x29, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x0C,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x0B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x29,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xED, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x0B,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x0A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xED,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xEC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xCF,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xCE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xB1,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0x93,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xE2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xAF,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xC4, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x91,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xA6, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x73,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xC3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x55,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xA5, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x37,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x87, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x54,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x69, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x36,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x4B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x18,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xFA,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xDC,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xBE,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x0D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xDA,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xEF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xBC,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xD1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x9E,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x80,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xD0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x62,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x7F,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x61,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x76, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x43,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x5F,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0x8A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x41,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x6C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x23,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0x89, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x40,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x6B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x22,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x4D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x04,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x2F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x52, 0x75, 0xE6,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x11, 0x70, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xC8,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFB, 0xF3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xAA,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x0F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xC6,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC4, 0xF1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xA8,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xD3, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0x8A,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xB5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x6C,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0x97, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x4E,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xB4, 0x70, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x6B,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0x96, 0x70, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x4D,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x78, 0x70, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x2F,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x5A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x11,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x3C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x69, 0x06, 0xF3,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x1E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xD5,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x3A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xCF, 0xF1,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x1C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xD3,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x55, 0xFE, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xB5,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xE0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0x97,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x79,
-0xE0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xDF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0x96,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xC1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x78,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xA3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x5A,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0x85, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x3C,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x67, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x1E,
-0x60, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x49, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x00,
-0x60, 0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0,
-0x01, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF,
-0xB9, 0xB0, 0x00, 0x04, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00,
-0x45, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x45,
-0x53, 0x54, 0x35, 0x45, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xEC, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0x80, 0x00, 0x00, 0x00,
+0x9E, 0xA6, 0x1E, 0x70, 0x9F, 0xBA, 0xEB, 0x60, 0xA0, 0x86, 0x00, 0x70, 0xA1, 0x9A, 0xCD, 0x60,
+0xA2, 0x65, 0xE2, 0x70, 0xA3, 0x83, 0xE9, 0xE0, 0xA4, 0x6A, 0xAE, 0x70, 0xA5, 0x35, 0xA7, 0x60,
+0xA6, 0x53, 0xCA, 0xF0, 0xA7, 0x15, 0x89, 0x60, 0xA8, 0x33, 0xAC, 0xF0, 0xA8, 0xFE, 0xA5, 0xE0,
+0xAA, 0x13, 0x8E, 0xF0, 0xAA, 0xDE, 0x87, 0xE0, 0xAB, 0xF3, 0x70, 0xF0, 0xAC, 0xBE, 0x69, 0xE0,
+0xAD, 0xD3, 0x52, 0xF0, 0xAE, 0x9E, 0x4B, 0xE0, 0xAF, 0xB3, 0x34, 0xF0, 0xB0, 0x7E, 0x2D, 0xE0,
+0xB1, 0x9C, 0x51, 0x70, 0xB2, 0x67, 0x4A, 0x60, 0xB3, 0x7C, 0x33, 0x70, 0xB4, 0x47, 0x2C, 0x60,
+0xB5, 0x5C, 0x15, 0x70, 0xB6, 0x27, 0x0E, 0x60, 0xB7, 0x3B, 0xF7, 0x70, 0xB8, 0x06, 0xF0, 0x60,
+0xB9, 0x1B, 0xD9, 0x70, 0xB9, 0xE6, 0xD2, 0x60, 0xBB, 0x04, 0xF5, 0xF0, 0xBB, 0xC6, 0xB4, 0x60,
+0xBC, 0xE4, 0xD7, 0xF0, 0xBD, 0xAF, 0xD0, 0xE0, 0xBE, 0xC4, 0xB9, 0xF0, 0xBF, 0x8F, 0xB2, 0xE0,
+0xC0, 0xA4, 0x9B, 0xF0, 0xC1, 0x6F, 0x94, 0xE0, 0xC2, 0x84, 0x7D, 0xF0, 0xC3, 0x4F, 0x76, 0xE0,
+0xC4, 0x64, 0x5F, 0xF0, 0xC5, 0x2F, 0x58, 0xE0, 0xC6, 0x4D, 0x7C, 0x70, 0xC7, 0x0F, 0x3A, 0xE0,
+0xC8, 0x2D, 0x5E, 0x70, 0xC8, 0xF8, 0x57, 0x60, 0xCA, 0x0D, 0x40, 0x70, 0xCA, 0xD8, 0x39, 0x60,
+0xCB, 0x88, 0xF0, 0x70, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x60, 0xFB, 0xE0, 0xD3, 0x75, 0xE4, 0xF0,
+0xD4, 0x40, 0xDD, 0xE0, 0xD5, 0x55, 0xC6, 0xF0, 0xD6, 0x20, 0xBF, 0xE0, 0xD7, 0x35, 0xA8, 0xF0,
+0xD8, 0x00, 0xA1, 0xE0, 0xD9, 0x15, 0x8A, 0xF0, 0xD9, 0xE0, 0x83, 0xE0, 0xDA, 0xFE, 0xA7, 0x70,
+0xDB, 0xC0, 0x65, 0xE0, 0xDC, 0xDE, 0x89, 0x70, 0xDD, 0xA9, 0x82, 0x60, 0xDE, 0xBE, 0x6B, 0x70,
+0xDF, 0x89, 0x64, 0x60, 0xE0, 0x9E, 0x4D, 0x70, 0xE1, 0x69, 0x46, 0x60, 0xE2, 0x7E, 0x2F, 0x70,
+0xE3, 0x49, 0x28, 0x60, 0xE4, 0x5E, 0x11, 0x70, 0xE5, 0x57, 0x2E, 0xE0, 0xE6, 0x47, 0x2D, 0xF0,
+0xE7, 0x37, 0x10, 0xE0, 0xE8, 0x27, 0x0F, 0xF0, 0xE9, 0x16, 0xF2, 0xE0, 0xEA, 0x06, 0xF1, 0xF0,
+0xEA, 0xF6, 0xD4, 0xE0, 0xEB, 0xE6, 0xD3, 0xF0, 0xEC, 0xD6, 0xB6, 0xE0, 0xED, 0xC6, 0xB5, 0xF0,
+0xEE, 0xBF, 0xD3, 0x60, 0xEF, 0xAF, 0xD2, 0x70, 0xF0, 0x9F, 0xB5, 0x60, 0xF1, 0x8F, 0xB4, 0x70,
+0xF2, 0x7F, 0x97, 0x60, 0xF3, 0x6F, 0x96, 0x70, 0xF4, 0x5F, 0x79, 0x60, 0xF5, 0x4F, 0x78, 0x70,
+0xF6, 0x3F, 0x5B, 0x60, 0xF7, 0x2F, 0x5A, 0x70, 0xF8, 0x28, 0x77, 0xE0, 0xF9, 0x0F, 0x3C, 0x70,
+0xFA, 0x08, 0x59, 0xE0, 0xFA, 0xF8, 0x58, 0xF0, 0xFB, 0xE8, 0x3B, 0xE0, 0xFC, 0xD8, 0x3A, 0xF0,
+0xFD, 0xC8, 0x1D, 0xE0, 0xFE, 0xB8, 0x1C, 0xF0, 0xFF, 0xA7, 0xFF, 0xE0, 0x00, 0x97, 0xFE, 0xF0,
+0x01, 0x87, 0xE1, 0xE0, 0x02, 0x77, 0xE0, 0xF0, 0x03, 0x70, 0xFE, 0x60, 0x04, 0x60, 0xFD, 0x70,
+0x05, 0x50, 0xE0, 0x60, 0x06, 0x40, 0xDF, 0x70, 0x07, 0x30, 0xC2, 0x60, 0x07, 0x8D, 0x19, 0x70,
+0x09, 0x10, 0xA4, 0x60, 0x09, 0xAD, 0x94, 0xF0, 0x0A, 0xF0, 0x86, 0x60, 0x0B, 0xE0, 0x85, 0x70,
+0x0C, 0xD9, 0xA2, 0xE0, 0x0D, 0xC0, 0x67, 0x70, 0x0E, 0xB9, 0x84, 0xE0, 0x0F, 0xA9, 0x83, 0xF0,
+0x10, 0x99, 0x66, 0xE0, 0x11, 0x89, 0x65, 0xF0, 0x12, 0x79, 0x48, 0xE0, 0x13, 0x69, 0x47, 0xF0,
+0x14, 0x59, 0x2A, 0xE0, 0x15, 0x49, 0x29, 0xF0, 0x16, 0x39, 0x0C, 0xE0, 0x17, 0x29, 0x0B, 0xF0,
+0x18, 0x22, 0x29, 0x60, 0x19, 0x08, 0xED, 0xF0, 0x1A, 0x02, 0x0B, 0x60, 0x1A, 0xF2, 0x0A, 0x70,
+0x1B, 0xE1, 0xED, 0x60, 0x1C, 0xD1, 0xEC, 0x70, 0x1D, 0xC1, 0xCF, 0x60, 0x1E, 0xB1, 0xCE, 0x70,
+0x1F, 0xA1, 0xB1, 0x60, 0x20, 0x76, 0x00, 0xF0, 0x21, 0x81, 0x93, 0x60, 0x22, 0x55, 0xE2, 0xF0,
+0x23, 0x6A, 0xAF, 0xE0, 0x24, 0x35, 0xC4, 0xF0, 0x25, 0x4A, 0x91, 0xE0, 0x26, 0x15, 0xA6, 0xF0,
+0x27, 0x2A, 0x73, 0xE0, 0x27, 0xFE, 0xC3, 0x70, 0x29, 0x0A, 0x55, 0xE0, 0x29, 0xDE, 0xA5, 0x70,
+0x2A, 0xEA, 0x37, 0xE0, 0x2B, 0xBE, 0x87, 0x70, 0x2C, 0xD3, 0x54, 0x60, 0x2D, 0x9E, 0x69, 0x70,
+0x2E, 0xB3, 0x36, 0x60, 0x2F, 0x7E, 0x4B, 0x70, 0x30, 0x93, 0x18, 0x60, 0x31, 0x67, 0x67, 0xF0,
+0x32, 0x72, 0xFA, 0x60, 0x33, 0x47, 0x49, 0xF0, 0x34, 0x52, 0xDC, 0x60, 0x35, 0x27, 0x2B, 0xF0,
+0x36, 0x32, 0xBE, 0x60, 0x37, 0x07, 0x0D, 0xF0, 0x38, 0x1B, 0xDA, 0xE0, 0x38, 0xE6, 0xEF, 0xF0,
+0x39, 0xFB, 0xBC, 0xE0, 0x3A, 0xC6, 0xD1, 0xF0, 0x3B, 0xDB, 0x9E, 0xE0, 0x3C, 0xAF, 0xEE, 0x70,
+0x3D, 0xBB, 0x80, 0xE0, 0x3E, 0x8F, 0xD0, 0x70, 0x3F, 0x9B, 0x62, 0xE0, 0x40, 0x6F, 0xB2, 0x70,
+0x41, 0x84, 0x7F, 0x60, 0x42, 0x4F, 0x94, 0x70, 0x43, 0x64, 0x61, 0x60, 0x44, 0x2F, 0x76, 0x70,
+0x45, 0x44, 0x43, 0x60, 0x45, 0xF3, 0xA8, 0xF0, 0x47, 0x2D, 0x5F, 0xE0, 0x47, 0xD3, 0x8A, 0xF0,
+0x49, 0x0D, 0x41, 0xE0, 0x49, 0xB3, 0x6C, 0xF0, 0x4A, 0xED, 0x23, 0xE0, 0x4B, 0x9C, 0x89, 0x70,
+0x4C, 0xD6, 0x40, 0x60, 0x4D, 0x7C, 0x6B, 0x70, 0x4E, 0xB6, 0x22, 0x60, 0x4F, 0x5C, 0x4D, 0x70,
+0x50, 0x96, 0x04, 0x60, 0x51, 0x3C, 0x2F, 0x70, 0x52, 0x75, 0xE6, 0x60, 0x53, 0x1C, 0x11, 0x70,
+0x54, 0x55, 0xC8, 0x60, 0x54, 0xFB, 0xF3, 0x70, 0x56, 0x35, 0xAA, 0x60, 0x56, 0xE5, 0x0F, 0xF0,
+0x58, 0x1E, 0xC6, 0xE0, 0x58, 0xC4, 0xF1, 0xF0, 0x59, 0xFE, 0xA8, 0xE0, 0x5A, 0xA4, 0xD3, 0xF0,
+0x5B, 0xDE, 0x8A, 0xE0, 0x5C, 0x84, 0xB5, 0xF0, 0x5D, 0xBE, 0x6C, 0xE0, 0x5E, 0x64, 0x97, 0xF0,
+0x5F, 0x9E, 0x4E, 0xE0, 0x60, 0x4D, 0xB4, 0x70, 0x61, 0x87, 0x6B, 0x60, 0x62, 0x2D, 0x96, 0x70,
+0x63, 0x67, 0x4D, 0x60, 0x64, 0x0D, 0x78, 0x70, 0x65, 0x47, 0x2F, 0x60, 0x65, 0xED, 0x5A, 0x70,
+0x67, 0x27, 0x11, 0x60, 0x67, 0xCD, 0x3C, 0x70, 0x69, 0x06, 0xF3, 0x60, 0x69, 0xAD, 0x1E, 0x70,
+0x6A, 0xE6, 0xD5, 0x60, 0x6B, 0x96, 0x3A, 0xF0, 0x6C, 0xCF, 0xF1, 0xE0, 0x6D, 0x76, 0x1C, 0xF0,
+0x6E, 0xAF, 0xD3, 0xE0, 0x6F, 0x55, 0xFE, 0xF0, 0x70, 0x8F, 0xB5, 0xE0, 0x71, 0x35, 0xE0, 0xF0,
+0x72, 0x6F, 0x97, 0xE0, 0x73, 0x15, 0xC2, 0xF0, 0x74, 0x4F, 0x79, 0xE0, 0x74, 0xFE, 0xDF, 0x70,
+0x76, 0x38, 0x96, 0x60, 0x76, 0xDE, 0xC1, 0x70, 0x78, 0x18, 0x78, 0x60, 0x78, 0xBE, 0xA3, 0x70,
+0x79, 0xF8, 0x5A, 0x60, 0x7A, 0x9E, 0x85, 0x70, 0x7B, 0xD8, 0x3C, 0x60, 0x7C, 0x7E, 0x67, 0x70,
+0x7D, 0xB8, 0x1E, 0x60, 0x7E, 0x5E, 0x49, 0x70, 0x7F, 0x98, 0x00, 0x60, 0x03, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x05, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xBA, 0x9E, 0x00, 0x00, 0xFF, 0xFF,
+0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08,
+0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00,
+0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x54, 0x5A, 0x69, 0x66,
+0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xEC,
+0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x03, 0xF0, 0x90,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x1E, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBA, 0xEB, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x00, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xCD, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x65, 0xE2, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x83, 0xE9, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x6A, 0xAE, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x35, 0xA7, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA6, 0x53, 0xCA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0x15, 0x89, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x33, 0xAC, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0xFE, 0xA5, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x13, 0x8E, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xDE, 0x87, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAB, 0xF3, 0x70, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAC, 0xBE, 0x69, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xD3, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0x9E, 0x4B, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xB3, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x7E, 0x2D, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x9C, 0x51, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x67, 0x4A, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x7C, 0x33, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x47, 0x2C, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB5, 0x5C, 0x15, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x27, 0x0E, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x3B, 0xF7, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x06, 0xF0, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0x1B, 0xD9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xE6, 0xD2, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0x04, 0xF5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0xC6, 0xB4, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xE4, 0xD7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xAF, 0xD0, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0xC4, 0xB9, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x8F, 0xB2, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0xA4, 0x9B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x6F, 0x94, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x84, 0x7D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x4F, 0x76, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x64, 0x5F, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x2F, 0x58, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x4D, 0x7C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x0F, 0x3A, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x2D, 0x5E, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0xF8, 0x57, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0x0D, 0x40, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xD8, 0x39, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xF0, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x60, 0xFB, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x75, 0xE4, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x40, 0xDD, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x55, 0xC6, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x20, 0xBF, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x35, 0xA8, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x00, 0xA1, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0x15, 0x8A, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE0, 0x83, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xFE, 0xA7, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x65, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0x89, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0x82, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x6B, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x64, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x9E, 0x4D, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x69, 0x46, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x2F, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x28, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x11, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x57, 0x2E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x2D, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x37, 0x10, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x0F, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0x16, 0xF2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0x06, 0xF1, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xF6, 0xD4, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xD3, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xD6, 0xB6, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xB5, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0xBF, 0xD3, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0xAF, 0xD2, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x9F, 0xB5, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x8F, 0xB4, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x7F, 0x97, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x6F, 0x96, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5F, 0x79, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x4F, 0x78, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x3F, 0x5B, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x5A, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x77, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0x0F, 0x3C, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08, 0x59, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x58, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x3B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x3A, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x1D, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x1C, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0xFE, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xE1, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xE0, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x03, 0x70, 0xFE, 0x60, 0x00, 0x00, 0x00, 0x00, 0x04, 0x60, 0xFD, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xE0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xDF, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xC2, 0x60, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x19, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xA4, 0x60, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0x94, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0x86, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x85, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xA2, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x67, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0x84, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x83, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x66, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x65, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x48, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x47, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x2A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x29, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x0C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x0B, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x29, 0x60, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xED, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x0B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x0A, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xED, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xEC, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xCF, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xCE, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xB1, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x00, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0x93, 0x60, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xE2, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xAF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xC4, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x91, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xA6, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x73, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xC3, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x55, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xA5, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x37, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x87, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x54, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x69, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x36, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x4B, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xFA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xDC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xBE, 0x60, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x0D, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xDA, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xEF, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xBC, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xD1, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x9E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xEE, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x80, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xD0, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x62, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xB2, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x7F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0x94, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x61, 0x60, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x76, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x43, 0x60, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x5F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0x8A, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x41, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x6C, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x23, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0x89, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x40, 0x60, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x6B, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x22, 0x60, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x4D, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x04, 0x60, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x2F, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x52, 0x75, 0xE6, 0x60, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x11, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xC8, 0x60, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFB, 0xF3, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xAA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x0F, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xC6, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC4, 0xF1, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xA8, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xD3, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0x8A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xB5, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x6C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0x97, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x4E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xB4, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x6B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0x96, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x4D, 0x60, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x78, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x2F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x5A, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x11, 0x60, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x3C, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x69, 0x06, 0xF3, 0x60, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x1E, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xD5, 0x60, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x3A, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x6C, 0xCF, 0xF1, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x1C, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xD3, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x55, 0xFE, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xB5, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xE0, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0x97, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xC2, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x79, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xDF, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0x96, 0x60, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xC1, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x78, 0x60, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xA3, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x5A, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0x85, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x3C, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x67, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x1E, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x49, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x00, 0x60, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x05, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xBA, 0x9E, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04,
+0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xC7, 0xC0,
+0x01, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00,
+0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x0A, 0x45, 0x53, 0x54, 0x35, 0x45, 0x44, 0x54,
+0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Etc/GMT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -58576,19 +59091,19 @@
 
 /* Europe/Lisbon */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x1B, 0x80, 0x00, 0x00, 0x00,
-0x92, 0xE6, 0x8E, 0x80, 0x9B, 0x4B, 0x6D, 0x70, 0x9B, 0xFE, 0xC7, 0x80, 0x9C, 0x9C, 0xED, 0x70,
-0x9D, 0xC9, 0x83, 0x70, 0x9E, 0x7F, 0x72, 0x70, 0x9F, 0xAA, 0xB6, 0xF0, 0xA0, 0x5F, 0x54, 0x70,
-0xA1, 0x8B, 0xEA, 0x70, 0xA2, 0x41, 0xD9, 0x70, 0xA3, 0x6E, 0x6F, 0x70, 0xA4, 0x23, 0x0C, 0xF0,
-0xA5, 0x4F, 0xA2, 0xF0, 0xAA, 0x05, 0xEF, 0x70, 0xAA, 0xF4, 0x8E, 0xF0, 0xAD, 0xC9, 0xA7, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xE1, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1B, 0x80, 0x00, 0x00, 0x00,
+0x92, 0xE6, 0x8E, 0x80, 0x9B, 0x4B, 0x6D, 0x70, 0x9B, 0xFE, 0xC7, 0x80, 0x9C, 0x9C, 0xFB, 0x80,
+0x9D, 0xC9, 0x83, 0x70, 0x9E, 0x7E, 0x2F, 0x00, 0x9F, 0xAA, 0xB6, 0xF0, 0xA0, 0x5F, 0x62, 0x80,
+0xA1, 0x8B, 0xEA, 0x70, 0xA2, 0x41, 0xE7, 0x80, 0xA3, 0x6E, 0x6F, 0x70, 0xA4, 0x23, 0x1B, 0x00,
+0xA5, 0x4F, 0xA2, 0xF0, 0xAA, 0x05, 0xEF, 0x70, 0xAA, 0xE7, 0x5F, 0xF0, 0xAD, 0xC9, 0xA7, 0xF0,
 0xAE, 0xA7, 0x23, 0xF0, 0xAF, 0xA0, 0x4F, 0x70, 0xB0, 0x87, 0x05, 0xF0, 0xB1, 0x89, 0x6B, 0xF0,
 0xB2, 0x70, 0x22, 0x70, 0xB3, 0x72, 0x88, 0x70, 0xB4, 0x50, 0x04, 0x70, 0xB7, 0x32, 0x4C, 0x70,
 0xB8, 0x0F, 0xC8, 0x70, 0xB8, 0xFF, 0xB9, 0x70, 0xB9, 0xEF, 0xAA, 0x70, 0xBC, 0xC8, 0xB7, 0xF0,
 0xBD, 0xB8, 0xA8, 0xF0, 0xBE, 0x9F, 0x5F, 0x70, 0xBF, 0x98, 0x8A, 0xF0, 0xC0, 0x9A, 0xF0, 0xF0,
 0xC1, 0x78, 0x6C, 0xF0, 0xC2, 0x68, 0x5D, 0xF0, 0xC3, 0x58, 0x4E, 0xF0, 0xC4, 0x3F, 0x05, 0x70,
 0xC5, 0x38, 0x30, 0xF0, 0xC6, 0x3A, 0x96, 0xF0, 0xC7, 0x58, 0xAC, 0x70, 0xC7, 0xD9, 0xDF, 0x70,
-0xC9, 0x01, 0x2F, 0x70, 0xC9, 0xF1, 0x20, 0x70, 0xCA, 0xE2, 0x62, 0xF0, 0xCB, 0xB5, 0x52, 0xF0,
+0xC9, 0x03, 0xD2, 0x70, 0xC9, 0xF1, 0x20, 0x70, 0xCA, 0xE2, 0x62, 0xF0, 0xCB, 0xB5, 0x52, 0xF0,
 0xCB, 0xEC, 0xA3, 0xE0, 0xCC, 0x80, 0x4B, 0xE0, 0xCC, 0xDC, 0xA2, 0xF0, 0xCD, 0x95, 0x34, 0xF0,
 0xCD, 0xC3, 0x4B, 0x60, 0xCE, 0x72, 0xA2, 0xE0, 0xCE, 0xC5, 0xBF, 0x70, 0xCF, 0x75, 0x16, 0xF0,
 0xCF, 0xAC, 0x67, 0xE0, 0xD0, 0x52, 0x84, 0xE0, 0xD0, 0xA5, 0xA1, 0x70, 0xD1, 0x54, 0xF8, 0xF0,
@@ -58603,199 +59118,201 @@
 0xEE, 0x9A, 0xB1, 0x20, 0xEF, 0x8A, 0xA2, 0x20, 0xF0, 0x7A, 0x93, 0x20, 0xF1, 0x6A, 0x84, 0x20,
 0xF2, 0x63, 0xAF, 0xA0, 0xF3, 0x53, 0xA0, 0xA0, 0xF4, 0x43, 0x91, 0xA0, 0xF5, 0x33, 0x82, 0xA0,
 0xF6, 0x23, 0x73, 0xA0, 0xF7, 0x13, 0x64, 0xA0, 0xF8, 0x03, 0x55, 0xA0, 0xF8, 0xF3, 0x46, 0xA0,
-0x0C, 0xAB, 0x2A, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x0F, 0x84, 0x37, 0x80,
-0x10, 0x74, 0x28, 0x80, 0x11, 0x64, 0x19, 0x80, 0x12, 0x54, 0x18, 0x90, 0x13, 0x43, 0xFB, 0x80,
-0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xEB, 0x90, 0x16, 0x13, 0xDC, 0x90, 0x17, 0x03, 0xCD, 0x90,
-0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xBD, 0xA0, 0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90,
-0x1B, 0xBC, 0xBD, 0x10, 0x1C, 0xAC, 0xAE, 0x10, 0x1D, 0x9C, 0x9F, 0x10, 0x1E, 0x8C, 0x90, 0x10,
-0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10, 0x21, 0x5C, 0x63, 0x10, 0x22, 0x4C, 0x54, 0x10,
-0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10, 0x25, 0x1C, 0x27, 0x10, 0x26, 0x0C, 0x18, 0x10,
-0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90, 0x28, 0xE5, 0x25, 0x90, 0x29, 0xD5, 0x16, 0x90,
-0x2A, 0xC5, 0x07, 0x90, 0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0xA4, 0xE9, 0x90, 0x2D, 0x94, 0xDA, 0x90,
-0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90, 0x31, 0x5D, 0xD9, 0x10,
-0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10, 0x35, 0x1D, 0x9D, 0x10,
-0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90, 0x38, 0xDD, 0x61, 0x10,
-0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90, 0x3C, 0xA6, 0x5F, 0x90,
-0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90, 0x40, 0x66, 0x23, 0x90,
-0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10, 0x44, 0x25, 0xE7, 0x90,
-0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10, 0x47, 0xEE, 0xE6, 0x10,
-0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10, 0x4B, 0xAE, 0xAA, 0x10,
-0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90, 0x4F, 0x6E, 0x6E, 0x10,
-0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90, 0x53, 0x37, 0x6C, 0x90,
-0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90, 0x56, 0xF7, 0x30, 0x90,
-0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10, 0x5A, 0xB6, 0xF4, 0x90,
-0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10, 0x5E, 0x7F, 0xF3, 0x10,
-0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90, 0x62, 0x3F, 0xB7, 0x10,
-0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90, 0x66, 0x08, 0xB5, 0x90,
-0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90, 0x69, 0xC8, 0x79, 0x90,
-0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10, 0x6D, 0x88, 0x3D, 0x90,
-0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10, 0x71, 0x51, 0x3C, 0x10,
-0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10,
-0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10,
-0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90,
-0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x00, 0x06, 0x01, 0x02,
+0xF9, 0xE3, 0x37, 0xA0, 0x0C, 0xAB, 0x2A, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x0E, 0x8B, 0x0C, 0x00,
+0x0F, 0x84, 0x45, 0x90, 0x10, 0x74, 0x36, 0x90, 0x11, 0x64, 0x27, 0x90, 0x12, 0x54, 0x18, 0x90,
+0x13, 0x4D, 0x44, 0x10, 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xDD, 0x80, 0x16, 0x13, 0xCE, 0x80,
+0x17, 0x03, 0xBF, 0x80, 0x17, 0xF3, 0xB0, 0x80, 0x18, 0xE3, 0xA1, 0x80, 0x19, 0xD3, 0x92, 0x80,
+0x1A, 0xC3, 0x83, 0x80, 0x1B, 0xBC, 0xAF, 0x00, 0x1C, 0xAC, 0xA0, 0x00, 0x1D, 0x9C, 0x91, 0x00,
+0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10, 0x21, 0x5C, 0x63, 0x10,
+0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10, 0x25, 0x1C, 0x27, 0x10,
+0x26, 0x0C, 0x18, 0x10, 0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90, 0x28, 0xE5, 0x25, 0x90,
+0x29, 0xD5, 0x16, 0x90, 0x2A, 0xC5, 0x07, 0x90, 0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0xA4, 0xE9, 0x90,
+0x2D, 0x94, 0xDA, 0x90, 0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90,
+0x31, 0x5D, 0xD9, 0x10, 0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10,
+0x35, 0x1D, 0x9D, 0x10, 0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90,
+0x38, 0xDD, 0x61, 0x10, 0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90,
+0x3C, 0xA6, 0x5F, 0x90, 0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90,
+0x40, 0x66, 0x23, 0x90, 0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10,
+0x44, 0x25, 0xE7, 0x90, 0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10,
+0x47, 0xEE, 0xE6, 0x10, 0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10,
+0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90,
+0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90,
+0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90,
+0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10,
+0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10,
+0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90,
+0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90,
+0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90,
+0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10,
+0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10,
+0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10,
+0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90,
+0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90,
+0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90,
+0x00, 0x06, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
+0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
-0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x07, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00,
+0x12, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C,
+0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C,
+0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54,
+0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE1, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1B,
+0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x8E, 0x80,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xC7, 0x80,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x2F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x22, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0x88, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x04, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x4C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xC8, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xB9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xAA, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xB7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xA8, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x5F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0x8A, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9A, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x6C, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x4E, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x30, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xAC, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xD2, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x62, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xA3, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xA2, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xC3, 0x4B, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xA2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xC5, 0xBF, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x16, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0xAC, 0x67, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0x84, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xA5, 0xA1, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x54, 0xF8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x8C, 0x49, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x85, 0x83, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xC4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x49, 0xB5, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xD1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x29, 0xC2, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xB3, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x09, 0xA4, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0x95, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE9, 0x86, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x77, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC9, 0x68, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x59, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xB2, 0x84, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x75, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x92, 0x66, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x57, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x72, 0x48, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x39, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x52, 0x2A, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x1B, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x32, 0x0C, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x21, 0xFD, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x1B, 0x29, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x1A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xFB, 0x0B, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEA, 0xFC, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xDA, 0xED, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xBA, 0xCF, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xC0, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x9A, 0xB1, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xA2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x7A, 0x93, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0x84, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x63, 0xAF, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x91, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x73, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x55, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x37, 0xA0,
+0x00, 0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xDD, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xCE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xBF, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xA1, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x83, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x00, 0x06, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x07, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
+0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0xFF, 0xFF, 0xF7, 0x63,
-0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00,
-0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x0E, 0x10,
-0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54,
-0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00,
-0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x0C, 0x00,
-0x00, 0x00, 0x1B, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92,
-0xE6, 0x8E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B,
-0xFE, 0xC7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xED, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D,
-0xC9, 0x83, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x72, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F,
-0xAA, 0xB6, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x54, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1,
-0x8B, 0xEA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xD9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3,
-0x6E, 0x6F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x0C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5,
-0x4F, 0xA2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA,
-0xF4, 0x8E, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE,
-0xA7, 0x23, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0,
-0x87, 0x05, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2,
-0x70, 0x22, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0x88, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4,
-0x50, 0x04, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x4C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8,
-0x0F, 0xC8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xB9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9,
-0xEF, 0xAA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xB7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD,
-0xB8, 0xA8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x5F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF,
-0x98, 0x8A, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9A, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1,
-0x78, 0x6C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3,
-0x58, 0x4E, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5,
-0x38, 0x30, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7,
-0x58, 0xAC, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9,
-0x01, 0x2F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA,
-0xE2, 0x62, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB,
-0xEC, 0xA3, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC,
-0xDC, 0xA2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD,
-0xC3, 0x4B, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xA2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE,
-0xC5, 0xBF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x16, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF,
-0xAC, 0x67, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0x84, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0,
-0xA5, 0xA1, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x54, 0xF8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1,
-0x8C, 0x49, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2,
-0x85, 0x83, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xC4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4,
-0x49, 0xB5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xD1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6,
-0x29, 0xC2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xB3, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8,
-0x09, 0xA4, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0x95, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9,
-0xE9, 0x86, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x77, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB,
-0xC9, 0x68, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x59, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD,
-0xB2, 0x84, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x75, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF,
-0x92, 0x66, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x57, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1,
-0x72, 0x48, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x39, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3,
-0x52, 0x2A, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x1B, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5,
-0x32, 0x0C, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x21, 0xFD, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7,
-0x1B, 0x29, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x1A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8,
-0xFB, 0x0B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEA, 0xFC, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA,
-0xDA, 0xED, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC,
-0xBA, 0xCF, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xC0, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE,
-0x9A, 0xB1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xA2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0,
-0x7A, 0x93, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0x84, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2,
-0x63, 0xAF, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4,
-0x43, 0x91, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6,
-0x23, 0x73, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8,
-0x03, 0x55, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C,
-0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E,
-0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10,
-0x74, 0x28, 0x80, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x19, 0x80, 0x00, 0x00, 0x00, 0x00, 0x12,
-0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x43, 0xFB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x14,
-0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16,
-0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17,
-0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xBD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x19,
-0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B,
-0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D,
-0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F,
-0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21,
-0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23,
-0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25,
-0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27,
-0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28,
-0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A,
-0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C,
-0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E,
-0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30,
-0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32,
-0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34,
-0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
-0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38,
-0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39,
-0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B,
-0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D,
-0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F,
-0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41,
-0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43,
-0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45,
-0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47,
-0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
-0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A,
-0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C,
-0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E,
-0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50,
-0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52,
-0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54,
-0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56,
-0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58,
-0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59,
-0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B,
-0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D,
-0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F,
-0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61,
-0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63,
-0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65,
-0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67,
-0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68,
-0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A,
-0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C,
-0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E,
-0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70,
-0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72,
-0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74,
-0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76,
-0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78,
-0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79,
-0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B,
-0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D,
-0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F,
-0x8E, 0x7F, 0x90, 0x00, 0x06, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x07, 0x02, 0x03,
 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x07, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E,
-0x10, 0x00, 0x12, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x00,
-0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x57,
-0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54,
-0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01,
-0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x57,
-0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31,
-0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0xC4, 0x67, 0xF2, 0x01, 0x04, 0xB8,
-0xCA, 0x00, 0x00, 0x00, 0x13, 0x50, 0x6F, 0x72, 0x74, 0x75, 0x67, 0x61, 0x6C, 0x20, 0x28, 0x6D,
-0x61, 0x69, 0x6E, 0x6C, 0x61, 0x6E, 0x64, 0x29, 
+0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00,
+0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00,
+0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00,
+0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x57, 0x45, 0x54,
+0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D,
+0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0xC4, 0x67, 0xF2, 0x01, 0x04, 0xB8, 0xCA, 0x00,
+0x00, 0x00, 0x13, 0x50, 0x6F, 0x72, 0x74, 0x75, 0x67, 0x61, 0x6C, 0x20, 0x28, 0x6D, 0x61, 0x69,
+0x6E, 0x6C, 0x61, 0x6E, 0x64, 0x29, 
 
 /* Europe/Ljubljana */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x53, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -64577,13 +65094,27 @@
 
 /* HST */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0x73, 0x60,
-0x00, 0x00, 0x48, 0x53, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x04, 0xFF, 0xFF, 0x73, 0x60, 0x00, 0x00, 0x48, 0x53, 0x54, 0x00, 0x0A, 0x48, 0x53, 0x54,
-0x31, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0x80, 0x00, 0x00, 0x00,
+0xBB, 0x05, 0x43, 0x48, 0xBB, 0x21, 0x71, 0x58, 0xCB, 0x89, 0x3D, 0xC8, 0xD2, 0x23, 0xF4, 0x70,
+0xD2, 0x61, 0x49, 0x38, 0xD5, 0x8D, 0x73, 0x48, 0x01, 0x02, 0x01, 0x03, 0x04, 0x01, 0x05, 0xFF,
+0xFF, 0x6C, 0x02, 0x00, 0x00, 0xFF, 0xFF, 0x6C, 0x58, 0x00, 0x04, 0xFF, 0xFF, 0x7A, 0x68, 0x01,
+0x08, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x0C, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x10, 0xFF, 0xFF, 0x73,
+0x60, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x53, 0x54, 0x00, 0x48, 0x44, 0x54, 0x00, 0x48,
+0x57, 0x54, 0x00, 0x48, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0x74, 0xE0, 0x70, 0xBE, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0x05, 0x43, 0x48, 0xFF,
+0xFF, 0xFF, 0xFF, 0xBB, 0x21, 0x71, 0x58, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x3D, 0xC8, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x49, 0x38, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD5, 0x8D, 0x73, 0x48, 0x01, 0x02, 0x01, 0x03, 0x04, 0x01, 0x05, 0xFF, 0xFF,
+0x6C, 0x02, 0x00, 0x00, 0xFF, 0xFF, 0x6C, 0x58, 0x00, 0x04, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x08,
+0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x0C, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 0x10, 0xFF, 0xFF, 0x73, 0x60,
+0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x48, 0x53, 0x54, 0x00, 0x48, 0x44, 0x54, 0x00, 0x48, 0x57,
+0x54, 0x00, 0x48, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x0A, 0x48, 0x53, 0x54, 0x31, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Iceland */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -65109,12 +65640,24 @@
 
 /* MET */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0x9B, 0x0C, 0x17, 0x60,
-0x9B, 0xD5, 0xDA, 0xF0, 0x9C, 0xD9, 0xAE, 0x90, 0x9D, 0xA4, 0xB5, 0x90, 0x9E, 0xB9, 0x90, 0x90,
-0x9F, 0x84, 0x97, 0x90, 0xC8, 0x09, 0x71, 0x90, 0xCC, 0xE7, 0x4B, 0x10, 0xCD, 0xA9, 0x17, 0x90,
-0xCE, 0xA2, 0x43, 0x10, 0xCF, 0x92, 0x34, 0x10, 0xD0, 0x82, 0x25, 0x10, 0xD1, 0x72, 0x16, 0x10,
-0xD2, 0x4E, 0x40, 0x90, 0x0D, 0xA4, 0x63, 0x90, 0x0E, 0x8B, 0x1A, 0x10, 0x0F, 0x84, 0x45, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x16, 0x80, 0x00, 0x00, 0x00,
+0x98, 0x44, 0x49, 0x80, 0x9B, 0x0C, 0x25, 0x70, 0x9B, 0xD5, 0xDA, 0xF0, 0x9C, 0xD9, 0xAE, 0x90,
+0x9D, 0xA4, 0xB5, 0x90, 0x9E, 0xB9, 0x90, 0x90, 0x9F, 0x84, 0x97, 0x90, 0x9F, 0xCE, 0xF8, 0x30,
+0xA0, 0x60, 0xA5, 0xF0, 0xA1, 0x7E, 0xBB, 0x70, 0xA2, 0x2E, 0x12, 0xF0, 0xA3, 0x7A, 0x4C, 0xF0,
+0xA4, 0x35, 0x81, 0xF0, 0xA5, 0x5E, 0x23, 0x70, 0xA6, 0x25, 0x35, 0xF0, 0xA7, 0x27, 0x9B, 0xF0,
+0xA8, 0x2A, 0x01, 0xF0, 0xA9, 0x07, 0x7D, 0xF0, 0xA9, 0xEE, 0x34, 0x70, 0xAA, 0xE7, 0x5F, 0xF0,
+0xAB, 0xD7, 0x50, 0xF0, 0xAC, 0xC7, 0x41, 0xF0, 0xAD, 0xC9, 0xA7, 0xF0, 0xAE, 0xA7, 0x23, 0xF0,
+0xAF, 0xA0, 0x4F, 0x70, 0xB0, 0x87, 0x05, 0xF0, 0xB1, 0x89, 0x6B, 0xF0, 0xB2, 0x70, 0x4C, 0xA0,
+0xB3, 0x72, 0xB2, 0xA0, 0xB4, 0x50, 0x2E, 0xA0, 0xB5, 0x49, 0x5A, 0x20, 0xB6, 0x30, 0x10, 0xA0,
+0xB7, 0x32, 0x76, 0xA0, 0xB8, 0x0F, 0xF2, 0xA0, 0xB8, 0xFF, 0xE3, 0xA0, 0xB9, 0xEF, 0xD4, 0xA0,
+0xBA, 0xD6, 0x8B, 0x20, 0xBB, 0xD8, 0xF1, 0x20, 0xBC, 0xC8, 0xE2, 0x20, 0xBD, 0xB8, 0xD3, 0x20,
+0xBE, 0x9F, 0x89, 0xA0, 0xBF, 0x98, 0xB5, 0x20, 0xC0, 0x9B, 0x1B, 0x20, 0xC1, 0x78, 0x97, 0x20,
+0xC2, 0x68, 0x88, 0x20, 0xC3, 0x58, 0x79, 0x20, 0xC4, 0x3F, 0x2F, 0xA0, 0xC5, 0x38, 0x5B, 0x20,
+0xC6, 0x3A, 0xC1, 0x20, 0xC7, 0x58, 0xD6, 0xA0, 0xC7, 0xDA, 0x09, 0xA0, 0xC8, 0x4A, 0x19, 0x20,
+0xCC, 0xE7, 0x4B, 0x10, 0xCD, 0xA9, 0x17, 0x90, 0xCE, 0xA2, 0x43, 0x10, 0xCF, 0x92, 0x34, 0x10,
+0xD0, 0x6E, 0x5E, 0x90, 0xD1, 0x72, 0x16, 0x10, 0xD2, 0x4E, 0x40, 0x90, 0xD3, 0x91, 0x40, 0x10,
+0xD4, 0x4B, 0x23, 0x90, 0x0D, 0xA4, 0x63, 0x90, 0x0E, 0x8B, 0x1A, 0x10, 0x0F, 0x84, 0x45, 0x90,
 0x10, 0x74, 0x36, 0x90, 0x11, 0x64, 0x27, 0x90, 0x12, 0x54, 0x18, 0x90, 0x13, 0x4D, 0x44, 0x10,
 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xEB, 0x90, 0x16, 0x13, 0xDC, 0x90, 0x17, 0x03, 0xCD, 0x90,
 0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xAF, 0x90, 0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90,
@@ -65144,145 +65687,187 @@
 0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10,
 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10,
 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90,
-0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x00, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00,
-0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x4D, 0x45, 0x53, 0x54,
-0x00, 0x4D, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00,
-0x04, 0x00, 0x00, 0x00, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x17, 0x60, 0xFF, 0xFF, 0xFF,
-0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x09, 0x71, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF, 0xFF, 0xFF,
-0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF, 0xFF, 0xFF,
-0xFF, 0xD0, 0x82, 0x25, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF, 0xFF, 0xFF,
-0xFF, 0xD2, 0x4E, 0x40, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x0E,
-0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00,
-0x00, 0x0E, 0x10, 0x00, 0x05, 0x4D, 0x45, 0x53, 0x54, 0x00, 0x4D, 0x45, 0x54, 0x00, 0x00, 0x00,
-0x01, 0x01, 0x0A, 0x4D, 0x45, 0x54, 0x2D, 0x31, 0x4D, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E,
-0x35, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x02, 0x05, 0x02,
+0x03, 0x04, 0x03, 0x04, 0x08, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
+0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
+0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x00, 0x00, 0x04, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
+0x00, 0x00, 0x0E, 0x10, 0x00, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0C, 0x00, 0x00, 0x0E, 0x10,
+0x00, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0C, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x11, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0C,
+0x00, 0x00, 0x0E, 0x10, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x43, 0x45,
+0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xB9, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x1A, 0xFF, 0xFF,
+0xFF, 0xFF, 0x56, 0xB6, 0xDF, 0xE6, 0xFF, 0xFF, 0xFF, 0xFF, 0x6D, 0xE8, 0xC8, 0x00, 0xFF, 0xFF,
+0xFF, 0xFF, 0x98, 0x44, 0x49, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x0C, 0x25, 0x70, 0xFF, 0xFF,
+0xFF, 0xFF, 0x9B, 0xD5, 0xDA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0xD9, 0xAE, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0x9D, 0xA4, 0xB5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xB9, 0x90, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0x9F, 0x84, 0x97, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xCE, 0xF8, 0x30, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA0, 0x60, 0xA5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x7E, 0xBB, 0x70, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA2, 0x2E, 0x12, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x7A, 0x4C, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA4, 0x35, 0x81, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x5E, 0x23, 0x70, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA6, 0x25, 0x35, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0x27, 0x9B, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA8, 0x2A, 0x01, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x07, 0x7D, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA9, 0xEE, 0x34, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xAB, 0xD7, 0x50, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAC, 0xC7, 0x41, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x4C, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB3, 0x72, 0xB2, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x2E, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB5, 0x49, 0x5A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x30, 0x10, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB7, 0x32, 0x76, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xF2, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB8, 0xFF, 0xE3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xD4, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xBA, 0xD6, 0x8B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBB, 0xD8, 0xF1, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xBC, 0xC8, 0xE2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xD3, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xBE, 0x9F, 0x89, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0xB5, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC0, 0x9B, 0x1B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x97, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC2, 0x68, 0x88, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x79, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC4, 0x3F, 0x2F, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x5B, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC6, 0x3A, 0xC1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xD6, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xC7, 0xDA, 0x09, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x4A, 0x19, 0x20, 0xFF, 0xFF,
+0xFF, 0xFF, 0xCC, 0xE7, 0x4B, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xA9, 0x17, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xCE, 0xA2, 0x43, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x92, 0x34, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD0, 0x6E, 0x5E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x72, 0x16, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD2, 0x4E, 0x40, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x91, 0x40, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD4, 0x4B, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x0E, 0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x02, 0x03, 0x06, 0x03, 0x04, 0x05, 0x04, 0x05, 0x09,
+0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08,
+0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08,
+0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x04, 0x05, 0x04, 0x05, 0x04,
+0x05, 0x04, 0x05, 0x04, 0x05, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A,
+0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x0A, 0x0B, 0x00,
+0x00, 0x04, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x04, 0x1A, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x10, 0x00, 0x00, 0x0E,
+0x10, 0x00, 0x0C, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x10, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x15, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x1C, 0x20, 0x01,
+0x10, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x4D, 0x54, 0x00, 0x57,
+0x45, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x0A, 0x43, 0x45, 0x54, 0x2D, 0x31, 0x43,
+0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35,
+0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 
 
 /* Mexico/BajaNorte */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
-0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF2, 0x7C, 0xF0, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
-0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x99, 0xBA, 0x70,
-0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90,
-0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90, 0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10,
-0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10, 0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10,
-0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10, 0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10,
-0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10, 0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10,
-0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10, 0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10,
-0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10, 0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10,
-0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90, 0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90,
-0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90, 0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90,
-0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90, 0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90,
-0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10, 0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10,
-0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10, 0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10,
-0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10, 0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90,
-0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90, 0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90,
-0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90, 0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90,
-0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90, 0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10,
-0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10, 0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10,
-0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10, 0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10,
-0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90, 0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90,
-0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90, 0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90,
-0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90, 0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90,
-0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90, 0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90,
-0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90, 0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90,
-0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90, 0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90,
-0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10, 0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10,
-0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10, 0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10,
-0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10, 0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90,
-0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90, 0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90,
-0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90, 0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90,
-0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90, 0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10,
-0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10, 0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10,
-0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10, 0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10,
-0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90, 0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90,
-0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90, 0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90,
-0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90, 0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90,
-0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x00, 0x00, 0x00, 0x9B, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
+0xA9, 0x79, 0x4F, 0x70, 0xAF, 0xF1, 0x39, 0x80, 0xB6, 0x66, 0x64, 0x70, 0xB7, 0x1B, 0x10, 0x00,
+0xB8, 0x0A, 0xF2, 0xF0, 0xCB, 0xEA, 0x8D, 0x80, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x9D, 0xAE, 0xF0,
+0xD7, 0x1B, 0x59, 0x00, 0xD8, 0x91, 0xB4, 0xF0, 0xDB, 0x00, 0x07, 0x00, 0xDB, 0xC0, 0x73, 0xF0,
+0xDC, 0xDE, 0xB3, 0xA0, 0xDD, 0xA9, 0xAC, 0x90, 0xDE, 0xBE, 0x95, 0xA0, 0xDF, 0x89, 0x8E, 0x90,
+0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90, 0xE4, 0x5E, 0x2D, 0x90, 0xE5, 0x29, 0x34, 0x90,
+0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10, 0xE8, 0x27, 0x2C, 0x10, 0xE8, 0xF2, 0x33, 0x10,
+0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10, 0xEB, 0xE6, 0xF0, 0x10, 0xEC, 0xB1, 0xF7, 0x10,
+0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10, 0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10,
+0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10, 0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10,
+0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10, 0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10,
+0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10, 0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90,
+0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90, 0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90,
+0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90, 0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90,
+0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90, 0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10,
+0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10, 0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10,
+0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10, 0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10,
+0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90, 0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90,
+0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90, 0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90,
+0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90, 0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90,
+0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10, 0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10,
+0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10, 0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10,
+0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10, 0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90,
+0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90, 0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90,
+0x46, 0x0F, 0x82, 0xA0, 0x47, 0x24, 0x4F, 0x90, 0x47, 0xF8, 0x9F, 0x20, 0x49, 0x04, 0x31, 0x90,
+0x49, 0xD8, 0x81, 0x20, 0x4A, 0xE4, 0x13, 0x90, 0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90,
+0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90, 0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90,
+0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90, 0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90,
+0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90, 0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10,
+0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10, 0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10,
+0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10, 0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10,
+0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90, 0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90,
+0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90, 0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90,
+0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90, 0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90,
+0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10, 0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10,
+0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10, 0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10,
+0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10, 0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90,
+0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90, 0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90,
+0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90, 0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90,
+0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
@@ -65291,90 +65876,94 @@
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
-0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D,
-0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF,
-0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54,
-0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x7C,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D,
-0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x99, 0xBA,
-0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4,
-0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A,
-0x90, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
+0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F,
+0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50,
+0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0x00,
+0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA9, 0x79, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x39, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x64, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x1B, 0x10, 0x00, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0x0A, 0xF2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x8D, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x9D, 0xAE, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD7, 0x1B, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDB, 0x00, 0x07, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x73, 0xF0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDC, 0xDE, 0xB3, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xDE, 0xBE, 0x95, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x46, 0x0F, 0x82, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x4F, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x47, 0xF8, 0x9F, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x31, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x49, 0xD8, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x13, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A, 0x90, 0x01,
+0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x06, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
@@ -65383,95 +65972,91 @@
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
-0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF,
-0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x14,
-0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53,
-0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x50,
-0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 
+0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xFF, 0xFF, 0x92, 0x4C, 0x00, 0x00,
+0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90,
+0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF,
+0x9D, 0x90, 0x01, 0x14, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53,
+0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50,
+0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
+0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Mexico/BajaSur */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
-0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0xD8, 0x91, 0xB4, 0xF0, 0x00, 0x00, 0x70, 0x80,
-0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80,
-0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00,
-0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xF5, 0x12, 0x90, 0x3B, 0xB6, 0xD1, 0x00,
-0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00,
-0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80, 0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80,
-0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80, 0x46, 0x0F, 0x74, 0x90, 0x47, 0x24, 0x41, 0x80,
-0x47, 0xF8, 0x91, 0x10, 0x49, 0x04, 0x23, 0x80, 0x49, 0xD8, 0x73, 0x10, 0x4A, 0xE4, 0x05, 0x80,
-0x4B, 0xB8, 0x55, 0x10, 0x4C, 0xCD, 0x22, 0x00, 0x4D, 0x98, 0x37, 0x10, 0x4E, 0xAD, 0x04, 0x00,
-0x4F, 0x78, 0x19, 0x10, 0x50, 0x8C, 0xE6, 0x00, 0x51, 0x61, 0x35, 0x90, 0x52, 0x6C, 0xC8, 0x00,
-0x53, 0x41, 0x17, 0x90, 0x54, 0x4C, 0xAA, 0x00, 0x55, 0x20, 0xF9, 0x90, 0x56, 0x2C, 0x8C, 0x00,
-0x57, 0x00, 0xDB, 0x90, 0x58, 0x15, 0xA8, 0x80, 0x58, 0xE0, 0xBD, 0x90, 0x59, 0xF5, 0x8A, 0x80,
-0x5A, 0xC0, 0x9F, 0x90, 0x5B, 0xD5, 0x6C, 0x80, 0x5C, 0xA9, 0xBC, 0x10, 0x5D, 0xB5, 0x4E, 0x80,
-0x5E, 0x89, 0x9E, 0x10, 0x5F, 0x95, 0x30, 0x80, 0x60, 0x69, 0x80, 0x10, 0x61, 0x7E, 0x4D, 0x00,
-0x62, 0x49, 0x62, 0x10, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D,
-0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF,
-0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
-0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54,
-0x00, 0x50, 0x53, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
-0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x91, 0xB4, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x12, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3B, 0xB6, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x74, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x47, 0x24, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x91, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x49, 0x04, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x73, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x4A, 0xE4, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x55, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x4C, 0xCD, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x37, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x4E, 0xAD, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x19, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x50, 0x8C, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x35, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x52, 0x6C, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x17, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x4C, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20, 0xF9, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x56, 0x2C, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00, 0xDB, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x58, 0x15, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0, 0xBD, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x59, 0xF5, 0x8A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0, 0x9F, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x5B, 0xD5, 0x6C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9, 0xBC, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x5D, 0xB5, 0x4E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x9E, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x5F, 0x95, 0x30, 0x80, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x80, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x61, 0x7E, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x62, 0x10, 0x00,
-0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x05, 0x04,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xA5, 0xB6, 0xE8, 0x70,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
+0xB8, 0xFD, 0x86, 0xF0, 0xCB, 0xEA, 0x71, 0x60, 0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80,
+0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80,
+0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00,
+0x3A, 0xF5, 0x12, 0x90, 0x3B, 0xB6, 0xD1, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00,
+0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80,
+0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80, 0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80,
+0x46, 0x0F, 0x74, 0x90, 0x47, 0x24, 0x41, 0x80, 0x47, 0xF8, 0x91, 0x10, 0x49, 0x04, 0x23, 0x80,
+0x49, 0xD8, 0x73, 0x10, 0x4A, 0xE4, 0x05, 0x80, 0x4B, 0xB8, 0x55, 0x10, 0x4C, 0xCD, 0x22, 0x00,
+0x4D, 0x98, 0x37, 0x10, 0x4E, 0xAD, 0x04, 0x00, 0x4F, 0x78, 0x19, 0x10, 0x50, 0x8C, 0xE6, 0x00,
+0x51, 0x61, 0x35, 0x90, 0x52, 0x6C, 0xC8, 0x00, 0x53, 0x41, 0x17, 0x90, 0x54, 0x4C, 0xAA, 0x00,
+0x55, 0x20, 0xF9, 0x90, 0x56, 0x2C, 0x8C, 0x00, 0x57, 0x00, 0xDB, 0x90, 0x58, 0x15, 0xA8, 0x80,
+0x58, 0xE0, 0xBD, 0x90, 0x59, 0xF5, 0x8A, 0x80, 0x5A, 0xC0, 0x9F, 0x90, 0x5B, 0xD5, 0x6C, 0x80,
+0x5C, 0xA9, 0xBC, 0x10, 0x5D, 0xB5, 0x4E, 0x80, 0x5E, 0x89, 0x9E, 0x10, 0x5F, 0x95, 0x30, 0x80,
+0x60, 0x69, 0x80, 0x10, 0x61, 0x7E, 0x4D, 0x00, 0x62, 0x49, 0x62, 0x10, 0x63, 0x5E, 0x2F, 0x00,
+0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x9C,
+0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF,
+0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D,
+0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00,
+0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF1, 0x2B,
+0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x41, 0x3D,
+0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86,
+0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEA, 0x71, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x12,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x74,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x91,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x73,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xB8, 0x55,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCD, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x98, 0x37,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAD, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x78, 0x19,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0xE6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x61, 0x35,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x53, 0x41, 0x17,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x20, 0xF9,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x8C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x57, 0x00, 0xDB,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x58, 0xE0, 0xBD,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x8A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xC0, 0x9F,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x6C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA9, 0xBC,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB5, 0x4E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x89, 0x9E,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x95, 0x30, 0x80, 0x00, 0x00, 0x00, 0x00, 0x60, 0x69, 0x80,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7E, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x49, 0x62,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF, 0x9C, 0x3C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90,
 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
-0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00,
-0x50, 0x53, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 
+0x9D, 0x90, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
+0x4D, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x4D,
+0x53, 0x54, 0x37, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
 
 /* Mexico/General */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0xA5, 0xB6, 0xE8, 0x70,
-0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
+0xAF, 0xF1, 0x2B, 0x70, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x41, 0x3D, 0x70, 0xB8, 0x0C, 0x36, 0x60,
 0xB8, 0xFD, 0x86, 0xF0, 0xC5, 0xDE, 0xB0, 0x60, 0xC6, 0x97, 0x34, 0x50, 0xC9, 0x55, 0xF1, 0xE0,
 0xC9, 0xEA, 0xDD, 0x50, 0xCF, 0x02, 0xC6, 0xE0, 0xCF, 0xB7, 0x56, 0x50, 0xDA, 0x99, 0x15, 0xE0,
 0xDB, 0x76, 0x83, 0xD0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00,
@@ -65501,8 +66086,8 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x08,
 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
-0xAF, 0xF2, 0x6E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
-0xB7, 0x43, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
+0xAF, 0xF1, 0x2B, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
+0xB7, 0x41, 0x3D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
 0xB8, 0xFD, 0x86, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0xDE, 0xB0, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
 0xC6, 0x97, 0x34, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x55, 0xF1, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
 0xC9, 0xEA, 0xDD, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x02, 0xC6, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -65549,161 +66134,186 @@
 
 /* MST */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0x00,
+0x9E, 0xA6, 0x3A, 0x90, 0x9F, 0xBB, 0x07, 0x80, 0xA0, 0x86, 0x1C, 0x90, 0xA1, 0x9A, 0xE9, 0x80,
+0xCB, 0x89, 0x0C, 0x90, 0xCF, 0x17, 0xDF, 0x1C, 0xCF, 0x8F, 0xE5, 0xAC, 0xD0, 0x81, 0x1A, 0x1C,
+0xFA, 0xF8, 0x75, 0x10, 0xFB, 0xE8, 0x58, 0x00, 0x04, 0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x01, 0x02, 0xFF, 0xFF, 0x96, 0xEE, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF,
+0xFF, 0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
+0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54,
-0x37, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00,
+0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x04, 0x0C, 0xB0, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x3A, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x07, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x1C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xE9, 0x80, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x0C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x17, 0xDF, 0x1C, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCF, 0x8F, 0xE5, 0xAC, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x81, 0x1A, 0x1C, 0xFF,
+0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x75, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x58, 0x00, 0x04,
+0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0x96, 0xEE, 0x00, 0x00,
+0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0,
+0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00,
+0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 
 
 /* MST7MDT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x9E, 0xA6, 0x3A, 0x90,
-0x9F, 0xBB, 0x07, 0x80, 0xA0, 0x86, 0x1C, 0x90, 0xA1, 0x9A, 0xE9, 0x80, 0xCB, 0x89, 0x0C, 0x90,
-0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x18, 0x00, 0xFA, 0xF8, 0x75, 0x10, 0xFB, 0xE8, 0x58, 0x00,
-0xFC, 0xD8, 0x57, 0x10, 0xFD, 0xC8, 0x3A, 0x00, 0xFE, 0xB8, 0x39, 0x10, 0xFF, 0xA8, 0x1C, 0x00,
-0x00, 0x98, 0x1B, 0x10, 0x01, 0x87, 0xFE, 0x00, 0x02, 0x77, 0xFD, 0x10, 0x03, 0x71, 0x1A, 0x80,
-0x04, 0x61, 0x19, 0x90, 0x05, 0x50, 0xFC, 0x80, 0x06, 0x40, 0xFB, 0x90, 0x07, 0x30, 0xDE, 0x80,
-0x07, 0x8D, 0x35, 0x90, 0x09, 0x10, 0xC0, 0x80, 0x09, 0xAD, 0xB1, 0x10, 0x0A, 0xF0, 0xA2, 0x80,
-0x0B, 0xE0, 0xA1, 0x90, 0x0C, 0xD9, 0xBF, 0x00, 0x0D, 0xC0, 0x83, 0x90, 0x0E, 0xB9, 0xA1, 0x00,
-0x0F, 0xA9, 0xA0, 0x10, 0x10, 0x99, 0x83, 0x00, 0x11, 0x89, 0x82, 0x10, 0x12, 0x79, 0x65, 0x00,
-0x13, 0x69, 0x64, 0x10, 0x14, 0x59, 0x47, 0x00, 0x15, 0x49, 0x46, 0x10, 0x16, 0x39, 0x29, 0x00,
-0x17, 0x29, 0x28, 0x10, 0x18, 0x22, 0x45, 0x80, 0x19, 0x09, 0x0A, 0x10, 0x1A, 0x02, 0x27, 0x80,
-0x1A, 0xF2, 0x26, 0x90, 0x1B, 0xE2, 0x09, 0x80, 0x1C, 0xD2, 0x08, 0x90, 0x1D, 0xC1, 0xEB, 0x80,
-0x1E, 0xB1, 0xEA, 0x90, 0x1F, 0xA1, 0xCD, 0x80, 0x20, 0x76, 0x1D, 0x10, 0x21, 0x81, 0xAF, 0x80,
-0x22, 0x55, 0xFF, 0x10, 0x23, 0x6A, 0xCC, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x25, 0x4A, 0xAE, 0x00,
-0x26, 0x15, 0xC3, 0x10, 0x27, 0x2A, 0x90, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x29, 0x0A, 0x72, 0x00,
-0x29, 0xDE, 0xC1, 0x90, 0x2A, 0xEA, 0x54, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x2C, 0xD3, 0x70, 0x80,
-0x2D, 0x9E, 0x85, 0x90, 0x2E, 0xB3, 0x52, 0x80, 0x2F, 0x7E, 0x67, 0x90, 0x30, 0x93, 0x34, 0x80,
-0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80,
-0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00,
-0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x3B, 0xDB, 0xBB, 0x00,
-0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00,
-0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80, 0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80,
-0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80, 0x45, 0xF3, 0xC5, 0x10, 0x47, 0x2D, 0x7C, 0x00,
-0x47, 0xD3, 0xA7, 0x10, 0x49, 0x0D, 0x5E, 0x00, 0x49, 0xB3, 0x89, 0x10, 0x4A, 0xED, 0x40, 0x00,
-0x4B, 0x9C, 0xA5, 0x90, 0x4C, 0xD6, 0x5C, 0x80, 0x4D, 0x7C, 0x87, 0x90, 0x4E, 0xB6, 0x3E, 0x80,
-0x4F, 0x5C, 0x69, 0x90, 0x50, 0x96, 0x20, 0x80, 0x51, 0x3C, 0x4B, 0x90, 0x52, 0x76, 0x02, 0x80,
-0x53, 0x1C, 0x2D, 0x90, 0x54, 0x55, 0xE4, 0x80, 0x54, 0xFC, 0x0F, 0x90, 0x56, 0x35, 0xC6, 0x80,
-0x56, 0xE5, 0x2C, 0x10, 0x58, 0x1E, 0xE3, 0x00, 0x58, 0xC5, 0x0E, 0x10, 0x59, 0xFE, 0xC5, 0x00,
-0x5A, 0xA4, 0xF0, 0x10, 0x5B, 0xDE, 0xA7, 0x00, 0x5C, 0x84, 0xD2, 0x10, 0x5D, 0xBE, 0x89, 0x00,
-0x5E, 0x64, 0xB4, 0x10, 0x5F, 0x9E, 0x6B, 0x00, 0x60, 0x4D, 0xD0, 0x90, 0x61, 0x87, 0x87, 0x80,
-0x62, 0x2D, 0xB2, 0x90, 0x63, 0x67, 0x69, 0x80, 0x64, 0x0D, 0x94, 0x90, 0x65, 0x47, 0x4B, 0x80,
-0x65, 0xED, 0x76, 0x90, 0x67, 0x27, 0x2D, 0x80, 0x67, 0xCD, 0x58, 0x90, 0x69, 0x07, 0x0F, 0x80,
-0x69, 0xAD, 0x3A, 0x90, 0x6A, 0xE6, 0xF1, 0x80, 0x6B, 0x96, 0x57, 0x10, 0x6C, 0xD0, 0x0E, 0x00,
-0x6D, 0x76, 0x39, 0x10, 0x6E, 0xAF, 0xF0, 0x00, 0x6F, 0x56, 0x1B, 0x10, 0x70, 0x8F, 0xD2, 0x00,
-0x71, 0x35, 0xFD, 0x10, 0x72, 0x6F, 0xB4, 0x00, 0x73, 0x15, 0xDF, 0x10, 0x74, 0x4F, 0x96, 0x00,
-0x74, 0xFE, 0xFB, 0x90, 0x76, 0x38, 0xB2, 0x80, 0x76, 0xDE, 0xDD, 0x90, 0x78, 0x18, 0x94, 0x80,
-0x78, 0xBE, 0xBF, 0x90, 0x79, 0xF8, 0x76, 0x80, 0x7A, 0x9E, 0xA1, 0x90, 0x7B, 0xD8, 0x58, 0x80,
-0x7C, 0x7E, 0x83, 0x90, 0x7D, 0xB8, 0x3A, 0x80, 0x7E, 0x5E, 0x65, 0x90, 0x7F, 0x98, 0x1C, 0x80,
-0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01,
-0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D,
-0x90, 0x00, 0x04, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D,
-0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x3A,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x07, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x1C,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xE9, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x0C,
-0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x18,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x75, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x58,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x57, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x3A,
-0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x39, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x1C,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xFE,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x1A,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x19, 0x90, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xFC,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xDE,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x35, 0x90, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xC0,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0xB1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0xA2,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xBF,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xA1,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xA0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x83,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x82, 0x10, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x65,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x47,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x29,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x45,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x27,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x26, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x09,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x08, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xEB,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xCD,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x1D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xAF,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xCC,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xAE,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x72,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x54,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x70,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x85, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x52,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x67, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x34,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x16,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xBB,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x7C,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0xA7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x5E,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x89, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x40,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xA5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x5C,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x87, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x3E,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x69, 0x90, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x20,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x4B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x02,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x2D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xE4,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x0F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xC6,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x2C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xE3,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xC5,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xA7,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xD2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x89,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x6B,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xD0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x87,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xB2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x69,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x4B,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x2D,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x0F,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xF1,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x57, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x0E,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xF0,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xD2,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xB4,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x96,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xB2,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xDD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x94,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x76,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x58,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x3A,
-0x80, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x1C,
-0x80, 0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0,
-0x01, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0x9D, 0x90, 0x00, 0x04, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00,
-0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x4D,
-0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x9E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0x80, 0x00, 0x00, 0x00,
+0x9E, 0xA6, 0x3A, 0x90, 0x9F, 0xBB, 0x07, 0x80, 0xA0, 0x86, 0x1C, 0x90, 0xA1, 0x9A, 0xE9, 0x80,
+0xA2, 0x65, 0xFE, 0x90, 0xA3, 0x84, 0x06, 0x00, 0xA4, 0x45, 0xE0, 0x90, 0xA4, 0x8F, 0xA6, 0x80,
+0xCB, 0x89, 0x0C, 0x90, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x18, 0x00, 0xF7, 0x2F, 0x76, 0x90,
+0xF8, 0x28, 0x94, 0x00, 0xF9, 0x0F, 0x58, 0x90, 0xFA, 0x08, 0x76, 0x00, 0xFA, 0xF8, 0x75, 0x10,
+0xFB, 0xE8, 0x58, 0x00, 0xFC, 0xD8, 0x57, 0x10, 0xFD, 0xC8, 0x3A, 0x00, 0xFE, 0xB8, 0x39, 0x10,
+0xFF, 0xA8, 0x1C, 0x00, 0x00, 0x98, 0x1B, 0x10, 0x01, 0x87, 0xFE, 0x00, 0x02, 0x77, 0xFD, 0x10,
+0x03, 0x71, 0x1A, 0x80, 0x04, 0x61, 0x19, 0x90, 0x05, 0x50, 0xFC, 0x80, 0x06, 0x40, 0xFB, 0x90,
+0x07, 0x30, 0xDE, 0x80, 0x07, 0x8D, 0x35, 0x90, 0x09, 0x10, 0xC0, 0x80, 0x09, 0xAD, 0xB1, 0x10,
+0x0A, 0xF0, 0xA2, 0x80, 0x0B, 0xE0, 0xA1, 0x90, 0x0C, 0xD9, 0xBF, 0x00, 0x0D, 0xC0, 0x83, 0x90,
+0x0E, 0xB9, 0xA1, 0x00, 0x0F, 0xA9, 0xA0, 0x10, 0x10, 0x99, 0x83, 0x00, 0x11, 0x89, 0x82, 0x10,
+0x12, 0x79, 0x65, 0x00, 0x13, 0x69, 0x64, 0x10, 0x14, 0x59, 0x47, 0x00, 0x15, 0x49, 0x46, 0x10,
+0x16, 0x39, 0x29, 0x00, 0x17, 0x29, 0x28, 0x10, 0x18, 0x22, 0x45, 0x80, 0x19, 0x09, 0x0A, 0x10,
+0x1A, 0x02, 0x27, 0x80, 0x1A, 0xF2, 0x26, 0x90, 0x1B, 0xE2, 0x09, 0x80, 0x1C, 0xD2, 0x08, 0x90,
+0x1D, 0xC1, 0xEB, 0x80, 0x1E, 0xB1, 0xEA, 0x90, 0x1F, 0xA1, 0xCD, 0x80, 0x20, 0x76, 0x1D, 0x10,
+0x21, 0x81, 0xAF, 0x80, 0x22, 0x55, 0xFF, 0x10, 0x23, 0x6A, 0xCC, 0x00, 0x24, 0x35, 0xE1, 0x10,
+0x25, 0x4A, 0xAE, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x27, 0x2A, 0x90, 0x00, 0x27, 0xFE, 0xDF, 0x90,
+0x29, 0x0A, 0x72, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x2A, 0xEA, 0x54, 0x00, 0x2B, 0xBE, 0xA3, 0x90,
+0x2C, 0xD3, 0x70, 0x80, 0x2D, 0x9E, 0x85, 0x90, 0x2E, 0xB3, 0x52, 0x80, 0x2F, 0x7E, 0x67, 0x90,
+0x30, 0x93, 0x34, 0x80, 0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10,
+0x34, 0x52, 0xF8, 0x80, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10,
+0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xC6, 0xEE, 0x10,
+0x3B, 0xDB, 0xBB, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00, 0x3E, 0x8F, 0xEC, 0x90,
+0x3F, 0x9B, 0x7F, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80, 0x42, 0x4F, 0xB0, 0x90,
+0x43, 0x64, 0x7D, 0x80, 0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80, 0x45, 0xF3, 0xC5, 0x10,
+0x47, 0x2D, 0x7C, 0x00, 0x47, 0xD3, 0xA7, 0x10, 0x49, 0x0D, 0x5E, 0x00, 0x49, 0xB3, 0x89, 0x10,
+0x4A, 0xED, 0x40, 0x00, 0x4B, 0x9C, 0xA5, 0x90, 0x4C, 0xD6, 0x5C, 0x80, 0x4D, 0x7C, 0x87, 0x90,
+0x4E, 0xB6, 0x3E, 0x80, 0x4F, 0x5C, 0x69, 0x90, 0x50, 0x96, 0x20, 0x80, 0x51, 0x3C, 0x4B, 0x90,
+0x52, 0x76, 0x02, 0x80, 0x53, 0x1C, 0x2D, 0x90, 0x54, 0x55, 0xE4, 0x80, 0x54, 0xFC, 0x0F, 0x90,
+0x56, 0x35, 0xC6, 0x80, 0x56, 0xE5, 0x2C, 0x10, 0x58, 0x1E, 0xE3, 0x00, 0x58, 0xC5, 0x0E, 0x10,
+0x59, 0xFE, 0xC5, 0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x5B, 0xDE, 0xA7, 0x00, 0x5C, 0x84, 0xD2, 0x10,
+0x5D, 0xBE, 0x89, 0x00, 0x5E, 0x64, 0xB4, 0x10, 0x5F, 0x9E, 0x6B, 0x00, 0x60, 0x4D, 0xD0, 0x90,
+0x61, 0x87, 0x87, 0x80, 0x62, 0x2D, 0xB2, 0x90, 0x63, 0x67, 0x69, 0x80, 0x64, 0x0D, 0x94, 0x90,
+0x65, 0x47, 0x4B, 0x80, 0x65, 0xED, 0x76, 0x90, 0x67, 0x27, 0x2D, 0x80, 0x67, 0xCD, 0x58, 0x90,
+0x69, 0x07, 0x0F, 0x80, 0x69, 0xAD, 0x3A, 0x90, 0x6A, 0xE6, 0xF1, 0x80, 0x6B, 0x96, 0x57, 0x10,
+0x6C, 0xD0, 0x0E, 0x00, 0x6D, 0x76, 0x39, 0x10, 0x6E, 0xAF, 0xF0, 0x00, 0x6F, 0x56, 0x1B, 0x10,
+0x70, 0x8F, 0xD2, 0x00, 0x71, 0x35, 0xFD, 0x10, 0x72, 0x6F, 0xB4, 0x00, 0x73, 0x15, 0xDF, 0x10,
+0x74, 0x4F, 0x96, 0x00, 0x74, 0xFE, 0xFB, 0x90, 0x76, 0x38, 0xB2, 0x80, 0x76, 0xDE, 0xDD, 0x90,
+0x78, 0x18, 0x94, 0x80, 0x78, 0xBE, 0xBF, 0x90, 0x79, 0xF8, 0x76, 0x80, 0x7A, 0x9E, 0xA1, 0x90,
+0x7B, 0xD8, 0x58, 0x80, 0x7C, 0x7E, 0x83, 0x90, 0x7D, 0xB8, 0x3A, 0x80, 0x7E, 0x5E, 0x65, 0x90,
+0x7F, 0x98, 0x1C, 0x80, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x05, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0xFF, 0xFF, 0x9D, 0x94, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF,
+0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C,
+0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53,
+0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01,
+0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00,
+0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00,
+0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x04, 0x0C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6,
+0x3A, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x07, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86,
+0x1C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xE9, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x65,
+0xFE, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x84, 0x06, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x45,
+0xE0, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x8F, 0xA6, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89,
+0x0C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61,
+0x18, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x76, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28,
+0x94, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0x0F, 0x58, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08,
+0x76, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x75, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8,
+0x58, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x57, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8,
+0x3A, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x39, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8,
+0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87,
+0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x77, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71,
+0x1A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x19, 0x90, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50,
+0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30,
+0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x35, 0x90, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10,
+0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0xB1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0,
+0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9,
+0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9,
+0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xA0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99,
+0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x82, 0x10, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79,
+0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59,
+0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39,
+0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22,
+0x45, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02,
+0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x26, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2,
+0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x08, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1,
+0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1,
+0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x1D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81,
+0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A,
+0xCC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A,
+0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A,
+0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3,
+0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x85, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3,
+0x52, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x67, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93,
+0x34, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73,
+0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52,
+0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32,
+0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B,
+0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB,
+0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB,
+0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB,
+0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B,
+0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84,
+0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64,
+0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44,
+0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D,
+0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0xA7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D,
+0x5E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x89, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED,
+0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xA5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6,
+0x5C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x87, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6,
+0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x69, 0x90, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96,
+0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x4B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76,
+0x02, 0x80, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x2D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55,
+0xE4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x0F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35,
+0xC6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x2C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E,
+0xE3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE,
+0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE,
+0xA7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xD2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE,
+0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E,
+0x6B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xD0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87,
+0x87, 0x80, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xB2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67,
+0x69, 0x80, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47,
+0x4B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27,
+0x2D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07,
+0x0F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6,
+0xF1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x57, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0,
+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF,
+0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F,
+0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F,
+0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F,
+0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38,
+0xB2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xDD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18,
+0x94, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8,
+0x76, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8,
+0x58, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8,
+0x3A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98,
+0x1C, 0x80, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x05, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0xFF, 0xFF, 0x9D, 0x94, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0x9D, 0x90,
+0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
+0xAB, 0xA0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00,
+0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x01, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E,
+0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Navajo */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -67621,19 +68231,19 @@
 
 /* Portugal */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x1B, 0x80, 0x00, 0x00, 0x00,
-0x92, 0xE6, 0x8E, 0x80, 0x9B, 0x4B, 0x6D, 0x70, 0x9B, 0xFE, 0xC7, 0x80, 0x9C, 0x9C, 0xED, 0x70,
-0x9D, 0xC9, 0x83, 0x70, 0x9E, 0x7F, 0x72, 0x70, 0x9F, 0xAA, 0xB6, 0xF0, 0xA0, 0x5F, 0x54, 0x70,
-0xA1, 0x8B, 0xEA, 0x70, 0xA2, 0x41, 0xD9, 0x70, 0xA3, 0x6E, 0x6F, 0x70, 0xA4, 0x23, 0x0C, 0xF0,
-0xA5, 0x4F, 0xA2, 0xF0, 0xAA, 0x05, 0xEF, 0x70, 0xAA, 0xF4, 0x8E, 0xF0, 0xAD, 0xC9, 0xA7, 0xF0,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xE1, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1B, 0x80, 0x00, 0x00, 0x00,
+0x92, 0xE6, 0x8E, 0x80, 0x9B, 0x4B, 0x6D, 0x70, 0x9B, 0xFE, 0xC7, 0x80, 0x9C, 0x9C, 0xFB, 0x80,
+0x9D, 0xC9, 0x83, 0x70, 0x9E, 0x7E, 0x2F, 0x00, 0x9F, 0xAA, 0xB6, 0xF0, 0xA0, 0x5F, 0x62, 0x80,
+0xA1, 0x8B, 0xEA, 0x70, 0xA2, 0x41, 0xE7, 0x80, 0xA3, 0x6E, 0x6F, 0x70, 0xA4, 0x23, 0x1B, 0x00,
+0xA5, 0x4F, 0xA2, 0xF0, 0xAA, 0x05, 0xEF, 0x70, 0xAA, 0xE7, 0x5F, 0xF0, 0xAD, 0xC9, 0xA7, 0xF0,
 0xAE, 0xA7, 0x23, 0xF0, 0xAF, 0xA0, 0x4F, 0x70, 0xB0, 0x87, 0x05, 0xF0, 0xB1, 0x89, 0x6B, 0xF0,
 0xB2, 0x70, 0x22, 0x70, 0xB3, 0x72, 0x88, 0x70, 0xB4, 0x50, 0x04, 0x70, 0xB7, 0x32, 0x4C, 0x70,
 0xB8, 0x0F, 0xC8, 0x70, 0xB8, 0xFF, 0xB9, 0x70, 0xB9, 0xEF, 0xAA, 0x70, 0xBC, 0xC8, 0xB7, 0xF0,
 0xBD, 0xB8, 0xA8, 0xF0, 0xBE, 0x9F, 0x5F, 0x70, 0xBF, 0x98, 0x8A, 0xF0, 0xC0, 0x9A, 0xF0, 0xF0,
 0xC1, 0x78, 0x6C, 0xF0, 0xC2, 0x68, 0x5D, 0xF0, 0xC3, 0x58, 0x4E, 0xF0, 0xC4, 0x3F, 0x05, 0x70,
 0xC5, 0x38, 0x30, 0xF0, 0xC6, 0x3A, 0x96, 0xF0, 0xC7, 0x58, 0xAC, 0x70, 0xC7, 0xD9, 0xDF, 0x70,
-0xC9, 0x01, 0x2F, 0x70, 0xC9, 0xF1, 0x20, 0x70, 0xCA, 0xE2, 0x62, 0xF0, 0xCB, 0xB5, 0x52, 0xF0,
+0xC9, 0x03, 0xD2, 0x70, 0xC9, 0xF1, 0x20, 0x70, 0xCA, 0xE2, 0x62, 0xF0, 0xCB, 0xB5, 0x52, 0xF0,
 0xCB, 0xEC, 0xA3, 0xE0, 0xCC, 0x80, 0x4B, 0xE0, 0xCC, 0xDC, 0xA2, 0xF0, 0xCD, 0x95, 0x34, 0xF0,
 0xCD, 0xC3, 0x4B, 0x60, 0xCE, 0x72, 0xA2, 0xE0, 0xCE, 0xC5, 0xBF, 0x70, 0xCF, 0x75, 0x16, 0xF0,
 0xCF, 0xAC, 0x67, 0xE0, 0xD0, 0x52, 0x84, 0xE0, 0xD0, 0xA5, 0xA1, 0x70, 0xD1, 0x54, 0xF8, 0xF0,
@@ -67648,198 +68258,200 @@
 0xEE, 0x9A, 0xB1, 0x20, 0xEF, 0x8A, 0xA2, 0x20, 0xF0, 0x7A, 0x93, 0x20, 0xF1, 0x6A, 0x84, 0x20,
 0xF2, 0x63, 0xAF, 0xA0, 0xF3, 0x53, 0xA0, 0xA0, 0xF4, 0x43, 0x91, 0xA0, 0xF5, 0x33, 0x82, 0xA0,
 0xF6, 0x23, 0x73, 0xA0, 0xF7, 0x13, 0x64, 0xA0, 0xF8, 0x03, 0x55, 0xA0, 0xF8, 0xF3, 0x46, 0xA0,
-0x0C, 0xAB, 0x2A, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x0F, 0x84, 0x37, 0x80,
-0x10, 0x74, 0x28, 0x80, 0x11, 0x64, 0x19, 0x80, 0x12, 0x54, 0x18, 0x90, 0x13, 0x43, 0xFB, 0x80,
-0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xEB, 0x90, 0x16, 0x13, 0xDC, 0x90, 0x17, 0x03, 0xCD, 0x90,
-0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xBD, 0xA0, 0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90,
-0x1B, 0xBC, 0xBD, 0x10, 0x1C, 0xAC, 0xAE, 0x10, 0x1D, 0x9C, 0x9F, 0x10, 0x1E, 0x8C, 0x90, 0x10,
-0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10, 0x21, 0x5C, 0x63, 0x10, 0x22, 0x4C, 0x54, 0x10,
-0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10, 0x25, 0x1C, 0x27, 0x10, 0x26, 0x0C, 0x18, 0x10,
-0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90, 0x28, 0xE5, 0x25, 0x90, 0x29, 0xD5, 0x16, 0x90,
-0x2A, 0xC5, 0x07, 0x90, 0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0xA4, 0xE9, 0x90, 0x2D, 0x94, 0xDA, 0x90,
-0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90, 0x31, 0x5D, 0xD9, 0x10,
-0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10, 0x35, 0x1D, 0x9D, 0x10,
-0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90, 0x38, 0xDD, 0x61, 0x10,
-0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90, 0x3C, 0xA6, 0x5F, 0x90,
-0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90, 0x40, 0x66, 0x23, 0x90,
-0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10, 0x44, 0x25, 0xE7, 0x90,
-0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10, 0x47, 0xEE, 0xE6, 0x10,
-0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10, 0x4B, 0xAE, 0xAA, 0x10,
-0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90, 0x4F, 0x6E, 0x6E, 0x10,
-0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90, 0x53, 0x37, 0x6C, 0x90,
-0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90, 0x56, 0xF7, 0x30, 0x90,
-0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10, 0x5A, 0xB6, 0xF4, 0x90,
-0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10, 0x5E, 0x7F, 0xF3, 0x10,
-0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90, 0x62, 0x3F, 0xB7, 0x10,
-0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90, 0x66, 0x08, 0xB5, 0x90,
-0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90, 0x69, 0xC8, 0x79, 0x90,
-0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10, 0x6D, 0x88, 0x3D, 0x90,
-0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10, 0x71, 0x51, 0x3C, 0x10,
-0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10,
-0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10,
-0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90,
-0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90, 0x00, 0x06, 0x01, 0x02,
+0xF9, 0xE3, 0x37, 0xA0, 0x0C, 0xAB, 0x2A, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x0E, 0x8B, 0x0C, 0x00,
+0x0F, 0x84, 0x45, 0x90, 0x10, 0x74, 0x36, 0x90, 0x11, 0x64, 0x27, 0x90, 0x12, 0x54, 0x18, 0x90,
+0x13, 0x4D, 0x44, 0x10, 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xDD, 0x80, 0x16, 0x13, 0xCE, 0x80,
+0x17, 0x03, 0xBF, 0x80, 0x17, 0xF3, 0xB0, 0x80, 0x18, 0xE3, 0xA1, 0x80, 0x19, 0xD3, 0x92, 0x80,
+0x1A, 0xC3, 0x83, 0x80, 0x1B, 0xBC, 0xAF, 0x00, 0x1C, 0xAC, 0xA0, 0x00, 0x1D, 0x9C, 0x91, 0x00,
+0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10, 0x21, 0x5C, 0x63, 0x10,
+0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10, 0x25, 0x1C, 0x27, 0x10,
+0x26, 0x0C, 0x18, 0x10, 0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90, 0x28, 0xE5, 0x25, 0x90,
+0x29, 0xD5, 0x16, 0x90, 0x2A, 0xC5, 0x07, 0x90, 0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0xA4, 0xE9, 0x90,
+0x2D, 0x94, 0xDA, 0x90, 0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90,
+0x31, 0x5D, 0xD9, 0x10, 0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10,
+0x35, 0x1D, 0x9D, 0x10, 0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90,
+0x38, 0xDD, 0x61, 0x10, 0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90,
+0x3C, 0xA6, 0x5F, 0x90, 0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90,
+0x40, 0x66, 0x23, 0x90, 0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10,
+0x44, 0x25, 0xE7, 0x90, 0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10,
+0x47, 0xEE, 0xE6, 0x10, 0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10,
+0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90,
+0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90,
+0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90,
+0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10,
+0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10,
+0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90,
+0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90,
+0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90,
+0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10,
+0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10,
+0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10,
+0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90,
+0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90,
+0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90,
+0x00, 0x06, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
+0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
-0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x07, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00,
+0x12, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C,
+0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C,
+0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54,
+0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE1, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1B,
+0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x8E, 0x80,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xC7, 0x80,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x2F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x22, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0x88, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x04, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x4C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xC8, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xB9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xAA, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xB7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xA8, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x5F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0x8A, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9A, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x6C, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x4E, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x30, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xAC, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xD2, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x62, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xA3, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xA2, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xC3, 0x4B, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xA2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xC5, 0xBF, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x16, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0xAC, 0x67, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0x84, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xA5, 0xA1, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x54, 0xF8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x8C, 0x49, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x85, 0x83, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xC4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x49, 0xB5, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xD1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x29, 0xC2, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xB3, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x09, 0xA4, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0x95, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE9, 0x86, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x77, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC9, 0x68, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x59, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xB2, 0x84, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x75, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x92, 0x66, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x57, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x72, 0x48, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x39, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x52, 0x2A, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x1B, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x32, 0x0C, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x21, 0xFD, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x1B, 0x29, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x1A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xFB, 0x0B, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEA, 0xFC, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xDA, 0xED, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xBA, 0xCF, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xC0, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x9A, 0xB1, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xA2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x7A, 0x93, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0x84, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x63, 0xAF, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x91, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x73, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x55, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x37, 0xA0,
+0x00, 0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xDD, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xCE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xBF, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xA1, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x83, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x00, 0x06, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x07, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
+0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06,
-0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0xFF, 0xFF, 0xF7, 0x63,
-0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00,
-0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x0E, 0x10,
-0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54,
-0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00,
-0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x0C, 0x00,
-0x00, 0x00, 0x1B, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92,
-0xE6, 0x8E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B,
-0xFE, 0xC7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xED, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D,
-0xC9, 0x83, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7F, 0x72, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F,
-0xAA, 0xB6, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x54, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1,
-0x8B, 0xEA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xD9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3,
-0x6E, 0x6F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x0C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5,
-0x4F, 0xA2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA,
-0xF4, 0x8E, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE,
-0xA7, 0x23, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0,
-0x87, 0x05, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2,
-0x70, 0x22, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0x88, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4,
-0x50, 0x04, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x4C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8,
-0x0F, 0xC8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xB9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9,
-0xEF, 0xAA, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xB7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD,
-0xB8, 0xA8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x5F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF,
-0x98, 0x8A, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9A, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1,
-0x78, 0x6C, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3,
-0x58, 0x4E, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5,
-0x38, 0x30, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7,
-0x58, 0xAC, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9,
-0x01, 0x2F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA,
-0xE2, 0x62, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB,
-0xEC, 0xA3, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC,
-0xDC, 0xA2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD,
-0xC3, 0x4B, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xA2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE,
-0xC5, 0xBF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x16, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF,
-0xAC, 0x67, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0x84, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0,
-0xA5, 0xA1, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x54, 0xF8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1,
-0x8C, 0x49, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2,
-0x85, 0x83, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xC4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4,
-0x49, 0xB5, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xD1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6,
-0x29, 0xC2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xB3, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8,
-0x09, 0xA4, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0x95, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9,
-0xE9, 0x86, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x77, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB,
-0xC9, 0x68, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x59, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD,
-0xB2, 0x84, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x75, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF,
-0x92, 0x66, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x57, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1,
-0x72, 0x48, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x39, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3,
-0x52, 0x2A, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x1B, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5,
-0x32, 0x0C, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x21, 0xFD, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7,
-0x1B, 0x29, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x1A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8,
-0xFB, 0x0B, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEA, 0xFC, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA,
-0xDA, 0xED, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC,
-0xBA, 0xCF, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xC0, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE,
-0x9A, 0xB1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xA2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0,
-0x7A, 0x93, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0x84, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2,
-0x63, 0xAF, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4,
-0x43, 0x91, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6,
-0x23, 0x73, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8,
-0x03, 0x55, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C,
-0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E,
-0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10,
-0x74, 0x28, 0x80, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x19, 0x80, 0x00, 0x00, 0x00, 0x00, 0x12,
-0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x43, 0xFB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x14,
-0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16,
-0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17,
-0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xBD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x19,
-0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B,
-0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D,
-0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F,
-0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21,
-0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23,
-0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25,
-0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27,
-0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28,
-0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A,
-0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C,
-0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E,
-0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30,
-0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32,
-0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34,
-0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
-0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38,
-0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39,
-0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B,
-0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D,
-0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F,
-0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41,
-0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43,
-0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45,
-0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47,
-0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
-0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A,
-0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C,
-0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E,
-0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50,
-0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52,
-0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54,
-0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56,
-0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58,
-0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59,
-0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B,
-0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D,
-0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F,
-0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61,
-0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63,
-0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65,
-0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67,
-0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68,
-0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A,
-0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C,
-0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E,
-0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70,
-0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72,
-0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74,
-0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76,
-0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78,
-0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79,
-0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B,
-0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D,
-0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F,
-0x8E, 0x7F, 0x90, 0x00, 0x06, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x07, 0x02, 0x03,
 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x07, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x08, 0x09, 0x08, 0x09, 0x08, 0x09, 0x08, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A, 0x06, 0x0A,
-0x06, 0x0A, 0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E,
-0x10, 0x00, 0x12, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x00,
-0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x57,
-0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54,
-0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01,
-0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x57,
-0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31,
-0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 
+0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00,
+0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00,
+0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00,
+0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x57, 0x45, 0x54,
+0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D,
+0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 
 
 /* PRC */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -67881,151 +68493,185 @@
 
 /* PST8PDT */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x9E, 0xA6, 0x48, 0xA0,
-0x9F, 0xBB, 0x15, 0x90, 0xA0, 0x86, 0x2A, 0xA0, 0xA1, 0x9A, 0xF7, 0x90, 0xCB, 0x89, 0x1A, 0xA0,
-0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x26, 0x10, 0xFA, 0xF8, 0x83, 0x20, 0xFB, 0xE8, 0x66, 0x10,
-0xFC, 0xD8, 0x65, 0x20, 0xFD, 0xC8, 0x48, 0x10, 0xFE, 0xB8, 0x47, 0x20, 0xFF, 0xA8, 0x2A, 0x10,
-0x00, 0x98, 0x29, 0x20, 0x01, 0x88, 0x0C, 0x10, 0x02, 0x78, 0x0B, 0x20, 0x03, 0x71, 0x28, 0x90,
-0x04, 0x61, 0x27, 0xA0, 0x05, 0x51, 0x0A, 0x90, 0x06, 0x41, 0x09, 0xA0, 0x07, 0x30, 0xEC, 0x90,
-0x07, 0x8D, 0x43, 0xA0, 0x09, 0x10, 0xCE, 0x90, 0x09, 0xAD, 0xBF, 0x20, 0x0A, 0xF0, 0xB0, 0x90,
-0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10, 0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10,
-0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10, 0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x73, 0x10,
-0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10, 0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10,
-0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90, 0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90,
-0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90, 0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90,
-0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90, 0x20, 0x76, 0x2B, 0x20, 0x21, 0x81, 0xBD, 0x90,
-0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10, 0x24, 0x35, 0xEF, 0x20, 0x25, 0x4A, 0xBC, 0x10,
-0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10, 0x27, 0xFE, 0xED, 0xA0, 0x29, 0x0A, 0x80, 0x10,
-0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10, 0x2B, 0xBE, 0xB1, 0xA0, 0x2C, 0xD3, 0x7E, 0x90,
-0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90, 0x2F, 0x7E, 0x75, 0xA0, 0x30, 0x93, 0x42, 0x90,
-0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90, 0x33, 0x47, 0x74, 0x20, 0x34, 0x53, 0x06, 0x90,
-0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90, 0x37, 0x07, 0x38, 0x20, 0x38, 0x1C, 0x05, 0x10,
-0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10, 0x3A, 0xC6, 0xFC, 0x20, 0x3B, 0xDB, 0xC9, 0x10,
-0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10, 0x3E, 0x8F, 0xFA, 0xA0, 0x3F, 0x9B, 0x8D, 0x10,
-0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90, 0x42, 0x4F, 0xBE, 0xA0, 0x43, 0x64, 0x8B, 0x90,
-0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90, 0x45, 0xF3, 0xD3, 0x20, 0x47, 0x2D, 0x8A, 0x10,
-0x47, 0xD3, 0xB5, 0x20, 0x49, 0x0D, 0x6C, 0x10, 0x49, 0xB3, 0x97, 0x20, 0x4A, 0xED, 0x4E, 0x10,
-0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90, 0x4D, 0x7C, 0x95, 0xA0, 0x4E, 0xB6, 0x4C, 0x90,
-0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90, 0x51, 0x3C, 0x59, 0xA0, 0x52, 0x76, 0x10, 0x90,
-0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90, 0x54, 0xFC, 0x1D, 0xA0, 0x56, 0x35, 0xD4, 0x90,
-0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10, 0x58, 0xC5, 0x1C, 0x20, 0x59, 0xFE, 0xD3, 0x10,
-0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10, 0x5C, 0x84, 0xE0, 0x20, 0x5D, 0xBE, 0x97, 0x10,
-0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10, 0x60, 0x4D, 0xDE, 0xA0, 0x61, 0x87, 0x95, 0x90,
-0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90, 0x64, 0x0D, 0xA2, 0xA0, 0x65, 0x47, 0x59, 0x90,
-0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90, 0x67, 0xCD, 0x66, 0xA0, 0x69, 0x07, 0x1D, 0x90,
-0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90, 0x6B, 0x96, 0x65, 0x20, 0x6C, 0xD0, 0x1C, 0x10,
-0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10, 0x6F, 0x56, 0x29, 0x20, 0x70, 0x8F, 0xE0, 0x10,
-0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10, 0x73, 0x15, 0xED, 0x20, 0x74, 0x4F, 0xA4, 0x10,
-0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90, 0x76, 0xDE, 0xEB, 0xA0, 0x78, 0x18, 0xA2, 0x90,
-0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90, 0x7A, 0x9E, 0xAF, 0xA0, 0x7B, 0xD8, 0x66, 0x90,
-0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90, 0x7E, 0x5E, 0x73, 0xA0, 0x7F, 0x98, 0x2A, 0x90,
-0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
-0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x8F,
-0x80, 0x00, 0x04, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50,
-0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x54, 0x5A, 0x69,
-0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x95, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x48,
-0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x15, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x2A,
-0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x9A, 0xF7, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x1A,
-0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x26,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF8, 0x83, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x66,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xD8, 0x65, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x48,
-0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xB8, 0x47, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x2A,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x01, 0x88, 0x0C,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x02, 0x78, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x28,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x27, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x05, 0x51, 0x0A,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x06, 0x41, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xEC,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8D, 0x43, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xCE,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x09, 0xAD, 0xBF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0xB0,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xD3, 0x20, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x8A,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0xB5, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x6C,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x97, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x4E,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4,
-0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48,
-0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A,
-0x90, 0x01, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x04, 0xFF, 0xFF, 0x9D, 0x90,
-0x01, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF,
-0x8F, 0x80, 0x00, 0x04, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00,
-0x50, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x50,
-0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xBA, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0x80, 0x00, 0x00, 0x00,
+0x9E, 0xA6, 0x48, 0xA0, 0x9F, 0xBB, 0x15, 0x90, 0xA0, 0x86, 0x2A, 0xA0, 0xA1, 0x9A, 0xF7, 0x90,
+0xCB, 0x89, 0x1A, 0xA0, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x26, 0x10, 0xD6, 0xFE, 0x74, 0x5C,
+0xD8, 0x80, 0xAD, 0x90, 0xDA, 0xFE, 0xC3, 0x90, 0xDB, 0xC0, 0x90, 0x10, 0xDC, 0xDE, 0xA5, 0x90,
+0xDD, 0xA9, 0xAC, 0x90, 0xDE, 0xBE, 0x87, 0x90, 0xDF, 0x89, 0x8E, 0x90, 0xE0, 0x9E, 0x69, 0x90,
+0xE1, 0x69, 0x70, 0x90, 0xE2, 0x7E, 0x4B, 0x90, 0xE3, 0x49, 0x52, 0x90, 0xE4, 0x5E, 0x2D, 0x90,
+0xE5, 0x29, 0x34, 0x90, 0xE6, 0x47, 0x4A, 0x10, 0xE7, 0x12, 0x51, 0x10, 0xE8, 0x27, 0x2C, 0x10,
+0xE8, 0xF2, 0x33, 0x10, 0xEA, 0x07, 0x0E, 0x10, 0xEA, 0xD2, 0x15, 0x10, 0xEB, 0xE6, 0xF0, 0x10,
+0xEC, 0xB1, 0xF7, 0x10, 0xED, 0xC6, 0xD2, 0x10, 0xEE, 0x91, 0xD9, 0x10, 0xEF, 0xAF, 0xEE, 0x90,
+0xF0, 0x71, 0xBB, 0x10, 0xF1, 0x8F, 0xD0, 0x90, 0xF2, 0x7F, 0xC1, 0x90, 0xF3, 0x6F, 0xB2, 0x90,
+0xF4, 0x5F, 0xA3, 0x90, 0xF5, 0x4F, 0x94, 0x90, 0xF6, 0x3F, 0x85, 0x90, 0xF7, 0x2F, 0x76, 0x90,
+0xF8, 0x28, 0xA2, 0x10, 0xF9, 0x0F, 0x58, 0x90, 0xFA, 0x08, 0x84, 0x10, 0xFA, 0xF8, 0x83, 0x20,
+0xFB, 0xE8, 0x66, 0x10, 0xFC, 0xD8, 0x65, 0x20, 0xFD, 0xC8, 0x48, 0x10, 0xFE, 0xB8, 0x47, 0x20,
+0xFF, 0xA8, 0x2A, 0x10, 0x00, 0x98, 0x29, 0x20, 0x01, 0x88, 0x0C, 0x10, 0x02, 0x78, 0x0B, 0x20,
+0x03, 0x71, 0x28, 0x90, 0x04, 0x61, 0x27, 0xA0, 0x05, 0x51, 0x0A, 0x90, 0x06, 0x41, 0x09, 0xA0,
+0x07, 0x30, 0xEC, 0x90, 0x07, 0x8D, 0x43, 0xA0, 0x09, 0x10, 0xCE, 0x90, 0x09, 0xAD, 0xBF, 0x20,
+0x0A, 0xF0, 0xB0, 0x90, 0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10, 0x0D, 0xC0, 0x91, 0xA0,
+0x0E, 0xB9, 0xAF, 0x10, 0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10, 0x11, 0x89, 0x90, 0x20,
+0x12, 0x79, 0x73, 0x10, 0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10, 0x15, 0x49, 0x54, 0x20,
+0x16, 0x39, 0x37, 0x10, 0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90, 0x19, 0x09, 0x18, 0x20,
+0x1A, 0x02, 0x35, 0x90, 0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90, 0x1C, 0xD2, 0x16, 0xA0,
+0x1D, 0xC1, 0xF9, 0x90, 0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90, 0x20, 0x76, 0x2B, 0x20,
+0x21, 0x81, 0xBD, 0x90, 0x22, 0x56, 0x0D, 0x20, 0x23, 0x6A, 0xDA, 0x10, 0x24, 0x35, 0xEF, 0x20,
+0x25, 0x4A, 0xBC, 0x10, 0x26, 0x15, 0xD1, 0x20, 0x27, 0x2A, 0x9E, 0x10, 0x27, 0xFE, 0xED, 0xA0,
+0x29, 0x0A, 0x80, 0x10, 0x29, 0xDE, 0xCF, 0xA0, 0x2A, 0xEA, 0x62, 0x10, 0x2B, 0xBE, 0xB1, 0xA0,
+0x2C, 0xD3, 0x7E, 0x90, 0x2D, 0x9E, 0x93, 0xA0, 0x2E, 0xB3, 0x60, 0x90, 0x2F, 0x7E, 0x75, 0xA0,
+0x30, 0x93, 0x42, 0x90, 0x31, 0x67, 0x92, 0x20, 0x32, 0x73, 0x24, 0x90, 0x33, 0x47, 0x74, 0x20,
+0x34, 0x53, 0x06, 0x90, 0x35, 0x27, 0x56, 0x20, 0x36, 0x32, 0xE8, 0x90, 0x37, 0x07, 0x38, 0x20,
+0x38, 0x1C, 0x05, 0x10, 0x38, 0xE7, 0x1A, 0x20, 0x39, 0xFB, 0xE7, 0x10, 0x3A, 0xC6, 0xFC, 0x20,
+0x3B, 0xDB, 0xC9, 0x10, 0x3C, 0xB0, 0x18, 0xA0, 0x3D, 0xBB, 0xAB, 0x10, 0x3E, 0x8F, 0xFA, 0xA0,
+0x3F, 0x9B, 0x8D, 0x10, 0x40, 0x6F, 0xDC, 0xA0, 0x41, 0x84, 0xA9, 0x90, 0x42, 0x4F, 0xBE, 0xA0,
+0x43, 0x64, 0x8B, 0x90, 0x44, 0x2F, 0xA0, 0xA0, 0x45, 0x44, 0x6D, 0x90, 0x45, 0xF3, 0xD3, 0x20,
+0x47, 0x2D, 0x8A, 0x10, 0x47, 0xD3, 0xB5, 0x20, 0x49, 0x0D, 0x6C, 0x10, 0x49, 0xB3, 0x97, 0x20,
+0x4A, 0xED, 0x4E, 0x10, 0x4B, 0x9C, 0xB3, 0xA0, 0x4C, 0xD6, 0x6A, 0x90, 0x4D, 0x7C, 0x95, 0xA0,
+0x4E, 0xB6, 0x4C, 0x90, 0x4F, 0x5C, 0x77, 0xA0, 0x50, 0x96, 0x2E, 0x90, 0x51, 0x3C, 0x59, 0xA0,
+0x52, 0x76, 0x10, 0x90, 0x53, 0x1C, 0x3B, 0xA0, 0x54, 0x55, 0xF2, 0x90, 0x54, 0xFC, 0x1D, 0xA0,
+0x56, 0x35, 0xD4, 0x90, 0x56, 0xE5, 0x3A, 0x20, 0x58, 0x1E, 0xF1, 0x10, 0x58, 0xC5, 0x1C, 0x20,
+0x59, 0xFE, 0xD3, 0x10, 0x5A, 0xA4, 0xFE, 0x20, 0x5B, 0xDE, 0xB5, 0x10, 0x5C, 0x84, 0xE0, 0x20,
+0x5D, 0xBE, 0x97, 0x10, 0x5E, 0x64, 0xC2, 0x20, 0x5F, 0x9E, 0x79, 0x10, 0x60, 0x4D, 0xDE, 0xA0,
+0x61, 0x87, 0x95, 0x90, 0x62, 0x2D, 0xC0, 0xA0, 0x63, 0x67, 0x77, 0x90, 0x64, 0x0D, 0xA2, 0xA0,
+0x65, 0x47, 0x59, 0x90, 0x65, 0xED, 0x84, 0xA0, 0x67, 0x27, 0x3B, 0x90, 0x67, 0xCD, 0x66, 0xA0,
+0x69, 0x07, 0x1D, 0x90, 0x69, 0xAD, 0x48, 0xA0, 0x6A, 0xE6, 0xFF, 0x90, 0x6B, 0x96, 0x65, 0x20,
+0x6C, 0xD0, 0x1C, 0x10, 0x6D, 0x76, 0x47, 0x20, 0x6E, 0xAF, 0xFE, 0x10, 0x6F, 0x56, 0x29, 0x20,
+0x70, 0x8F, 0xE0, 0x10, 0x71, 0x36, 0x0B, 0x20, 0x72, 0x6F, 0xC2, 0x10, 0x73, 0x15, 0xED, 0x20,
+0x74, 0x4F, 0xA4, 0x10, 0x74, 0xFF, 0x09, 0xA0, 0x76, 0x38, 0xC0, 0x90, 0x76, 0xDE, 0xEB, 0xA0,
+0x78, 0x18, 0xA2, 0x90, 0x78, 0xBE, 0xCD, 0xA0, 0x79, 0xF8, 0x84, 0x90, 0x7A, 0x9E, 0xAF, 0xA0,
+0x7B, 0xD8, 0x66, 0x90, 0x7C, 0x7E, 0x91, 0xA0, 0x7D, 0xB8, 0x48, 0x90, 0x7E, 0x5E, 0x73, 0xA0,
+0x7F, 0x98, 0x2A, 0x90, 0x05, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF,
+0x91, 0x26, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08,
+0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x8F, 0x80,
+0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x57,
+0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xBA, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF,
+0xFF, 0xFF, 0x5E, 0x04, 0x1A, 0xC0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xA6, 0x48, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0x9F, 0xBB, 0x15, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x86, 0x2A, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xA1, 0x9A, 0xF7, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x1A, 0xA0, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x26, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xD6, 0xFE, 0x74, 0x5C, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x80, 0xAD, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xDA, 0xFE, 0xC3, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC0, 0x90, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xDC, 0xDE, 0xA5, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xA9, 0xAC, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xDE, 0xBE, 0x87, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x89, 0x8E, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xE0, 0x9E, 0x69, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x69, 0x70, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xE2, 0x7E, 0x4B, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x49, 0x52, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xE4, 0x5E, 0x2D, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x29, 0x34, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xE6, 0x47, 0x4A, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x12, 0x51, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xE8, 0x27, 0x2C, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF2, 0x33, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xEA, 0x07, 0x0E, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD2, 0x15, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xEB, 0xE6, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB1, 0xF7, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xED, 0xC6, 0xD2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x91, 0xD9, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xEF, 0xAF, 0xEE, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x71, 0xBB, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xF1, 0x8F, 0xD0, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x7F, 0xC1, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xF3, 0x6F, 0xB2, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x5F, 0xA3, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xF5, 0x4F, 0x94, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x3F, 0x85, 0x90, 0xFF, 0xFF,
+0xFF, 0xFF, 0xF7, 0x2F, 0x76, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0xA2, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xF9, 0x0F, 0x58, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0x08, 0x84, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFA, 0xF8, 0x83, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xE8, 0x66, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFC, 0xD8, 0x65, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xC8, 0x48, 0x10, 0xFF, 0xFF,
+0xFF, 0xFF, 0xFE, 0xB8, 0x47, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x2A, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x98, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x01, 0x88, 0x0C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x02, 0x78, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x03, 0x71, 0x28, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x04, 0x61, 0x27, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x05, 0x51, 0x0A, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x06, 0x41, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xEC, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x07, 0x8D, 0x43, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xCE, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x09, 0xAD, 0xBF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0xB0, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x73, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x35, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x1A, 0xF2, 0x34, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x17, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x1C, 0xD2, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xF9, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x1E, 0xB1, 0xF8, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xDB, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x20, 0x76, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xBD, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x22, 0x56, 0x0D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xDA, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x24, 0x35, 0xEF, 0x20, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xBC, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x26, 0x15, 0xD1, 0x20, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x9E, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x27, 0xFE, 0xED, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x80, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x29, 0xDE, 0xCF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x62, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x2B, 0xBE, 0xB1, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x7E, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2D, 0x9E, 0x93, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x60, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x2F, 0x7E, 0x75, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x42, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x31, 0x67, 0x92, 0x20, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x24, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x33, 0x47, 0x74, 0x20, 0x00, 0x00, 0x00, 0x00, 0x34, 0x53, 0x06, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x35, 0x27, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xE8, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x37, 0x07, 0x38, 0x20, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1C, 0x05, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x38, 0xE7, 0x1A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xE7, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x3A, 0xC6, 0xFC, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xC9, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x3C, 0xB0, 0x18, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0xAB, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x3E, 0x8F, 0xFA, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x8D, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x40, 0x6F, 0xDC, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0xA9, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x42, 0x4F, 0xBE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x8B, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x44, 0x2F, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x6D, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x45, 0xF3, 0xD3, 0x20, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x8A, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x47, 0xD3, 0xB5, 0x20, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x6C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x49, 0xB3, 0x97, 0x20, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x4E, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x4B, 0x9C, 0xB3, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x6A, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x4D, 0x7C, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x4C, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x4F, 0x5C, 0x77, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x2E, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x51, 0x3C, 0x59, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x10, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x53, 0x1C, 0x3B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xF2, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x54, 0xFC, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xD4, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x56, 0xE5, 0x3A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xF1, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x58, 0xC5, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xD3, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5A, 0xA4, 0xFE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xB5, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5C, 0x84, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x97, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5E, 0x64, 0xC2, 0x20, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x79, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x60, 0x4D, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x95, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x62, 0x2D, 0xC0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x77, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x64, 0x0D, 0xA2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x59, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x65, 0xED, 0x84, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x3B, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x67, 0xCD, 0x66, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x1D, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x69, 0xAD, 0x48, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xFF, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x6B, 0x96, 0x65, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x1C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x6D, 0x76, 0x47, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xFE, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x6F, 0x56, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xE0, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x71, 0x36, 0x0B, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xC2, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x73, 0x15, 0xED, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0xA4, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x74, 0xFF, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xC0, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x76, 0xDE, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0xA2, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x78, 0xBE, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x84, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x7A, 0x9E, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x66, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x7C, 0x7E, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x48, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x7E, 0x5E, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x2A, 0x90, 0x05, 0x01,
+0x02, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0x91, 0x26, 0x00, 0x00, 0xFF, 0xFF,
+0x9D, 0x90, 0x01, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x0C,
+0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x10, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00,
+0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0A, 0x50, 0x53, 0x54,
+0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E,
+0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
 
 /* ROC */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -69968,125 +70614,227 @@
 
 /* WET */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0x0D, 0xA4, 0x63, 0x90,
-0x0E, 0x8B, 0x1A, 0x10, 0x0F, 0x84, 0x45, 0x90, 0x10, 0x74, 0x36, 0x90, 0x11, 0x64, 0x27, 0x90,
-0x12, 0x54, 0x18, 0x90, 0x13, 0x4D, 0x44, 0x10, 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xEB, 0x90,
-0x16, 0x13, 0xDC, 0x90, 0x17, 0x03, 0xCD, 0x90, 0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xAF, 0x90,
-0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90, 0x1B, 0xBC, 0xBD, 0x10, 0x1C, 0xAC, 0xAE, 0x10,
-0x1D, 0x9C, 0x9F, 0x10, 0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10,
-0x21, 0x5C, 0x63, 0x10, 0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10,
-0x25, 0x1C, 0x27, 0x10, 0x26, 0x0C, 0x18, 0x10, 0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90,
-0x28, 0xE5, 0x25, 0x90, 0x29, 0xD5, 0x16, 0x90, 0x2A, 0xC5, 0x07, 0x90, 0x2B, 0xB4, 0xF8, 0x90,
-0x2C, 0xA4, 0xE9, 0x90, 0x2D, 0x94, 0xDA, 0x90, 0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90,
-0x30, 0x64, 0xAD, 0x90, 0x31, 0x5D, 0xD9, 0x10, 0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10,
-0x34, 0x52, 0x96, 0x10, 0x35, 0x1D, 0x9D, 0x10, 0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10,
-0x38, 0x1B, 0x94, 0x90, 0x38, 0xDD, 0x61, 0x10, 0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10,
-0x3B, 0xDB, 0x58, 0x90, 0x3C, 0xA6, 0x5F, 0x90, 0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90,
-0x3F, 0x9B, 0x1C, 0x90, 0x40, 0x66, 0x23, 0x90, 0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90,
-0x43, 0x64, 0x1B, 0x10, 0x44, 0x25, 0xE7, 0x90, 0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90,
-0x47, 0x23, 0xDF, 0x10, 0x47, 0xEE, 0xE6, 0x10, 0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10,
-0x4A, 0xE3, 0xA3, 0x10, 0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10,
-0x4E, 0xAC, 0xA1, 0x90, 0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90,
-0x52, 0x6C, 0x65, 0x90, 0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90,
-0x56, 0x2C, 0x29, 0x90, 0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90,
-0x59, 0xF5, 0x28, 0x10, 0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10,
-0x5D, 0xB4, 0xEC, 0x10, 0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10,
-0x61, 0x7D, 0xEA, 0x90, 0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10,
-0x65, 0x3D, 0xAE, 0x90, 0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90,
-0x68, 0xFD, 0x72, 0x90, 0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90,
-0x6C, 0xC6, 0x71, 0x10, 0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90,
-0x70, 0x86, 0x35, 0x10, 0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10,
-0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10,
-0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10,
-0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90,
-0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
-0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x01,
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,
-0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x04, 0x00,
-0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xA4, 0x63, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E,
-0x8B, 0x1A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90, 0x00, 0x00, 0x00, 0x00, 0x10,
-0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90, 0x00, 0x00, 0x00, 0x00, 0x12,
-0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14,
-0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16,
-0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17,
-0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19,
-0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B,
-0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D,
-0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F,
-0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21,
-0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23,
-0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25,
-0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27,
-0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28,
-0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A,
-0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C,
-0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E,
-0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30,
-0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32,
-0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34,
-0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
-0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38,
-0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39,
-0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B,
-0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D,
-0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F,
-0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41,
-0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43,
-0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45,
-0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47,
-0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
-0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A,
-0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C,
-0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E,
-0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50,
-0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52,
-0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54,
-0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56,
-0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58,
-0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59,
-0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B,
-0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D,
-0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F,
-0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61,
-0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63,
-0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65,
-0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67,
-0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68,
-0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A,
-0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C,
-0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E,
-0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70,
-0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72,
-0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74,
-0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76,
-0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78,
-0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79,
-0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B,
-0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D,
-0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F,
-0x8E, 0x7F, 0x90, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
-0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x05, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x05, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x01, 0x01,
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x57, 0x45, 0x54, 0x30, 0x57, 0x45, 0x53, 0x54, 0x2C,
-0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30,
-0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0xE1, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1B, 0x80, 0x00, 0x00, 0x00,
+0x92, 0xE6, 0x8E, 0x80, 0x9B, 0x4B, 0x6D, 0x70, 0x9B, 0xFE, 0xC7, 0x80, 0x9C, 0x9C, 0xFB, 0x80,
+0x9D, 0xC9, 0x83, 0x70, 0x9E, 0x7E, 0x2F, 0x00, 0x9F, 0xAA, 0xB6, 0xF0, 0xA0, 0x5F, 0x62, 0x80,
+0xA1, 0x8B, 0xEA, 0x70, 0xA2, 0x41, 0xE7, 0x80, 0xA3, 0x6E, 0x6F, 0x70, 0xA4, 0x23, 0x1B, 0x00,
+0xA5, 0x4F, 0xA2, 0xF0, 0xAA, 0x05, 0xEF, 0x70, 0xAA, 0xE7, 0x5F, 0xF0, 0xAD, 0xC9, 0xA7, 0xF0,
+0xAE, 0xA7, 0x23, 0xF0, 0xAF, 0xA0, 0x4F, 0x70, 0xB0, 0x87, 0x05, 0xF0, 0xB1, 0x89, 0x6B, 0xF0,
+0xB2, 0x70, 0x22, 0x70, 0xB3, 0x72, 0x88, 0x70, 0xB4, 0x50, 0x04, 0x70, 0xB7, 0x32, 0x4C, 0x70,
+0xB8, 0x0F, 0xC8, 0x70, 0xB8, 0xFF, 0xB9, 0x70, 0xB9, 0xEF, 0xAA, 0x70, 0xBC, 0xC8, 0xB7, 0xF0,
+0xBD, 0xB8, 0xA8, 0xF0, 0xBE, 0x9F, 0x5F, 0x70, 0xBF, 0x98, 0x8A, 0xF0, 0xC0, 0x9A, 0xF0, 0xF0,
+0xC1, 0x78, 0x6C, 0xF0, 0xC2, 0x68, 0x5D, 0xF0, 0xC3, 0x58, 0x4E, 0xF0, 0xC4, 0x3F, 0x05, 0x70,
+0xC5, 0x38, 0x30, 0xF0, 0xC6, 0x3A, 0x96, 0xF0, 0xC7, 0x58, 0xAC, 0x70, 0xC7, 0xD9, 0xDF, 0x70,
+0xC9, 0x03, 0xD2, 0x70, 0xC9, 0xF1, 0x20, 0x70, 0xCA, 0xE2, 0x62, 0xF0, 0xCB, 0xB5, 0x52, 0xF0,
+0xCB, 0xEC, 0xA3, 0xE0, 0xCC, 0x80, 0x4B, 0xE0, 0xCC, 0xDC, 0xA2, 0xF0, 0xCD, 0x95, 0x34, 0xF0,
+0xCD, 0xC3, 0x4B, 0x60, 0xCE, 0x72, 0xA2, 0xE0, 0xCE, 0xC5, 0xBF, 0x70, 0xCF, 0x75, 0x16, 0xF0,
+0xCF, 0xAC, 0x67, 0xE0, 0xD0, 0x52, 0x84, 0xE0, 0xD0, 0xA5, 0xA1, 0x70, 0xD1, 0x54, 0xF8, 0xF0,
+0xD1, 0x8C, 0x49, 0xE0, 0xD2, 0x32, 0x66, 0xE0, 0xD2, 0x85, 0x83, 0x70, 0xD3, 0x59, 0xC4, 0xF0,
+0xD4, 0x49, 0xB5, 0xF0, 0xD5, 0x39, 0xD1, 0x20, 0xD6, 0x29, 0xC2, 0x20, 0xD7, 0x19, 0xB3, 0x20,
+0xD8, 0x09, 0xA4, 0x20, 0xD8, 0xF9, 0x95, 0x20, 0xD9, 0xE9, 0x86, 0x20, 0xDA, 0xD9, 0x77, 0x20,
+0xDB, 0xC9, 0x68, 0x20, 0xDC, 0xB9, 0x59, 0x20, 0xDD, 0xB2, 0x84, 0xA0, 0xDE, 0xA2, 0x75, 0xA0,
+0xDF, 0x92, 0x66, 0xA0, 0xE0, 0x82, 0x57, 0xA0, 0xE1, 0x72, 0x48, 0xA0, 0xE2, 0x62, 0x39, 0xA0,
+0xE3, 0x52, 0x2A, 0xA0, 0xE4, 0x42, 0x1B, 0xA0, 0xE5, 0x32, 0x0C, 0xA0, 0xE6, 0x21, 0xFD, 0xA0,
+0xE7, 0x1B, 0x29, 0x20, 0xE8, 0x0B, 0x1A, 0x20, 0xE8, 0xFB, 0x0B, 0x20, 0xE9, 0xEA, 0xFC, 0x20,
+0xEA, 0xDA, 0xED, 0x20, 0xEB, 0xCA, 0xDE, 0x20, 0xEC, 0xBA, 0xCF, 0x20, 0xED, 0xAA, 0xC0, 0x20,
+0xEE, 0x9A, 0xB1, 0x20, 0xEF, 0x8A, 0xA2, 0x20, 0xF0, 0x7A, 0x93, 0x20, 0xF1, 0x6A, 0x84, 0x20,
+0xF2, 0x63, 0xAF, 0xA0, 0xF3, 0x53, 0xA0, 0xA0, 0xF4, 0x43, 0x91, 0xA0, 0xF5, 0x33, 0x82, 0xA0,
+0xF6, 0x23, 0x73, 0xA0, 0xF7, 0x13, 0x64, 0xA0, 0xF8, 0x03, 0x55, 0xA0, 0xF8, 0xF3, 0x46, 0xA0,
+0xF9, 0xE3, 0x37, 0xA0, 0x0C, 0xAB, 0x2A, 0x00, 0x0D, 0x9B, 0x1B, 0x00, 0x0E, 0x8B, 0x0C, 0x00,
+0x0F, 0x84, 0x45, 0x90, 0x10, 0x74, 0x36, 0x90, 0x11, 0x64, 0x27, 0x90, 0x12, 0x54, 0x18, 0x90,
+0x13, 0x4D, 0x44, 0x10, 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xDD, 0x80, 0x16, 0x13, 0xCE, 0x80,
+0x17, 0x03, 0xBF, 0x80, 0x17, 0xF3, 0xB0, 0x80, 0x18, 0xE3, 0xA1, 0x80, 0x19, 0xD3, 0x92, 0x80,
+0x1A, 0xC3, 0x83, 0x80, 0x1B, 0xBC, 0xAF, 0x00, 0x1C, 0xAC, 0xA0, 0x00, 0x1D, 0x9C, 0x91, 0x00,
+0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10, 0x21, 0x5C, 0x63, 0x10,
+0x22, 0x4C, 0x54, 0x10, 0x23, 0x3C, 0x45, 0x10, 0x24, 0x2C, 0x36, 0x10, 0x25, 0x1C, 0x27, 0x10,
+0x26, 0x0C, 0x18, 0x10, 0x27, 0x05, 0x43, 0x90, 0x27, 0xF5, 0x34, 0x90, 0x28, 0xE5, 0x25, 0x90,
+0x29, 0xD5, 0x16, 0x90, 0x2A, 0xC5, 0x07, 0x90, 0x2B, 0xB4, 0xF8, 0x90, 0x2C, 0xA4, 0xE9, 0x90,
+0x2D, 0x94, 0xDA, 0x90, 0x2E, 0x84, 0xCB, 0x90, 0x2F, 0x74, 0xBC, 0x90, 0x30, 0x64, 0xAD, 0x90,
+0x31, 0x5D, 0xD9, 0x10, 0x32, 0x72, 0xB4, 0x10, 0x33, 0x3D, 0xBB, 0x10, 0x34, 0x52, 0x96, 0x10,
+0x35, 0x1D, 0x9D, 0x10, 0x36, 0x32, 0x78, 0x10, 0x36, 0xFD, 0x7F, 0x10, 0x38, 0x1B, 0x94, 0x90,
+0x38, 0xDD, 0x61, 0x10, 0x39, 0xFB, 0x76, 0x90, 0x3A, 0xBD, 0x43, 0x10, 0x3B, 0xDB, 0x58, 0x90,
+0x3C, 0xA6, 0x5F, 0x90, 0x3D, 0xBB, 0x3A, 0x90, 0x3E, 0x86, 0x41, 0x90, 0x3F, 0x9B, 0x1C, 0x90,
+0x40, 0x66, 0x23, 0x90, 0x41, 0x84, 0x39, 0x10, 0x42, 0x46, 0x05, 0x90, 0x43, 0x64, 0x1B, 0x10,
+0x44, 0x25, 0xE7, 0x90, 0x45, 0x43, 0xFD, 0x10, 0x46, 0x05, 0xC9, 0x90, 0x47, 0x23, 0xDF, 0x10,
+0x47, 0xEE, 0xE6, 0x10, 0x49, 0x03, 0xC1, 0x10, 0x49, 0xCE, 0xC8, 0x10, 0x4A, 0xE3, 0xA3, 0x10,
+0x4B, 0xAE, 0xAA, 0x10, 0x4C, 0xCC, 0xBF, 0x90, 0x4D, 0x8E, 0x8C, 0x10, 0x4E, 0xAC, 0xA1, 0x90,
+0x4F, 0x6E, 0x6E, 0x10, 0x50, 0x8C, 0x83, 0x90, 0x51, 0x57, 0x8A, 0x90, 0x52, 0x6C, 0x65, 0x90,
+0x53, 0x37, 0x6C, 0x90, 0x54, 0x4C, 0x47, 0x90, 0x55, 0x17, 0x4E, 0x90, 0x56, 0x2C, 0x29, 0x90,
+0x56, 0xF7, 0x30, 0x90, 0x58, 0x15, 0x46, 0x10, 0x58, 0xD7, 0x12, 0x90, 0x59, 0xF5, 0x28, 0x10,
+0x5A, 0xB6, 0xF4, 0x90, 0x5B, 0xD5, 0x0A, 0x10, 0x5C, 0xA0, 0x11, 0x10, 0x5D, 0xB4, 0xEC, 0x10,
+0x5E, 0x7F, 0xF3, 0x10, 0x5F, 0x94, 0xCE, 0x10, 0x60, 0x5F, 0xD5, 0x10, 0x61, 0x7D, 0xEA, 0x90,
+0x62, 0x3F, 0xB7, 0x10, 0x63, 0x5D, 0xCC, 0x90, 0x64, 0x1F, 0x99, 0x10, 0x65, 0x3D, 0xAE, 0x90,
+0x66, 0x08, 0xB5, 0x90, 0x67, 0x1D, 0x90, 0x90, 0x67, 0xE8, 0x97, 0x90, 0x68, 0xFD, 0x72, 0x90,
+0x69, 0xC8, 0x79, 0x90, 0x6A, 0xDD, 0x54, 0x90, 0x6B, 0xA8, 0x5B, 0x90, 0x6C, 0xC6, 0x71, 0x10,
+0x6D, 0x88, 0x3D, 0x90, 0x6E, 0xA6, 0x53, 0x10, 0x6F, 0x68, 0x1F, 0x90, 0x70, 0x86, 0x35, 0x10,
+0x71, 0x51, 0x3C, 0x10, 0x72, 0x66, 0x17, 0x10, 0x73, 0x31, 0x1E, 0x10, 0x74, 0x45, 0xF9, 0x10,
+0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 0x78, 0x0E, 0xF7, 0x90,
+0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 0x7B, 0xCE, 0xBB, 0x90,
+0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 0x7F, 0x8E, 0x7F, 0x90,
+0x00, 0x06, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
+0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x07, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00,
+0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00,
+0x12, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C,
+0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C,
+0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00, 0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54,
+0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE1, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x1B,
+0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x3D, 0x0C, 0x1D, 0xFF, 0xFF, 0xFF, 0xFF, 0x92, 0xE6, 0x8E, 0x80,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x4B, 0x6D, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0xFE, 0xC7, 0x80,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9C, 0x9C, 0xFB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0xC9, 0x83, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x7E, 0x2F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xAA, 0xB6, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x5F, 0x62, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x8B, 0xEA, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x41, 0xE7, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x6E, 0x6F, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x23, 0x1B, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x4F, 0xA2, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0x05, 0xEF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAA, 0xE7, 0x5F, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAD, 0xC9, 0xA7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xAE, 0xA7, 0x23, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xA0, 0x4F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB0, 0x87, 0x05, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB1, 0x89, 0x6B, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0x70, 0x22, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB3, 0x72, 0x88, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0x50, 0x04, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x32, 0x4C, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0F, 0xC8, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFF, 0xB9, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0xEF, 0xAA, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBC, 0xC8, 0xB7, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xBD, 0xB8, 0xA8, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x9F, 0x5F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xBF, 0x98, 0x8A, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x9A, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC1, 0x78, 0x6C, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC2, 0x68, 0x5D, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC3, 0x58, 0x4E, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC4, 0x3F, 0x05, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC5, 0x38, 0x30, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC6, 0x3A, 0x96, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0x58, 0xAC, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC7, 0xD9, 0xDF, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x03, 0xD2, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xF1, 0x20, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xE2, 0x62, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xB5, 0x52, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xEC, 0xA3, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x80, 0x4B, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDC, 0xA2, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0x95, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xC3, 0x4B, 0x60,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0x72, 0xA2, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xC5, 0xBF, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x75, 0x16, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0xAC, 0x67, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0x52, 0x84, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xA5, 0xA1, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x54, 0xF8, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x8C, 0x49, 0xE0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x32, 0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x85, 0x83, 0x70,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD3, 0x59, 0xC4, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD4, 0x49, 0xB5, 0xF0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x39, 0xD1, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x29, 0xC2, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x19, 0xB3, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0x09, 0xA4, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD8, 0xF9, 0x95, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xD9, 0xE9, 0x86, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDA, 0xD9, 0x77, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDB, 0xC9, 0x68, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDC, 0xB9, 0x59, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xDD, 0xB2, 0x84, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xDE, 0xA2, 0x75, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x92, 0x66, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x82, 0x57, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE1, 0x72, 0x48, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE2, 0x62, 0x39, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0x52, 0x2A, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE4, 0x42, 0x1B, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE5, 0x32, 0x0C, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE6, 0x21, 0xFD, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x1B, 0x29, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x0B, 0x1A, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xFB, 0x0B, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xE9, 0xEA, 0xFC, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xDA, 0xED, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xCA, 0xDE, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xBA, 0xCF, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xAA, 0xC0, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x9A, 0xB1, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x8A, 0xA2, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x7A, 0x93, 0x20,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x6A, 0x84, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x63, 0xAF, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x53, 0xA0, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x43, 0x91, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x33, 0x82, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x23, 0x73, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x13, 0x64, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x03, 0x55, 0xA0,
+0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xF3, 0x46, 0xA0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE3, 0x37, 0xA0,
+0x00, 0x00, 0x00, 0x00, 0x0C, 0xAB, 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0x1B, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x0E, 0x8B, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x84, 0x45, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x36, 0x90, 0x00, 0x00, 0x00, 0x00, 0x11, 0x64, 0x27, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x12, 0x54, 0x18, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x44, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xDD, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xCE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xBF, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xB0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xA1, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x83, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10,
+0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90,
+0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x00, 0x06, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04, 0x03, 0x05, 0x03, 0x04,
+0x03, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x07, 0x02, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x09, 0x0A,
+0x09, 0x0A, 0x09, 0x0A, 0x09, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08,
+0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0x08, 0x06, 0xFF, 0xFF, 0xF7, 0x63, 0x00, 0x00, 0x00,
+0x00, 0x0E, 0x10, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x01,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x0D, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x09, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x0E, 0x10, 0x01, 0x04, 0x00,
+0x00, 0x0E, 0x10, 0x00, 0x12, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x16, 0x00, 0x00, 0x0E, 0x10, 0x01,
+0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x57, 0x45, 0x53, 0x54, 0x00,
+0x57, 0x45, 0x54, 0x00, 0x57, 0x45, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x57, 0x45, 0x54,
+0x30, 0x57, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x31, 0x2C, 0x4D,
+0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 
 
 /* Zulu */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -70100,4 +70848,4 @@
 };
 #endif
 
-const timelib_tzdb timezonedb_builtin = { "2024.1", 597, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
+const timelib_tzdb timezonedb_builtin = { "2024.2", 597, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };

php-8.2.23.tar.xz/ext/date/php_date.c -> php-8.2.28.tar.xz/ext/date/php_date.c Changed

@@ -687,8 +687,11 @@
 			                          (offset->offset < 0) ? '-' : '+',
 			                          abs(offset->offset / 3600),
 			                          abs((offset->offset % 3600) / 60));
-		} else {
+		} else if (t->zone_type == TIMELIB_ZONETYPE_ID) {
 			offset = timelib_get_time_zone_info(t->sse, t->tz_info);
+		} else {
+			/* Shouldn't happen, but code defensively */
+			offset = timelib_time_offset_ctor();
 		}
 	}
 
@@ -2304,7 +2307,7 @@
 
 	common = zend_std_get_properties(zobj);
 
-	ZEND_HASH_MAP_FOREACH_STR_KEY_VAL_IND(common, name, prop) {
+	ZEND_HASH_FOREACH_STR_KEY_VAL_IND(common, name, prop) {
 		if (zend_hash_add(myht, name, prop) != NULL) {
 			Z_TRY_ADDREF_P(prop);
 		}
@@ -2418,6 +2421,9 @@
 				new_dst    = tzobj->tzi.z.dst;
 				new_abbr   = timelib_strdup(tzobj->tzi.z.abbr);
 				break;
+			default:
+				zend_throw_error(NULL, "The DateTimeZone object has not been correctly initialized by its constructor");
+				return 0;
 		}
 		type = tzobj->type;
 	} else if (dateobj->time->tz_info) {
@@ -2834,7 +2840,7 @@
 	zend_string      *prop_name;
 	zval             *prop_val;
 
-	ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
+	ZEND_HASH_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
 		if (!prop_name || (Z_TYPE_P(prop_val) == IS_REFERENCE) || date_time_is_internal_property(prop_name)) {
 			continue;
 		}
@@ -2905,6 +2911,7 @@
 
 	if (!php_date_initialize_from_hash(&dateobj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DateTime object");
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -2924,6 +2931,7 @@
 
 	if (!php_date_initialize_from_hash(&dateobj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DateTimeImmutable object");
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -3814,7 +3822,7 @@
 	tzobj = Z_PHPTIMEZONE_P(return_value);
 	if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
 		zend_throw_error(NULL, "Timezone initialization failed");
-		zval_ptr_dtor(return_value);
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -3834,6 +3842,7 @@
 
 	if (!php_date_timezone_initialize_from_hash(&return_value, &tzobj, myht)) {
 		zend_throw_error(NULL, "Timezone initialization failed");
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -3874,7 +3883,7 @@
 	zend_string      *prop_name;
 	zval             *prop_val;
 
-	ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
+	ZEND_HASH_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
 		if (!prop_name || (Z_TYPE_P(prop_val) == IS_REFERENCE) || date_timezone_is_internal_property(prop_name)) {
 			continue;
 		}
@@ -3899,6 +3908,7 @@
 
 	if (!php_date_timezone_initialize_from_hash(&object, &tzobj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DateTimeZone object");
+		RETURN_THROWS();
 	}
 
 	restore_custom_datetimezone_properties(object, myht);
@@ -4502,7 +4512,7 @@
 	zend_string      *prop_name;
 	zval             *prop_val;
 
-	ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
+	ZEND_HASH_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
 		if (!prop_name || (Z_TYPE_P(prop_val) == IS_REFERENCE) || date_interval_is_internal_property(prop_name)) {
 			continue;
 		}
@@ -5101,6 +5111,10 @@
 	}
 	altitude = 90 - zenith;
 
+	if (!zend_finite(latitude) || !zend_finite(longitude)) {
+		RETURN_FALSE;
+	}
+
 	/* Initialize time struct */
 	tzi = get_timezone_info();
 	if (!tzi) {
@@ -5130,6 +5144,9 @@
 	if (N > 24 || N < 0) {
 		N -= floor(N / 24) * 24;
 	}
+	if (N > 24 || N < 0) {
+		RETURN_FALSE;
+	}
 
 	switch (retformat) {
 		case SUNFUNCS_RET_STRING:
@@ -5175,6 +5192,15 @@
 		Z_PARAM_DOUBLE(longitude)
 	ZEND_PARSE_PARAMETERS_END();
 
+	if (!zend_finite(latitude)) {
+		zend_argument_value_error(2, "must be finite");
+		RETURN_THROWS();
+	}
+	if (!zend_finite(longitude)) {
+		zend_argument_value_error(3, "must be finite");
+		RETURN_THROWS();
+	}
+
 	/* Initialize time struct */
 	tzi = get_timezone_info();
 	if (!tzi) {
@@ -5440,6 +5466,7 @@
 	period_obj = Z_PHPPERIOD_P(return_value);
 	if (!php_date_period_initialize_from_hash(period_obj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
+		RETURN_THROWS();
 	}
 }
 /* }}} */
@@ -5490,7 +5517,7 @@
 	zend_string      *prop_name;
 	zval             *prop_val;
 
-	ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
+	ZEND_HASH_FOREACH_STR_KEY_VAL(myht, prop_name, prop_val) {
 		if (!prop_name || (Z_TYPE_P(prop_val) == IS_REFERENCE) || date_period_is_internal_property(prop_name)) {
 			continue;
 		}
@@ -5515,6 +5542,7 @@
 
 	if (!php_date_period_initialize_from_hash(period_obj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
+		RETURN_THROWS();
 	}
 	restore_custom_dateperiod_properties(object, myht);
 }
@@ -5535,6 +5563,7 @@
 
 	if (!php_date_period_initialize_from_hash(period_obj, myht)) {
 		zend_throw_error(NULL, "Invalid serialization data for DatePeriod object");
+		RETURN_THROWS();
 	}
 }
 /* }}} */

php-8.2.23.tar.xz/ext/date/tests/DatePeriod_no_advance_on_valid.phpt -> php-8.2.28.tar.xz/ext/date/tests/DatePeriod_no_advance_on_valid.phpt Changed

php-8.2.28.tar.xz/ext/date/tests/bug-gh15582.phpt Added

php-8.2.28.tar.xz/ext/date/tests/bug-gh16037.phpt Added

php-8.2.23.tar.xz/ext/date/tests/bug40861.phpt -> php-8.2.28.tar.xz/ext/date/tests/bug40861.phpt Changed

php-8.2.28.tar.xz/ext/date/tests/gh14732.phpt Added

@@ -0,0 +1,38 @@
+--TEST--
+GH-14732 (date_sun_info() fails for non-finite values)
+--FILE--
+<?php
+try {
+    date_sun_info(1, NAN, 1);
+} catch (ValueError $ex) {
+    echo $ex->getMessage(), "\n";
+}
+try {
+    date_sun_info(1, -INF, 1);
+} catch (ValueError $ex) {
+    echo $ex->getMessage(), "\n";
+}
+try {
+    date_sun_info(1, 1, NAN);
+} catch (ValueError $ex) {
+    echo $ex->getMessage(), "\n";
+}
+try {
+    date_sun_info(1, 1, INF);
+} catch (ValueError $ex) {
+    echo $ex->getMessage(), "\n";
+}
+var_dump(date_sunset(1, SUNFUNCS_RET_STRING, NAN, 1));
+var_dump(date_sunrise(1, SUNFUNCS_RET_STRING, 1, NAN));
+?>
+--EXPECTF--
+date_sun_info(): Argument #2 ($latitude) must be finite
+date_sun_info(): Argument #2 ($latitude) must be finite
+date_sun_info(): Argument #3 ($longitude) must be finite
+date_sun_info(): Argument #3 ($longitude) must be finite
+
+Deprecated: Function date_sunset() is deprecated in %s on line %d
+bool(false)
+
+Deprecated: Function date_sunrise() is deprecated in %s on line %d
+bool(false)

php-8.2.28.tar.xz/ext/date/tests/gh16454.phpt Added

php-8.2.23.tar.xz/ext/dba/dba.c -> php-8.2.28.tar.xz/ext/dba/dba.c Changed

@@ -772,11 +772,18 @@
 			info->lock.fp = php_stream_open_wrapper(lock_name, lock_file_mode, STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|persistent_flag, &opened_path);
 			if (info->lock.fp) {
 				if (is_db_lock) {
-					/* replace the path info with the real path of the opened file */
-					pefree(info->path, persistent);
-					info->path = pestrndup(ZSTR_VAL(opened_path), ZSTR_LEN(opened_path), persistent);
+					if (opened_path) {
+						/* replace the path info with the real path of the opened file */
+						pefree(info->path, persistent);
+						info->path = pestrndup(ZSTR_VAL(opened_path), ZSTR_LEN(opened_path), persistent);
+					} else {
+						error = "Unable to determine path for locking";
+					}
 				}
+			}
+			if (opened_path) {
 				zend_string_release_ex(opened_path, 0);
+				opened_path = NULL;
 			}
 		}
 		if (!is_db_lock) {
@@ -788,10 +795,10 @@
 			FREE_PERSISTENT_RESOURCE_KEY();
 			RETURN_FALSE;
 		}
-		if (!php_stream_supports_lock(info->lock.fp)) {
+		if (!error && !php_stream_supports_lock(info->lock.fp)) {
 			error = "Stream does not support locking";
 		}
-		if (php_stream_lock(info->lock.fp, lock_mode)) {
+		if (!error && php_stream_lock(info->lock.fp, lock_mode)) {
 			error = "Unable to establish lock"; /* force failure exit */
 		}
 	}

php-8.2.23.tar.xz/ext/dba/tests/dba_flatfile.phpt -> php-8.2.28.tar.xz/ext/dba/tests/dba_flatfile.phpt Changed

php-8.2.23.tar.xz/ext/dba/tests/dba_gdbm.phpt -> php-8.2.28.tar.xz/ext/dba/tests/dba_gdbm.phpt Changed

php-8.2.23.tar.xz/ext/dba/tests/dba_inifile.phpt -> php-8.2.28.tar.xz/ext/dba/tests/dba_inifile.phpt Changed

php-8.2.23.tar.xz/ext/dba/tests/dba_ndbm.phpt -> php-8.2.28.tar.xz/ext/dba/tests/dba_ndbm.phpt Changed

php-8.2.23.tar.xz/ext/dba/tests/dba_qdbm.phpt -> php-8.2.28.tar.xz/ext/dba/tests/dba_qdbm.phpt Changed

php-8.2.23.tar.xz/ext/dba/tests/dba_tcadb.phpt -> php-8.2.28.tar.xz/ext/dba/tests/dba_tcadb.phpt Changed

php-8.2.28.tar.xz/ext/dba/tests/gh16390.phpt Added

php-8.2.23.tar.xz/ext/dba/tests/setup/setup_dba_tests.inc -> php-8.2.28.tar.xz/ext/dba/tests/setup/setup_dba_tests.inc Changed

@@ -102,14 +102,29 @@
     echo 'Try to remove key 1 again', \PHP_EOL;
     var_dump(dba_delete("key1", $db_writer));
 
-    // Fetch data
+    // Fetch and sort data. We sort to guarantee that the output is
+    // consistent across invocations and architectures. When iterating
+    // with firstkey() and nextkey(), several engines (GDBM, LMDB,
+    // QDBM) make no promise about the iteration order. Others (TCADB,
+    // DBM) explicitly state that the order is arbitrary. With GDBM at
+    // least, the order appears platform-dependent -- we have a report
+    // in Github issue 14786. GDBM's own test suite sorts this output,
+    // suggesting that sorting is a reasonable workaround for the issue.
+    $output = ;
+
     $key = dba_firstkey($db_writer);
     $total_keys = 0;
     while ($key) {
-        echo $key, ': ', dba_fetch($key, $db_writer), \PHP_EOL;
+        $output = $key . ': ' . dba_fetch($key, $db_writer) . \PHP_EOL;
         $key = dba_nextkey($db_writer);
         $total_keys++;
     }
+
+    sort($output, SORT_STRING);
+    foreach ($output as $line) {
+        echo $line;
+    }
+
     echo 'Total keys: ', $total_keys, \PHP_EOL;
     for ($i = 1; $i < 6; $i++) {
         echo "Key $i exists? ", dba_exists("key$i", $db_writer) ? 'Y' : 'N', \PHP_EOL;

php-8.2.23.tar.xz/ext/dl_test/dl_test.c -> php-8.2.28.tar.xz/ext/dl_test/dl_test.c Changed

php-8.2.23.tar.xz/ext/dl_test/dl_test.stub.php -> php-8.2.28.tar.xz/ext/dl_test/dl_test.stub.php Changed

php-8.2.23.tar.xz/ext/dl_test/dl_test_arginfo.h -> php-8.2.28.tar.xz/ext/dl_test/dl_test_arginfo.h Changed

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 547ddbc21e9aa853b491cb17e902bbbb9cc2df00 */
+ * Stub hash: 2dbacf5282b0f8e53923ac70495c2da43c7237e3 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dl_test_test1, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
@@ -8,9 +8,12 @@
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, str, IS_STRING, 0, "\"\"")
 ZEND_END_ARG_INFO()
 
+#define arginfo_class_DlTest_test arginfo_dl_test_test2
+
 
 ZEND_FUNCTION(dl_test_test1);
 ZEND_FUNCTION(dl_test_test2);
+ZEND_METHOD(DlTest, test);
 
 
 static const zend_function_entry ext_functions = {
@@ -18,3 +21,19 @@
 	ZEND_FE(dl_test_test2, arginfo_dl_test_test2)
 	ZEND_FE_END
 };
+
+
+static const zend_function_entry class_DlTest_methods = {
+	ZEND_ME(DlTest, test, arginfo_class_DlTest_test, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+static zend_class_entry *register_class_DlTest(void)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "DlTest", class_DlTest_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}

php-8.2.23.tar.xz/ext/dom/dom_iterators.c -> php-8.2.28.tar.xz/ext/dom/dom_iterators.c Changed

php-8.2.23.tar.xz/ext/dom/node.c -> php-8.2.28.tar.xz/ext/dom/node.c Changed

@@ -843,13 +843,57 @@
 }
 /* }}} */
 
+static bool dom_node_check_legacy_insertion_validity(xmlNodePtr parentp, xmlNodePtr child, bool stricterror)
+{
+	if (dom_node_is_read_only(parentp) == SUCCESS ||
+		(child->parent != NULL && dom_node_is_read_only(child->parent) == SUCCESS)) {
+		php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror);
+		return false;
+	}
+
+	if (dom_hierarchy(parentp, child) == FAILURE) {
+		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
+		return false;
+	}
+
+	if (child->doc != parentp->doc && child->doc != NULL) {
+		php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror);
+		return false;
+	}
+
+	if (child->type == XML_DOCUMENT_FRAG_NODE && child->children == NULL) {
+		/* TODO Drop Warning? */
+		php_error_docref(NULL, E_WARNING, "Document Fragment is empty");
+		return false;
+	}
+
+	/* In old DOM only text nodes and entity nodes can be added as children to attributes. */
+	if (parentp->type == XML_ATTRIBUTE_NODE && child->type != XML_TEXT_NODE && child->type != XML_ENTITY_REF_NODE) {
+		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
+		return false;
+	}
+	/* Attributes must be in elements. */
+	if (child->type == XML_ATTRIBUTE_NODE && parentp->type != XML_ELEMENT_NODE) {
+		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
+		return false;
+	}
+
+	/* Documents can never be a child. */
+	if (child->type == XML_DOCUMENT_NODE || child->type == XML_HTML_DOCUMENT_NODE) {
+		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
+		return false;
+	}
+
+	return true;
+}
+
 /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-952280727
 Since:
 */
 PHP_METHOD(DOMNode, insertBefore)
 {
 	zval *id, *node, *ref = NULL;
-	xmlNodePtr child, new_child, parentp, refp;
+	xmlNodePtr child, new_child, parentp, refp = NULL;
 	dom_object *intern, *childobj, *refpobj;
 	int ret, stricterror;
 
@@ -870,26 +914,17 @@
 
 	stricterror = dom_get_strict_error(intern->document);
 
-	if (dom_node_is_read_only(parentp) == SUCCESS ||
-		(child->parent != NULL && dom_node_is_read_only(child->parent) == SUCCESS)) {
-		php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror);
-		RETURN_FALSE;
-	}
-
-	if (dom_hierarchy(parentp, child) == FAILURE) {
-		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
+	if (!dom_node_check_legacy_insertion_validity(parentp, child, stricterror)) {
 		RETURN_FALSE;
 	}
 
-	if (child->doc != parentp->doc && child->doc != NULL) {
-		php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror);
-		RETURN_FALSE;
-	}
-
-	if (child->type == XML_DOCUMENT_FRAG_NODE && child->children == NULL) {
-		/* TODO Drop Warning? */
-		php_error_docref(NULL, E_WARNING, "Document Fragment is empty");
-		RETURN_FALSE;
+	/* Fetch and perform sanity checks before modifying reference pointers. */
+	if (ref != NULL) {
+		DOM_GET_OBJ(refp, ref, xmlNodePtr, refpobj);
+		if (refp->parent != parentp) {
+			php_dom_throw_error(NOT_FOUND_ERR, stricterror);
+			RETURN_FALSE;
+		}
 	}
 
 	if (child->doc == NULL && parentp->doc != NULL) {
@@ -898,12 +933,6 @@
 	}
 
 	if (ref != NULL) {
-		DOM_GET_OBJ(refp, ref, xmlNodePtr, refpobj);
-		if (refp->parent != parentp) {
-			php_dom_throw_error(NOT_FOUND_ERR, stricterror);
-			RETURN_FALSE;
-		}
-
 		if (child->parent != NULL) {
 			xmlUnlinkNode(child);
 		}
@@ -1067,6 +1096,13 @@
 		RETURN_FALSE;
 	}
 
+	/* This is already disallowed by libxml, but we should check it here to avoid
+	 * breaking assumptions and assertions. */
+	if ((oldchild->type == XML_ATTRIBUTE_NODE) != (newchild->type == XML_ATTRIBUTE_NODE)) {
+		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
+		RETURN_FALSE;
+	}
+
 	if (oldchild->parent != nodep) {
 		php_dom_throw_error(NOT_FOUND_ERR, stricterror);
 		RETURN_FALSE;
@@ -1170,25 +1206,7 @@
 
 	stricterror = dom_get_strict_error(intern->document);
 
-	if (dom_node_is_read_only(nodep) == SUCCESS ||
-		(child->parent != NULL && dom_node_is_read_only(child->parent) == SUCCESS)) {
-		php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror);
-		RETURN_FALSE;
-	}
-
-	if (dom_hierarchy(nodep, child) == FAILURE) {
-		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
-		RETURN_FALSE;
-	}
-
-	if (!(child->doc == NULL || child->doc == nodep->doc)) {
-		php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror);
-		RETURN_FALSE;
-	}
-
-	if (child->type == XML_DOCUMENT_FRAG_NODE && child->children == NULL) {
-		/* TODO Drop Warning? */
-		php_error_docref(NULL, E_WARNING, "Document Fragment is empty");
+	if (!dom_node_check_legacy_insertion_validity(nodep, child, stricterror)) {
 		RETURN_FALSE;
 	}

php-8.2.23.tar.xz/ext/dom/parentnode.c -> php-8.2.28.tar.xz/ext/dom/parentnode.c Changed

php-8.2.23.tar.xz/ext/dom/php_dom.stub.php -> php-8.2.28.tar.xz/ext/dom/php_dom.stub.php Changed

php-8.2.23.tar.xz/ext/dom/php_dom_arginfo.h -> php-8.2.28.tar.xz/ext/dom/php_dom_arginfo.h Changed

php-8.2.23.tar.xz/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt -> php-8.2.28.tar.xz/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt Changed

php-8.2.23.tar.xz/ext/dom/tests/bug69679.phpt -> php-8.2.28.tar.xz/ext/dom/tests/bug69679.phpt Changed

php-8.2.23.tar.xz/ext/dom/tests/bug78025.phpt -> php-8.2.28.tar.xz/ext/dom/tests/bug78025.phpt Changed

php-8.2.23.tar.xz/ext/dom/tests/bug80268_2.phpt -> php-8.2.28.tar.xz/ext/dom/tests/bug80268_2.phpt Changed

php-8.2.28.tar.xz/ext/dom/tests/gh15551.phpt Added

php-8.2.28.tar.xz/ext/dom/tests/gh16039.phpt Added

php-8.2.28.tar.xz/ext/dom/tests/gh16151.phpt Added

php-8.2.28.tar.xz/ext/dom/tests/gh16316.phpt Added

php-8.2.28.tar.xz/ext/dom/tests/gh16473.phpt Added

php-8.2.28.tar.xz/ext/dom/tests/gh16533.phpt Added

php-8.2.28.tar.xz/ext/dom/tests/gh16535.phpt Added

php-8.2.28.tar.xz/ext/dom/tests/gh16593.phpt Added

php-8.2.28.tar.xz/ext/dom/tests/ghsa-p3x9-6h7p-cgfc_001.phpt Added

@@ -0,0 +1,60 @@
+--TEST--
+GHSA-p3x9-6h7p-cgfc: libxml streams use wrong `content-type` header when requesting a redirected resource (Basic)
+--EXTENSIONS--
+dom
+--SKIPIF--
+<?php
+if (@!include "./ext/standard/tests/http/server.inc") die('skip server.inc not available');
+http_server_skipif();
+?>
+--FILE--
+<?php
+require "./ext/standard/tests/http/server.inc";
+
+function genResponses($server) {
+    $uri = 'http://' . stream_socket_get_name($server, false);
+    yield "data://text/plain,HTTP/1.1 302 Moved Temporarily\r\nLocation: $uri/document.xml\r\nContent-Type: text/html;charset=utf-16\r\n\r\n";
+    $xml = <<<'EOT'
+        <!doctype html>
+        <html>
+            <head>
+                <title>GHSA-p3x9-6h7p-cgfc</title>
+
+                <meta charset="utf-8" />
+                <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+            </head>
+
+            <body>
+                <h1>GHSA-p3x9-6h7p-cgfc</h1>
+            </body>
+        </html>
+        EOT;
+    // Intentionally using non-standard casing for content-type to verify it is matched not case sensitively.
+    yield "data://text/plain,HTTP/1.1 200 OK\r\nconteNt-tyPe: text/html; charset=utf-8\r\n\r\n{$xml}";
+}
+
+'pid' => $pid, 'uri' => $uri = http_server('genResponses', $output);
+$document = new \DOMDocument();
+$document->loadHTMLFile($uri);
+
+$h1 = $document->getElementsByTagName('h1');
+var_dump($h1->length);
+var_dump($document->saveHTML());
+http_server_kill($pid);
+?>
+--EXPECT--
+int(1)
+string(266) "<!DOCTYPE html>
+<html>
+    <head>
+        <title>GHSA-p3x9-6h7p-cgfc</title>
+
+        <meta charset="utf-8">
+        <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    </head>
+
+    <body>
+        <h1>GHSA-p3x9-6h7p-cgfc</h1>
+    </body>
+</html>
+"

php-8.2.28.tar.xz/ext/dom/tests/ghsa-p3x9-6h7p-cgfc_002.phpt Added

@@ -0,0 +1,60 @@
+--TEST--
+GHSA-p3x9-6h7p-cgfc: libxml streams use wrong `content-type` header when requesting a redirected resource (Missing content-type)
+--EXTENSIONS--
+dom
+--SKIPIF--
+<?php
+if (@!include "./ext/standard/tests/http/server.inc") die('skip server.inc not available');
+http_server_skipif();
+?>
+--FILE--
+<?php
+require "./ext/standard/tests/http/server.inc";
+
+function genResponses($server) {
+    $uri = 'http://' . stream_socket_get_name($server, false);
+    yield "data://text/plain,HTTP/1.1 302 Moved Temporarily\r\nLocation: $uri/document.xml\r\nContent-Type: text/html;charset=utf-16\r\n\r\n";
+    $xml = <<<'EOT'
+        <!doctype html>
+        <html>
+            <head>
+                <title>GHSA-p3x9-6h7p-cgfc</title>
+
+                <meta charset="utf-8" />
+                <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+            </head>
+
+            <body>
+                <h1>GHSA-p3x9-6h7p-cgfc</h1>
+            </body>
+        </html>
+        EOT;
+    // Missing content-type in actual response.
+    yield "data://text/plain,HTTP/1.1 200 OK\r\n\r\n{$xml}";
+}
+
+'pid' => $pid, 'uri' => $uri = http_server('genResponses', $output);
+$document = new \DOMDocument();
+$document->loadHTMLFile($uri);
+
+$h1 = $document->getElementsByTagName('h1');
+var_dump($h1->length);
+var_dump($document->saveHTML());
+http_server_kill($pid);
+?>
+--EXPECT--
+int(1)
+string(266) "<!DOCTYPE html>
+<html>
+    <head>
+        <title>GHSA-p3x9-6h7p-cgfc</title>
+
+        <meta charset="utf-8">
+        <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    </head>
+
+    <body>
+        <h1>GHSA-p3x9-6h7p-cgfc</h1>
+    </body>
+</html>
+"

php-8.2.28.tar.xz/ext/dom/tests/ghsa-p3x9-6h7p-cgfc_003.phpt Added

@@ -0,0 +1,60 @@
+--TEST--
+GHSA-p3x9-6h7p-cgfc: libxml streams use wrong `content-type` header when requesting a redirected resource (Reason with colon)
+--EXTENSIONS--
+dom
+--SKIPIF--
+<?php
+if (@!include "./ext/standard/tests/http/server.inc") die('skip server.inc not available');
+http_server_skipif();
+?>
+--FILE--
+<?php
+require "./ext/standard/tests/http/server.inc";
+
+function genResponses($server) {
+    $uri = 'http://' . stream_socket_get_name($server, false);
+    yield "data://text/plain,HTTP/1.1 302 Moved Temporarily\r\nLocation: $uri/document.xml\r\nContent-Type: text/html;charset=utf-16\r\n\r\n";
+    $xml = <<<'EOT'
+        <!doctype html>
+        <html>
+            <head>
+                <title>GHSA-p3x9-6h7p-cgfc</title>
+
+                <meta charset="utf-8" />
+                <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+            </head>
+
+            <body>
+                <h1>GHSA-p3x9-6h7p-cgfc</h1>
+            </body>
+        </html>
+        EOT;
+    // Missing content-type in actual response.
+    yield "data://text/plain,HTTP/1.1 200 OK: This is fine\r\n\r\n{$xml}";
+}
+
+'pid' => $pid, 'uri' => $uri = http_server('genResponses', $output);
+$document = new \DOMDocument();
+$document->loadHTMLFile($uri);
+
+$h1 = $document->getElementsByTagName('h1');
+var_dump($h1->length);
+var_dump($document->saveHTML());
+http_server_kill($pid);
+?>
+--EXPECT--
+int(1)
+string(266) "<!DOCTYPE html>
+<html>
+    <head>
+        <title>GHSA-p3x9-6h7p-cgfc</title>
+
+        <meta charset="utf-8">
+        <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    </head>
+
+    <body>
+        <h1>GHSA-p3x9-6h7p-cgfc</h1>
+    </body>
+</html>
+"

php-8.2.23.tar.xz/ext/dom/xml_common.h -> php-8.2.28.tar.xz/ext/dom/xml_common.h Changed

@@ -60,21 +60,23 @@
     (const xmlChar *) "http://www.w3.org/2000/xmlns/"
 
 #define NODE_GET_OBJ(__ptr, __id, __prtype, __intern) { \
-	__intern = Z_LIBXML_NODE_P(__id); \
+	zval *__zv = (__id); \
+	__intern = Z_LIBXML_NODE_P(__zv); \
 	if (__intern->node == NULL || !(__ptr = (__prtype)__intern->node->node)) { \
-  		php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", \
-			ZSTR_VAL(__intern->std.ce->name));\
-  		RETURN_NULL();\
+		php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", \
+			ZSTR_VAL(Z_OBJCE_P(__zv)->name));\
+		RETURN_NULL();\
   	} \
 }
 
 #define DOC_GET_OBJ(__ptr, __id, __prtype, __intern) { \
-	__intern = Z_LIBXML_NODE_P(__id); \
+	zval *__zv = (__id); \
+	__intern = Z_LIBXML_NODE_P(__zv); \
 	if (__intern->document != NULL) { \
 		if (!(__ptr = (__prtype)__intern->document->ptr)) { \
-  			php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\
-  			RETURN_NULL();\
-  		} \
+			php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", ZSTR_VAL(Z_OBJCE_P(__zv)->name));\
+			RETURN_NULL();\
+		} \
 	} \
 }

php-8.2.23.tar.xz/ext/dom/xpath.c -> php-8.2.28.tar.xz/ext/dom/xpath.c Changed

php-8.2.23.tar.xz/ext/exif/exif.c -> php-8.2.28.tar.xz/ext/exif/exif.c Changed

php-8.2.28.tar.xz/ext/exif/tests/gh16409.phpt Added

php-8.2.23.tar.xz/ext/ffi/ffi.c -> php-8.2.28.tar.xz/ext/ffi/ffi.c Changed

php-8.2.28.tar.xz/ext/ffi/tests/gh16397.phpt Added

php-8.2.23.tar.xz/ext/fileinfo/fileinfo.c -> php-8.2.28.tar.xz/ext/fileinfo/fileinfo.c Changed

php-8.2.23.tar.xz/ext/fileinfo/tests/cve-2014-3538-mb.phpt -> php-8.2.28.tar.xz/ext/fileinfo/tests/cve-2014-3538-mb.phpt Changed

php-8.2.23.tar.xz/ext/fileinfo/tests/cve-2014-3538-nojit.phpt -> php-8.2.28.tar.xz/ext/fileinfo/tests/cve-2014-3538-nojit.phpt Changed

php-8.2.23.tar.xz/ext/fileinfo/tests/finfo_file_001.phpt -> php-8.2.28.tar.xz/ext/fileinfo/tests/finfo_file_001.phpt Changed

php-8.2.23.tar.xz/ext/fileinfo/tests/finfo_file_basic.phpt -> php-8.2.28.tar.xz/ext/fileinfo/tests/finfo_file_basic.phpt Changed

php-8.2.23.tar.xz/ext/filter/logical_filters.c -> php-8.2.28.tar.xz/ext/filter/logical_filters.c Changed

@@ -542,7 +542,7 @@
 			/* Reset label length counter */
 			i = 1;
 		} else {
-			if (i > 63 || (hostname && *s != '-' && !isalnum((int)*(unsigned char *)s))) {
+			if (i > 63 || (hostname && (*s != '-' || *(s + 1) == '\0') && !isalnum((int)*(unsigned char *)s))) {
 				return 0;
 			}
 
@@ -925,13 +925,13 @@
 
 			if (flags & FILTER_FLAG_GLOBAL_RANGE) {
 				if (
-						(ip0 == 100 && ip1 >= 64 && ip1 <= 127 ) ||
-						(ip0 == 192 && ip1 == 0 && ip2 == 0 ) ||
-						(ip0 == 192 && ip1 == 0 && ip2 == 2 ) ||
-						(ip0 == 198 && ip1 >= 18 && ip1 <= 19 ) ||
-						(ip0 == 198 && ip1 == 51 && ip2 == 100 ) ||
-						(ip0 == 203 && ip1 == 0 && ip2 == 113 )
-		   ) {
+					(ip0 == 100 && ip1 >= 64 && ip1 <= 127 ) ||
+					(ip0 == 192 && ip1 == 0 && ip2 == 0 ) ||
+					(ip0 == 192 && ip1 == 0 && ip2 == 2 ) ||
+					(ip0 == 198 && ip1 >= 18 && ip1 <= 19 ) ||
+					(ip0 == 198 && ip1 == 51 && ip2 == 100 ) ||
+					(ip0 == 203 && ip1 == 0 && ip2 == 113 )
+				) {
 					RETURN_VALIDATION_FAILED
 				}
 			}
@@ -952,23 +952,24 @@
 					}
 				}
 				if (flags & FILTER_FLAG_NO_RES_RANGE || flags & FILTER_FLAG_GLOBAL_RANGE) {
-					if ((ip0 == 0 && ip1 == 0 && ip2 == 0 && ip3 == 0
-							&& ip4 == 0 && ip5 == 0 && ip6 == 0 && (ip7 == 0 || ip7 == 1))
-						|| (ip0 == 0x5f)
-						|| (ip0 >= 0xfe80 && ip0 <= 0xfebf)
-						|| (ip0 == 0x2001 && (ip1 == 0x0db8 || (ip1 >= 0x0010 && ip1 <= 0x001f)))
-						|| (ip0 == 0x3ff3)
-								) {
-									RETURN_VALIDATION_FAILED
-								}
+					if (
+						(ip0 == 0 && ip1 == 0 && ip2 == 0 && ip3 == 0 && ip4 == 0 && ip5 == 0 && ip6 == 0 && (ip7 == 0 || ip7 == 1)) ||
+						(ip0 == 0x5f) ||
+						(ip0 >= 0xfe80 && ip0 <= 0xfebf) ||
+						(ip0 == 0x2001 && (ip1 == 0x0db8 || (ip1 >= 0x0010 && ip1 <= 0x001f))) ||
+						(ip0 == 0x3ff3)
+					) {
+						RETURN_VALIDATION_FAILED
+					}
 				}
 				if (flags & FILTER_FLAG_GLOBAL_RANGE) {
-					if ((ip0 == 0 && ip1 == 0 && ip2 == 0 && ip3 == 0 && ip4 == 0 && ip5 == 0xffff) ||
-							(ip0 == 0x0100 && ip1 == 0 && ip2 == 0 && ip3 == 0) ||
-							(ip0 == 0x2001 && ip1 <= 0x01ff) ||
-							(ip0 == 0x2001 && ip1 == 0x0002 && ip2 == 0) ||
-							(ip0 >= 0xfc00 && ip0 <= 0xfdff)
-					   ) {
+					if (
+						(ip0 == 0 && ip1 == 0 && ip2 == 0 && ip3 == 0 && ip4 == 0 && ip5 == 0xffff) ||
+						(ip0 == 0x0100 && ip1 == 0 && ip2 == 0 && ip3 == 0) ||
+						(ip0 == 0x2001 && ip1 <= 0x01ff) ||
+						(ip0 == 0x2001 && ip1 == 0x0002 && ip2 == 0) ||
+						(ip0 >= 0xfc00 && ip0 <= 0xfdff)
+					) {
 						RETURN_VALIDATION_FAILED
 					}
 				}

php-8.2.28.tar.xz/ext/filter/tests/gh16523.phpt Added

php-8.2.23.tar.xz/ext/gd/gd.c -> php-8.2.28.tar.xz/ext/gd/gd.c Changed

@@ -1195,6 +1195,11 @@
 		RETURN_THROWS();
 	}
 
+	if (degrees < (double)(INT_MIN / 100) || degrees > (double)(INT_MAX / 100)) {
+		zend_argument_value_error(2, "must be between %d and %d", (INT_MIN / 100), (INT_MAX / 100));
+		RETURN_THROWS();
+	}
+
 	im_src = php_gd_libgdimageptr_from_zval_p(SIM);
 	im_dst = gdImageRotateInterpolated(im_src, (const float)degrees, color);
 
@@ -1318,7 +1323,7 @@
 
 	do {
 		i = (ctx->getC)(ctx);
-		if (i < 0) {
+		if (i < 0 || mbi > (INT_MAX >> 7)) {
 			return -1;
 		}
 		mbi = (mbi << 7) | (i & 0x7f);
@@ -3682,13 +3687,25 @@
 		if ((zval_affine_elem = zend_hash_index_find(Z_ARRVAL_P(z_affine), i)) != NULL) {
 			switch (Z_TYPE_P(zval_affine_elem)) {
 				case IS_LONG:
-					affinei  = Z_LVAL_P(zval_affine_elem);
+					affinei = Z_LVAL_P(zval_affine_elem);
+					if (affinei < INT_MIN || affinei > INT_MAX) {
+						zend_argument_value_error(2, "element %i must be between %d and %d", i, INT_MIN, INT_MAX);
+						RETURN_THROWS();
+					}
 					break;
 				case IS_DOUBLE:
 					affinei = Z_DVAL_P(zval_affine_elem);
+					if (affinei < INT_MIN || affinei > INT_MAX) {
+						zend_argument_value_error(2, "element %i must be between %d and %d", i, INT_MIN, INT_MAX);
+						RETURN_THROWS();
+					}
 					break;
 				case IS_STRING:
 					affinei = zval_get_double(zval_affine_elem);
+					if (affinei < INT_MIN || affinei > INT_MAX) {
+						zend_argument_value_error(2, "element %i must be between %d and %d", i, INT_MIN, INT_MAX);
+						RETURN_THROWS();
+					}
 					break;
 				default:
 					zend_argument_type_error(3, "contains invalid type for element %i", i);

php-8.2.23.tar.xz/ext/gd/libgd/gd_avif.c -> php-8.2.28.tar.xz/ext/gd/libgd/gd_avif.c Changed

@@ -393,7 +393,13 @@
 	// (While AVIF image pixel depth can be 8, 10, or 12 bits, GD truecolor images are 8-bit.)
 	avifRGBImageSetDefaults(&rgb, decoder->image);
 	rgb.depth = 8;
+#if AVIF_VERSION >= 1000000
+	result = avifRGBImageAllocatePixels(&rgb);
+	if (isAvifError(result, "Allocating RGB pixels failed"))
+		goto cleanup;
+#else
 	avifRGBImageAllocatePixels(&rgb);
+#endif
 
 	result = avifImageYUVToRGB(decoder->image, &rgb);
 	if (isAvifError(result, "Conversion from YUV to RGB failed"))
@@ -522,14 +528,25 @@
 	// Note that MATRIX_COEFFICIENTS_IDENTITY enables lossless conversion from RGB to YUV.
 
 	avifImage *avifIm = avifImageCreate(gdImageSX(im), gdImageSY(im), 8, subsampling);
-
+#if AVIF_VERSION >= 1000000
+	if (avifIm == NULL) {
+		gd_error("avif error - Creating image failed\n");
+		goto cleanup;
+	}
+#endif
 	avifIm->colorPrimaries = AVIF_COLOR_PRIMARIES_BT709;
 	avifIm->transferCharacteristics = AVIF_TRANSFER_CHARACTERISTICS_SRGB;
 	avifIm->matrixCoefficients = lossless ? AVIF_MATRIX_COEFFICIENTS_IDENTITY : AVIF_MATRIX_COEFFICIENTS_BT709;
 
 	avifRGBImageSetDefaults(&rgb, avifIm);
 	// this allocates memory, and sets rgb.rowBytes and rgb.pixels.
+#if AVIF_VERSION >= 1000000
+	result = avifRGBImageAllocatePixels(&rgb);
+	if (isAvifError(result, "Allocating RGB pixels failed"))
+		goto cleanup;
+#else
 	avifRGBImageAllocatePixels(&rgb);
+#endif
 
 	// Parse RGB data from the GD image, and copy it into the AVIF RGB image.
 	// Convert 7-bit GD alpha channel values to 8-bit AVIF values.
@@ -555,6 +572,12 @@
 	// Encode the image in AVIF format.
 
 	encoder = avifEncoderCreate();
+#if AVIF_VERSION >= 1000000
+	if (encoder == NULL) {
+		gd_error("avif error - Creating encoder failed\n");
+		goto cleanup;
+	}
+#endif
 	int quantizerQuality = quality == QUALITY_DEFAULT ?
 		QUANTIZER_DEFAULT : quality2Quantizer(quality);

php-8.2.23.tar.xz/ext/gd/libgd/gd_interpolation.c -> php-8.2.28.tar.xz/ext/gd/libgd/gd_interpolation.c Changed

@@ -929,6 +929,32 @@
 	return res;
 }
 
+/* Convert a double to an unsigned char, rounding to the nearest
+ * integer and clamping the result between 0 and max.  The absolute
+ * value of clr must be less than the maximum value of an unsigned
+ * short. */
+static inline unsigned char
+uchar_clamp(double clr, unsigned char max) {
+	unsigned short result;
+
+	//assert(fabs(clr) <= SHRT_MAX);
+
+	/* Casting a negative float to an unsigned short is undefined.
+	 * However, casting a float to a signed truncates toward zero and
+	 * casting a negative signed value to an unsigned of the same size
+	 * results in a bit-identical value (assuming twos-complement
+	 * arithmetic).	 This is what we want: all legal negative values
+	 * for clr will be greater than 255. */
+
+	/* Convert and clamp. */
+	result = (unsigned short)(short)(clr + 0.5);
+	if (result > max) {
+		result = (clr < 0) ? 0 : max;
+	}/* if */
+
+	return result;
+}/* uchar_clamp*/
+
 static inline void _gdScaleRow(gdImagePtr pSrc,  unsigned int src_width, gdImagePtr dst, unsigned int dst_width, unsigned int row, LineContribType *contrib)
 {
     int *p_src_row = pSrc->tpixelsrow;
@@ -936,20 +962,22 @@
 	unsigned int x;
 
     for (x = 0; x < dst_width; x++) {
-		register unsigned char r = 0, g = 0, b = 0, a = 0;
+	    double r = 0, g = 0, b = 0, a = 0;
         const int left = contrib->ContribRowx.Left;
         const int right = contrib->ContribRowx.Right;
-		int i;
+	int i;
 
-		/* Accumulate each channel */
-        for (i = left; i <= right; i++) {
-			const int left_channel = i - left;
-            r += (unsigned char)(contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetRed(p_src_rowi)));
-            g += (unsigned char)(contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetGreen(p_src_rowi)));
-            b += (unsigned char)(contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetBlue(p_src_rowi)));
-			a += (unsigned char)(contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetAlpha(p_src_rowi)));
-        }
-        p_dst_rowx = gdTrueColorAlpha(r, g, b, a);
+	/* Accumulate each channel */
+	for (i = left; i <= right; i++) {
+		const int left_channel = i - left;
+		r += contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetRed(p_src_rowi));
+		g += contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetGreen(p_src_rowi));
+		b += contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetBlue(p_src_rowi));
+		a += contrib->ContribRowx.Weightsleft_channel * (double)(gdTrueColorGetAlpha(p_src_rowi));
+	}
+	p_dst_rowx = gdTrueColorAlpha(uchar_clamp(r, 0xFF), uchar_clamp(g, 0xFF),
+									uchar_clamp(b, 0xFF),
+									uchar_clamp(a, 0x7F)); /* alpha is 0..127 */
     }
 }
 
@@ -982,7 +1010,7 @@
 {
 	unsigned int y;
 	for (y = 0; y < dst_height; y++) {
-		register unsigned char r = 0, g = 0, b = 0, a = 0;
+		double r = 0, g = 0, b = 0, a = 0;
 		const int iLeft = contrib->ContribRowy.Left;
 		const int iRight = contrib->ContribRowy.Right;
 		int i;
@@ -991,12 +1019,14 @@
 		for (i = iLeft; i <= iRight; i++) {
 			const int pCurSrc = pSrc->tpixelsiuCol;
 			const int i_iLeft = i - iLeft;
-			r += (unsigned char)(contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetRed(pCurSrc)));
-			g += (unsigned char)(contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetGreen(pCurSrc)));
-			b += (unsigned char)(contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetBlue(pCurSrc)));
-			a += (unsigned char)(contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetAlpha(pCurSrc)));
+			r += contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetRed(pCurSrc));
+			g += contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetGreen(pCurSrc));
+			b += contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetBlue(pCurSrc));
+			a += contrib->ContribRowy.Weightsi_iLeft * (double)(gdTrueColorGetAlpha(pCurSrc));
 		}
-		pRes->tpixelsyuCol = gdTrueColorAlpha(r, g, b, a);
+		pRes->tpixelsyuCol = gdTrueColorAlpha(uchar_clamp(r, 0xFF), uchar_clamp(g, 0xFF),
+												  uchar_clamp(b, 0xFF),
+												  uchar_clamp(a, 0x7F)); /* alpha is 0..127 */
 	}
 }

php-8.2.23.tar.xz/ext/gd/libgd/wbmp.c -> php-8.2.28.tar.xz/ext/gd/libgd/wbmp.c Changed

php-8.2.28.tar.xz/ext/gd/tests/gh16232.phpt Added

php-8.2.28.tar.xz/ext/gd/tests/gh16257.phpt Added

php-8.2.28.tar.xz/ext/gd/tests/gh16260.phpt Added

php-8.2.28.tar.xz/ext/gd/tests/gh16322.phpt Added

php-8.2.28.tar.xz/ext/gd/tests/gh16559.phpt Added

php-8.2.28.tar.xz/ext/gd/tests/gh16771.phpt Added

php-8.2.23.tar.xz/ext/gmp/gmp.c -> php-8.2.28.tar.xz/ext/gmp/gmp.c Changed

@@ -334,8 +334,34 @@
 }
 /* }}} */
 
-static void shift_operator_helper(gmp_binary_ui_op_t op, zval *return_value, zval *op1, zval *op2, zend_uchar opcode) {
-	zend_long shift = zval_get_long(op2);
+static zend_result shift_operator_helper(gmp_binary_ui_op_t op, zval *return_value, zval *op1, zval *op2, zend_uchar opcode) {
+	zend_long shift = 0;
+
+	if (UNEXPECTED(Z_TYPE_P(op2) != IS_LONG)) {
+		if (UNEXPECTED(!IS_GMP(op2))) {
+			// For PHP 8.3 and up use zend_try_get_long()
+			switch (Z_TYPE_P(op2)) {
+				case IS_DOUBLE:
+					shift = zval_get_long(op2);
+					if (UNEXPECTED(EG(exception))) {
+						return FAILURE;
+					}
+					break;
+				case IS_STRING:
+					if (is_numeric_str_function(Z_STR_P(op2), &shift, NULL) != IS_LONG) {
+						goto valueof_op_failure;
+					}
+					break;
+				default:
+					goto typeof_op_failure;
+			}
+		} else {
+			// TODO We shouldn't cast the GMP object to int here
+			shift = zval_get_long(op2);
+		}
+	} else {
+		shift = Z_LVAL_P(op2);
+	}
 
 	if (shift < 0) {
 		zend_throw_error(
@@ -343,16 +369,54 @@
 			opcode == ZEND_POW ? "Exponent" : "Shift"
 		);
 		ZVAL_UNDEF(return_value);
-		return;
+		return FAILURE;
 	} else {
 		mpz_ptr gmpnum_op, gmpnum_result;
 		gmp_temp_t temp;
 
-		FETCH_GMP_ZVAL(gmpnum_op, op1, temp, 1);
+		/* We do not use FETCH_GMP_ZVAL(...); here as we don't use convert_to_gmp()
+		 * as we want to handle the emitted exception ourself.  */
+		if (UNEXPECTED(!IS_GMP(op1))) {
+			if (UNEXPECTED(Z_TYPE_P(op1) != IS_LONG)) {
+				goto typeof_op_failure;
+			}
+			mpz_init(temp.num);
+			mpz_set_si(temp.num, Z_LVAL_P(op1));
+			temp.is_used = 1;
+			gmpnum_op = temp.num;
+		} else {
+			gmpnum_op = GET_GMP_FROM_ZVAL(op1);
+			temp.is_used = 0;
+		}
 		INIT_GMP_RETVAL(gmpnum_result);
 		op(gmpnum_result, gmpnum_op, (gmp_ulong) shift);
 		FREE_GMP_TEMP(temp);
+		return SUCCESS;
 	}
+
+typeof_op_failure: ;
+	/* Returning FAILURE without throwing an exception would emit the
+	 * Unsupported operand types: GMP OP TypeOfOp2
+	 * However, this leads to the engine trying to interpret the GMP object as an integer
+	 * and doing the operation that way, which is not something we want. */
+	const char *op_sigil;
+	switch (opcode) {
+		case ZEND_POW:
+			op_sigil = "**";
+			break;
+		case ZEND_SL:
+			op_sigil = "<<";
+			break;
+		case ZEND_SR:
+			op_sigil = ">>";
+			break;
+		EMPTY_SWITCH_DEFAULT_CASE();
+	}
+	zend_type_error("Unsupported operand types: %s %s %s", zend_zval_type_name(op1), op_sigil, zend_zval_type_name(op2));
+	return FAILURE;
+valueof_op_failure:
+	zend_value_error("Number is not an integer string");
+	return FAILURE;
 }
 
 #define DO_BINARY_UI_OP_EX(op, uop, check_b_zero) \
@@ -381,18 +445,15 @@
 	case ZEND_MUL:
 		DO_BINARY_UI_OP(mpz_mul);
 	case ZEND_POW:
-		shift_operator_helper(mpz_pow_ui, result, op1, op2, opcode);
-		return SUCCESS;
+		return shift_operator_helper(mpz_pow_ui, result, op1, op2, opcode);
 	case ZEND_DIV:
 		DO_BINARY_UI_OP_EX(mpz_tdiv_q, gmp_mpz_tdiv_q_ui, 1);
 	case ZEND_MOD:
 		DO_BINARY_UI_OP_EX(mpz_mod, gmp_mpz_mod_ui, 1);
 	case ZEND_SL:
-		shift_operator_helper(mpz_mul_2exp, result, op1, op2, opcode);
-		return SUCCESS;
+		return shift_operator_helper(mpz_mul_2exp, result, op1, op2, opcode);
 	case ZEND_SR:
-		shift_operator_helper(mpz_fdiv_q_2exp, result, op1, op2, opcode);
-		return SUCCESS;
+		return shift_operator_helper(mpz_fdiv_q_2exp, result, op1, op2, opcode);
 	case ZEND_BW_OR:
 		DO_BINARY_OP(mpz_ior);
 	case ZEND_BW_AND:
@@ -619,6 +680,13 @@
 	case IS_STRING: {
 		return convert_zstr_to_gmp(gmpnumber, Z_STR_P(val), base, arg_pos);
 	}
+	case IS_NULL:
+		/* Just reject null for operator overloading */
+		if (arg_pos == 0) {
+			zend_type_error("Number must be of type GMP|string|int, %s given", zend_zval_type_name(val));
+			return FAILURE;
+		}
+		ZEND_FALLTHROUGH;
 	default: {
 		zend_long lval;
 		if (!zend_parse_arg_long_slow(val, &lval, arg_pos)) {
@@ -1002,8 +1070,14 @@
 	if (mpz_sgn(gmpnumber) == 0) {
 		RETVAL_EMPTY_STRING();
 	} else {
-		size_t bits_per_word = size * 8;
-		size_t count = (mpz_sizeinbase(gmpnumber, 2) + bits_per_word - 1) / bits_per_word;
+		ZEND_ASSERT(size > 0);
+		size_t size_in_base_2 = mpz_sizeinbase(gmpnumber, 2);
+		if (size > ZEND_LONG_MAX / 4 || size_in_base_2 > SIZE_MAX - (size_t) size * 8 + 1) {
+			zend_argument_value_error(2, "is too large for argument #1 ($num)");
+			RETURN_THROWS();
+		}
+		size_t bits_per_word = (size_t) size * 8;
+		size_t count = (size_in_base_2 + bits_per_word - 1) / bits_per_word;
 
 		zend_string *out_string = zend_string_safe_alloc(count, size, 0, 0);
 		mpz_export(ZSTR_VAL(out_string), NULL, order, size, endian, 0, gmpnumber);
@@ -1772,15 +1846,21 @@
 		RETURN_THROWS();
 	}
 
-	if (bits <= 0) {
-		zend_argument_value_error(1, "must be greater than or equal to 1");
+#if SIZEOF_SIZE_T == 4
+	const zend_long maxbits = ULONG_MAX / GMP_NUMB_BITS;
+#else
+	const zend_long maxbits = INT_MAX;
+#endif
+
+	if (bits <= 0 || bits > maxbits) {
+		zend_argument_value_error(1, "must be between 1 and " ZEND_LONG_FMT, maxbits);
 		RETURN_THROWS();
 	}
 
 	INIT_GMP_RETVAL(gmpnum_result);
 	gmp_init_random();
 
-	mpz_urandomb(gmpnum_result, GMPG(rand_state), bits);
+	mpz_urandomb(gmpnum_result, GMPG(rand_state), (mp_bitcnt_t)bits);
 }
 /* }}} */

php-8.2.28.tar.xz/ext/gmp/tests/gh16411.phpt Added

php-8.2.28.tar.xz/ext/gmp/tests/gh16501.phpt Added

php-8.2.23.tar.xz/ext/gmp/tests/gmp_random_bits.phpt -> php-8.2.28.tar.xz/ext/gmp/tests/gmp_random_bits.phpt Changed

php-8.2.28.tar.xz/ext/gmp/tests/overloading_cmp_op_with_null.phpt Added

php-8.2.28.tar.xz/ext/gmp/tests/overloading_with_array.phpt Added

@@ -0,0 +1,84 @@
+--TEST--
+GMP operator overloading does not support 
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> );
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Unsupported operand types: GMP ** array
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Number must be of type GMP|string|int, array given
+TypeError: Unsupported operand types: GMP << array
+TypeError: Unsupported operand types: GMP >> array

php-8.2.28.tar.xz/ext/gmp/tests/overloading_with_float.phpt Added

@@ -0,0 +1,117 @@
+--TEST--
+GMP operator overloading does support float with no fractional
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> 42.0);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "84"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(4) "1764"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "1"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(69) "150130937545296572356771972164254457814047970568738777235893533016064"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "42"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "42"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(15) "184717953466368"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}

php-8.2.28.tar.xz/ext/gmp/tests/overloading_with_float_fractional.phpt Added

@@ -0,0 +1,132 @@
+--TEST--
+GMP operator overloading support for float with fractional is deprecated
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> 42.5);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECTF--
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "84"
+}
+
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}
+
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(4) "1764"
+}
+
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "1"
+}
+
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(69) "150130937545296572356771972164254457814047970568738777235893533016064"
+}
+
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "42"
+}
+
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "42"
+}
+
+Deprecated: Implicit conversion from float 42.5 to int loses precision in %s on line %d
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(15) "184717953466368"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}

php-8.2.28.tar.xz/ext/gmp/tests/overloading_with_float_string.phpt Added

@@ -0,0 +1,84 @@
+--TEST--
+GMP operator overloading does not support float strings
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> "2.0");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string

php-8.2.28.tar.xz/ext/gmp/tests/overloading_with_int_string.phpt Added

@@ -0,0 +1,117 @@
+--TEST--
+GMP operator overloading does support int strings
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> "2");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "44"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "40"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "84"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "21"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "0"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(4) "1764"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "42"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(1) "2"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "40"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(3) "168"
+}
+object(GMP)#2 (1) {
+  "num"=>
+  string(2) "10"
+}

php-8.2.28.tar.xz/ext/gmp/tests/overloading_with_non_numeric_string.phpt Added

@@ -0,0 +1,84 @@
+--TEST--
+GMP operator overloading does not support non-numeric strings
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> "string");
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string
+ValueError: Number is not an integer string

php-8.2.28.tar.xz/ext/gmp/tests/overloading_with_null.phpt Added

@@ -0,0 +1,84 @@
+--TEST--
+GMP operator overloading does not support null
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> null);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Unsupported operand types: GMP ** null
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Number must be of type GMP|string|int, null given
+TypeError: Unsupported operand types: GMP << null
+TypeError: Unsupported operand types: GMP >> null

php-8.2.28.tar.xz/ext/gmp/tests/overloading_with_object_not_stringable.phpt Added

@@ -0,0 +1,85 @@
+--TEST--
+GMP operator overloading does not support non-stringable objects
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+$o = new stdClass();
+
+try {
+    var_dump($num + $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Unsupported operand types: GMP ** stdClass
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Number must be of type GMP|string|int, stdClass given
+TypeError: Unsupported operand types: GMP << stdClass
+TypeError: Unsupported operand types: GMP >> stdClass

php-8.2.28.tar.xz/ext/gmp/tests/overloading_with_object_stringable.phpt Added

@@ -0,0 +1,91 @@
+--TEST--
+GMP operator overloading does not support stringable objects
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+class T {
+    public function __toString() {
+        return "42";
+    }
+}
+
+$num = gmp_init(42);
+$o = new T();
+
+try {
+    var_dump($num + $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> $o);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECTF--
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Unsupported operand types: GMP ** T
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Number must be of type GMP|string|int, T given
+TypeError: Unsupported operand types: GMP << T
+TypeError: Unsupported operand types: GMP >> T

php-8.2.28.tar.xz/ext/gmp/tests/overloading_with_resource.phpt Added

@@ -0,0 +1,84 @@
+--TEST--
+GMP operator overloading does not support resources
+--EXTENSIONS--
+gmp
+--FILE--
+<?php
+
+$num = gmp_init(42);
+
+try {
+    var_dump($num + STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num - STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num * STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num / STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num % STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num ** STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+    var_dump($num | STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num & STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num ^ STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num << STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+try {
+    var_dump($num >> STDERR);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Unsupported operand types: GMP ** resource
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Number must be of type GMP|string|int, resource given
+TypeError: Unsupported operand types: GMP << resource
+TypeError: Unsupported operand types: GMP >> resource

php-8.2.23.tar.xz/ext/hash/hash.c -> php-8.2.28.tar.xz/ext/hash/hash.c Changed

php-8.2.28.tar.xz/ext/hash/tests/gh16711_1.phpt Added

@@ -0,0 +1,98 @@
+--TEST--
+GH-16711: Segmentation fault in mhash()
+--SKIPIF--
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
+--FILE--
+<?php
+
+$re = new ReflectionExtension("hash");
+var_dump($re->getConstants());
+
+var_dump(mhash(133, 1086849124, 133));
+?>
+--EXPECTF--
+array(40) {
+  "HASH_HMAC"=>
+  int(1)
+  "MHASH_CRC32"=>
+  int(0)
+  "MHASH_MD5"=>
+  int(1)
+  "MHASH_SHA1"=>
+  int(2)
+  "MHASH_HAVAL256"=>
+  int(3)
+  "MHASH_RIPEMD160"=>
+  int(5)
+  "MHASH_TIGER"=>
+  int(7)
+  "MHASH_GOST"=>
+  int(8)
+  "MHASH_CRC32B"=>
+  int(9)
+  "MHASH_HAVAL224"=>
+  int(10)
+  "MHASH_HAVAL192"=>
+  int(11)
+  "MHASH_HAVAL160"=>
+  int(12)
+  "MHASH_HAVAL128"=>
+  int(13)
+  "MHASH_TIGER128"=>
+  int(14)
+  "MHASH_TIGER160"=>
+  int(15)
+  "MHASH_MD4"=>
+  int(16)
+  "MHASH_SHA256"=>
+  int(17)
+  "MHASH_ADLER32"=>
+  int(18)
+  "MHASH_SHA224"=>
+  int(19)
+  "MHASH_SHA512"=>
+  int(20)
+  "MHASH_SHA384"=>
+  int(21)
+  "MHASH_WHIRLPOOL"=>
+  int(22)
+  "MHASH_RIPEMD128"=>
+  int(23)
+  "MHASH_RIPEMD256"=>
+  int(24)
+  "MHASH_RIPEMD320"=>
+  int(25)
+  "MHASH_SNEFRU256"=>
+  int(27)
+  "MHASH_MD2"=>
+  int(28)
+  "MHASH_FNV132"=>
+  int(29)
+  "MHASH_FNV1A32"=>
+  int(30)
+  "MHASH_FNV164"=>
+  int(31)
+  "MHASH_FNV1A64"=>
+  int(32)
+  "MHASH_JOAAT"=>
+  int(33)
+  "MHASH_CRC32C"=>
+  int(34)
+  "MHASH_MURMUR3A"=>
+  int(35)
+  "MHASH_MURMUR3C"=>
+  int(36)
+  "MHASH_MURMUR3F"=>
+  int(37)
+  "MHASH_XXH32"=>
+  int(38)
+  "MHASH_XXH64"=>
+  int(39)
+  "MHASH_XXH3"=>
+  int(40)
+  "MHASH_XXH128"=>
+  int(41)
+}
+
+Deprecated: Function mhash() is deprecated in %s on line %d
+bool(false)

php-8.2.28.tar.xz/ext/hash/tests/gh16711_2.phpt Added

@@ -0,0 +1,98 @@
+--TEST--
+GH-16711: Segmentation fault in mhash()
+--SKIPIF--
+<?php if(!function_exists('mhash')) { die('skip mhash compatibility layer not available'); } ?>
+--FILE--
+<?php
+
+$re = new ReflectionExtension("hash");
+var_dump($re->getConstants());
+
+var_dump(mhash(4, 1086849124, 133));
+?>
+--EXPECTF--
+array(40) {
+  "HASH_HMAC"=>
+  int(1)
+  "MHASH_CRC32"=>
+  int(0)
+  "MHASH_MD5"=>
+  int(1)
+  "MHASH_SHA1"=>
+  int(2)
+  "MHASH_HAVAL256"=>
+  int(3)
+  "MHASH_RIPEMD160"=>
+  int(5)
+  "MHASH_TIGER"=>
+  int(7)
+  "MHASH_GOST"=>
+  int(8)
+  "MHASH_CRC32B"=>
+  int(9)
+  "MHASH_HAVAL224"=>
+  int(10)
+  "MHASH_HAVAL192"=>
+  int(11)
+  "MHASH_HAVAL160"=>
+  int(12)
+  "MHASH_HAVAL128"=>
+  int(13)
+  "MHASH_TIGER128"=>
+  int(14)
+  "MHASH_TIGER160"=>
+  int(15)
+  "MHASH_MD4"=>
+  int(16)
+  "MHASH_SHA256"=>
+  int(17)
+  "MHASH_ADLER32"=>
+  int(18)
+  "MHASH_SHA224"=>
+  int(19)
+  "MHASH_SHA512"=>
+  int(20)
+  "MHASH_SHA384"=>
+  int(21)
+  "MHASH_WHIRLPOOL"=>
+  int(22)
+  "MHASH_RIPEMD128"=>
+  int(23)
+  "MHASH_RIPEMD256"=>
+  int(24)
+  "MHASH_RIPEMD320"=>
+  int(25)
+  "MHASH_SNEFRU256"=>
+  int(27)
+  "MHASH_MD2"=>
+  int(28)
+  "MHASH_FNV132"=>
+  int(29)
+  "MHASH_FNV1A32"=>
+  int(30)
+  "MHASH_FNV164"=>
+  int(31)
+  "MHASH_FNV1A64"=>
+  int(32)
+  "MHASH_JOAAT"=>
+  int(33)
+  "MHASH_CRC32C"=>
+  int(34)
+  "MHASH_MURMUR3A"=>
+  int(35)
+  "MHASH_MURMUR3C"=>
+  int(36)
+  "MHASH_MURMUR3F"=>
+  int(37)
+  "MHASH_XXH32"=>
+  int(38)
+  "MHASH_XXH64"=>
+  int(39)
+  "MHASH_XXH3"=>
+  int(40)
+  "MHASH_XXH128"=>
+  int(41)
+}
+
+Deprecated: Function mhash() is deprecated in %s on line %d
+bool(false)

php-8.2.23.tar.xz/ext/iconv/tests/iconv_basic_001.phpt -> php-8.2.28.tar.xz/ext/iconv/tests/iconv_basic_001.phpt Changed

php-8.2.23.tar.xz/ext/imap/php_imap.c -> php-8.2.28.tar.xz/ext/imap/php_imap.c Changed

php-8.2.23.tar.xz/ext/imap/php_imap.h -> php-8.2.28.tar.xz/ext/imap/php_imap.h Changed

php-8.2.23.tar.xz/ext/intl/tests/bug62070_3.phpt -> php-8.2.28.tar.xz/ext/intl/tests/bug62070_3.phpt Changed

php-8.2.28.tar.xz/ext/intl/tests/bug62070_icu76_1.phpt Added

php-8.2.23.tar.xz/ext/intl/tests/collator_get_sort_key_variant7.phpt -> php-8.2.28.tar.xz/ext/intl/tests/collator_get_sort_key_variant7.phpt Changed

php-8.2.28.tar.xz/ext/intl/tests/collator_get_sort_key_variant_icu76_1.phpt Added

@@ -0,0 +1,97 @@
+--TEST--
+collator_get_sort_key() icu >= 62.1
+--EXTENSIONS--
+intl
+--SKIPIF--
+<?php if (version_compare(INTL_ICU_VERSION, '76.1') < 0) die('skip for ICU >= 76.1'); ?>
+--FILE--
+<?php
+
+/*
+ * Get sort keys using various locales
+ */
+function sort_arrays( $locale, $data )
+{
+    $res_str = '';
+
+    $coll = ut_coll_create( $locale );
+
+    foreach($data as $value) {
+        $res_val = ut_coll_get_sort_key( $coll, $value );
+        $res_str .= "source: ".$value."\n".
+                    "key: ".bin2hex($res_val)."\n";
+    }
+
+    return $res_str;
+}
+
+
+function ut_main()
+{
+    $res_str = '';
+
+    // Regular strings keys
+    $test_params = array(
+        'abc', 'abd', 'aaa',
+        'аа', 'а', 'z',
+        '', '3',
+        'y'  , 'i'  , 'k'
+    );
+
+    $res_str .= sort_arrays( 'en_US', $test_params );
+
+    // Sort a non-ASCII array using ru_RU locale.
+    $test_params = array(
+        'абг', 'абв', 'жжж', 'эюя'
+    );
+
+    $res_str .= sort_arrays( 'ru_RU', $test_params );
+
+    // Sort an array using Lithuanian locale.
+    $res_str .= sort_arrays( 'lt_LT', $test_params );
+
+    return $res_str . "\n";
+}
+
+include_once( 'ut_common.inc' );
+ut_run();
+?>
+--EXPECT--
+source: abc
+key: 2b2d2f01070107
+source: abd
+key: 2b2d3101070107
+source: aaa
+key: 2b2b2b01070107
+source: аа
+key: 62060601060106
+source: а
+key: 620601050105
+source: z
+key: 5d01050105
+source: 
+key: 0101
+source: 3
+key: 1801050105
+source: y
+key: 5b01050105
+source: i
+key: 3b01050105
+source: k
+key: 3f01050105
+source: абг
+key: 28060c1001070107
+source: абв
+key: 28060c0e01070107
+source: жжж
+key: 282c2c2c01070107
+source: эюя
+key: 28eef0f401070107
+source: абг
+key: 62060c1001070107
+source: абв
+key: 62060c0e01070107
+source: жжж
+key: 622c2c2c01070107
+source: эюя
+key: 62eef0f401070107

php-8.2.23.tar.xz/ext/intl/tests/locale_get_display_name8.phpt -> php-8.2.28.tar.xz/ext/intl/tests/locale_get_display_name8.phpt Changed

@@ -317,14 +317,14 @@
 disp_locale=de :  display_name=Englisch #Vereinigte Staaten, attribute=islamcal#
 -----------------
 locale='zh-CN-a-myExt-x-private'
-disp_locale=en :  display_name=Chinese #China, a=myext, Private-Use=private#
-disp_locale=fr :  display_name=chinois #Chine, a=myext, usage privé=private#
-disp_locale=de :  display_name=Chinesisch #China, a=myext, Privatnutzung=private#
+disp_locale=en :  display_name=Chinese #China(, A_MYEXT_X_PRIVATE)?, a=myext, Private-Use=private#
+disp_locale=fr :  display_name=chinois #Chine(, A_MYEXT_X_PRIVATE)?, a=myext, usage privé=private#
+disp_locale=de :  display_name=Chinesisch #China(, A_MYEXT_X_PRIVATE)?, a=myext, Privatnutzung=private#
 -----------------
 locale='en-a-myExt-b-another'
-disp_locale=en :  display_name=English #a=myext, b=another#
-disp_locale=fr :  display_name=anglais #a=myext, b=another#
-disp_locale=de :  display_name=Englisch #a=myext, b=another#
+disp_locale=en :  display_name=English #(A_MYEXT_B_ANOTHER, )?a=myext, b=another#
+disp_locale=fr :  display_name=anglais #(A_MYEXT_B_ANOTHER, )?a=myext, b=another#
+disp_locale=de :  display_name=Englisch #(A_MYEXT_B_ANOTHER, )?a=myext, b=another#
 -----------------
 locale='de-419-DE'
 disp_locale=en :  display_name=German #Latin America, DE#
@@ -337,7 +337,7 @@
 disp_locale=de :  display_name=a #Deutschland#
 -----------------
 locale='ar-a-aaa-b-bbb-a-ccc'
-disp_locale=en :  display_name=Arabic #a=aaa, b=bbb#
-disp_locale=fr :  display_name=arabe #a=aaa, b=bbb#
-disp_locale=de :  display_name=Arabisch #a=aaa, b=bbb#
+disp_locale=en :  display_name=Arabic #(A_AAA_B_BBB_A_CCC, )?a=aaa, b=bbb#
+disp_locale=fr :  display_name=arabe #(A_AAA_B_BBB_A_CCC, )?a=aaa, b=bbb#
+disp_locale=de :  display_name=Arabisch #(A_AAA_B_BBB_A_CCC, )?a=aaa, b=bbb#
 -----------------

php-8.2.23.tar.xz/ext/intl/tests/locale_get_display_variant2.phpt -> php-8.2.28.tar.xz/ext/intl/tests/locale_get_display_variant2.phpt Changed

@@ -248,14 +248,14 @@
 disp_locale=de :  display_variant=
 -----------------
 locale='zh-CN-a-myExt-x-private'
-disp_locale=en :  display_variant=
-disp_locale=fr :  display_variant=
-disp_locale=de :  display_variant=
+disp_locale=en :  display_variant=(A_MYEXT_X_PRIVATE)?
+disp_locale=fr :  display_variant=(A_MYEXT_X_PRIVATE)?
+disp_locale=de :  display_variant=(A_MYEXT_X_PRIVATE)?
 -----------------
 locale='en-a-myExt-b-another'
-disp_locale=en :  display_variant=(MYEXT_B_ANOTHER)?
-disp_locale=fr :  display_variant=(MYEXT_B_ANOTHER)?
-disp_locale=de :  display_variant=(MYEXT_B_ANOTHER)?
+disp_locale=en :  display_variant=((A_)?MYEXT_B_ANOTHER)?
+disp_locale=fr :  display_variant=((A_)?MYEXT_B_ANOTHER)?
+disp_locale=de :  display_variant=((A_)?MYEXT_B_ANOTHER)?
 -----------------
 locale='de-419-DE'
 disp_locale=en :  display_variant=DE
@@ -268,7 +268,7 @@
 disp_locale=de :  display_variant=
 -----------------
 locale='ar-a-aaa-b-bbb-a-ccc'
-disp_locale=en :  display_variant=(AAA_B_BBB_A_CCC)?
-disp_locale=fr :  display_variant=(AAA_B_BBB_A_CCC)?
-disp_locale=de :  display_variant=(AAA_B_BBB_A_CCC)?
+disp_locale=en :  display_variant=((A_)?AAA_B_BBB_A_CCC)?
+disp_locale=fr :  display_variant=((A_)?AAA_B_BBB_A_CCC)?
+disp_locale=de :  display_variant=((A_)?AAA_B_BBB_A_CCC)?
 -----------------

php-8.2.23.tar.xz/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt -> php-8.2.28.tar.xz/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt Changed

php-8.2.28.tar.xz/ext/intl/tests/timezone_IDforWindowsID_basic_icu76_1.phpt Added

@@ -0,0 +1,44 @@
+--TEST--
+IntlTimeZone::getIDForWindowsID basic test
+--EXTENSIONS--
+intl
+--SKIPIF--
+<?php if (version_compare(INTL_ICU_VERSION, '76.1') < 0) die('skip for ICU >= 76.1'); ?>
+--FILE--
+<?php
+
+$tzs = array(
+  'Gnomeregan' => array(NULL),
+  'India Standard Time' => array(NULL),
+  'Pacific Standard Time' => array('001', 'CA', 'MX', 'US', 'ZZ'),
+  'Romance Standard Time' => array('001', 'BE', 'DK', 'ES', 'FR'),
+);
+
+foreach ($tzs as $tz => $regions) {
+  echo "** $tz\n";
+  foreach ($regions as $region) {
+    var_dump(IntlTimeZone::getIDForWindowsID($tz, $region));
+    if (intl_get_error_code() != U_ZERO_ERROR) {
+      echo "Error: ", intl_get_error_message(), "\n";
+    }
+  }
+}
+?>
+--EXPECTF--
+** Gnomeregan
+bool(false)
+Error: %snknown windows timezone: U_ILLEGAL_ARGUMENT_ERROR
+** India Standard Time
+string(13) "Asia/Calcutta"
+** Pacific Standard Time
+string(19) "America/Los_Angeles"
+string(17) "America/Vancouver"
+string(19) "America/Los_Angeles"
+string(19) "America/Los_Angeles"
+string(19) "America/Los_Angeles"
+** Romance Standard Time
+string(12) "Europe/Paris"
+string(15) "Europe/Brussels"
+string(17) "Europe/Copenhagen"
+string(13) "Europe/Madrid"
+string(12) "Europe/Paris"

php-8.2.23.tar.xz/ext/json/json_parser.tab.c -> php-8.2.28.tar.xz/ext/json/json_parser.tab.c Changed

@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.8.2.  */
+/* A Bison parser, made by GNU Bison 3.7.5.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -46,10 +46,10 @@
    USER NAME SPACE" below.  */
 
 /* Identify Bison output, and Bison version.  */
-#define YYBISON 30802
+#define YYBISON 30705
 
 /* Bison version string.  */
-#define YYBISON_VERSION "3.8.2"
+#define YYBISON_VERSION "3.7.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -338,18 +338,12 @@
 # define YY_USE(E) /* empty */
 #endif
 
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
-# if __GNUC__ * 100 + __GNUC_MINOR__ < 407
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
-    _Pragma ("GCC diagnostic push")                                     \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")
-# else
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                            \
     _Pragma ("GCC diagnostic push")                                     \
     _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# endif
 # define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
     _Pragma ("GCC diagnostic pop")
 #else
@@ -564,7 +558,7 @@
 };
 
 #if PHP_JSON_YYDEBUG
-/* YYRLINEYYN -- Source line where rule number YYN was defined.  */
+  /* YYRLINEYYN -- Source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline =
 {
        0,    79,    79,    90,    89,   107,   108,   116,   124,   128,
@@ -601,6 +595,16 @@
 }
 #endif
 
+#ifdef YYPRINT
+/* YYTOKNUMNUM -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_int16 yytoknum =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   123,   125,    93,    58,    44,    91
+};
+#endif
+
 #define YYPACT_NINF (-16)
 
 #define yypact_value_is_default(Yyn) \
@@ -611,8 +615,8 @@
 #define yytable_value_is_error(Yyn) \
   0
 
-/* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
+  /* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
 static const yytype_int8 yypact =
 {
       -1,   -16,   -16,   -16,   -16,   -16,   -16,   -16,   -16,   -16,
@@ -621,9 +625,9 @@
       -1,   -16,   -16,   -16,    -1,    10,   -16,   -16,    -1,   -16
 };
 
-/* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE does not specify something else to do.  Zero
-   means the default is an error.  */
+  /* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_int8 yydefact =
 {
        0,    27,    28,    29,    25,    26,    23,    24,     3,    11,
@@ -632,23 +636,23 @@
        0,    14,    13,    12,     0,     0,     9,    18,     0,    10
 };
 
-/* YYPGOTONTERM-NUM.  */
+  /* YYPGOTONTERM-NUM.  */
 static const yytype_int8 yypgoto =
 {
      -16,   -16,   -16,   -16,   -16,   -16,   -16,   -16,   -16,   -16,
      -16,   -16,    -3,   -15
 };
 
-/* YYDEFGOTONTERM-NUM.  */
+  /* YYDEFGOTONTERM-NUM.  */
 static const yytype_int8 yydefgoto =
 {
        0,    10,    11,    14,    28,    20,    21,    12,    15,    33,
       23,    24,    22,    13
 };
 
-/* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule whose
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+  /* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int8 yytable =
 {
       25,    17,     1,     2,     3,     4,     5,     6,     7,    18,
@@ -663,8 +667,8 @@
       -1,    16,    15,    38,    16,    15,    29
 };
 
-/* YYSTOSSTATE-NUM -- The symbol kind of the accessing symbol of
-   state STATE-NUM.  */
+  /* YYSTOSSTATE-NUM -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_int8 yystos =
 {
        0,     3,     4,     5,     6,     7,     8,     9,    12,    17,
@@ -673,7 +677,7 @@
       15,    13,    14,    27,    16,    30,    31,    31,    15,    31
 };
 
-/* YYR1RULE-NUM -- Symbol kind of the left-hand side of rule RULE-NUM.  */
+  /* YYR1YYN -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_int8 yyr1 =
 {
        0,    18,    19,    21,    20,    22,    22,    23,    23,    24,
@@ -681,7 +685,7 @@
       30,    31,    31,    31,    31,    31,    31,    31,    31,    31
 };
 
-/* YYR2RULE-NUM -- Number of symbols on the right-hand side of rule RULE-NUM.  */
+  /* YYR2YYN -- Number of symbols on the right hand side of rule YYN.  */
 static const yytype_int8 yyr2 =
 {
        0,     2,     2,     0,     4,     1,     1,     0,     1,     3,
@@ -698,7 +702,6 @@
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
 #define YYERROR         goto yyerrorlab
-#define YYNOMEM         goto yyexhaustedlab
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
@@ -739,7 +742,10 @@
     YYFPRINTF Args;                             \
 } while (0)
 
-
+/* This macro is provided for backward compatibility. */
+# ifndef YY_LOCATION_PRINT
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 
 
 # define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
@@ -767,6 +773,10 @@
   YY_USE (parser);
   if (!yyvaluep)
     return;
+# ifdef YYPRINT
+  if (yykind < YYNTOKENS)
+    YYPRINT (yyo, yytoknumyykind, *yyvaluep);
+# endif
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   YY_USE (yykind);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
@@ -1026,7 +1036,6 @@
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yychar = PHP_JSON_YYEMPTY; /* Cause a token to be read.  */
-
   goto yysetstate;
 
 
@@ -1052,7 +1061,7 @@
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
-    YYNOMEM;
+    goto yyexhaustedlab;
 #else
     {
       /* Get the current used size of the three stacks, in elements.  */
@@ -1080,7 +1089,7 @@
 # else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-        YYNOMEM;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
         yystacksize = YYMAXDEPTH;
@@ -1091,7 +1100,7 @@
           YY_CAST (union yyalloc *,
                    YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
         if (! yyptr)
-          YYNOMEM;
+          goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
@@ -1113,7 +1122,6 @@
     }
 #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
-
   if (yystate == YYFINAL)
     YYACCEPT;
 
@@ -1420,7 +1428,6 @@
      label yyerrorlab therefore never appears in user code.  */
   if (0)
     YYERROR;
-  ++yynerrs;
 
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
@@ -1481,7 +1488,7 @@
 `-------------------------------------*/
 yyacceptlab:
   yyresult = 0;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
 /*-----------------------------------.
@@ -1489,22 +1496,24 @@
 `-----------------------------------*/
 yyabortlab:
   yyresult = 1;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
-/*-----------------------------------------------------------.
-| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here.  |
-`-----------------------------------------------------------*/
+#if !defined yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
 yyexhaustedlab:
   yyerror (parser, YY_("memory exhausted"));
   yyresult = 2;
-  goto yyreturnlab;
+  goto yyreturn;
+#endif
 
 
-/*----------------------------------------------------------.
-| yyreturnlab -- parsing is finished, clean up and return.  |
-`----------------------------------------------------------*/
-yyreturnlab:
+/*-------------------------------------------------------.
+| yyreturn -- parsing is finished, clean up and return.  |
+`-------------------------------------------------------*/
+yyreturn:
   if (yychar != PHP_JSON_YYEMPTY)
     {
       /* Make sure we have latest lookahead translation.  See comments at

php-8.2.23.tar.xz/ext/json/json_parser.tab.h -> php-8.2.28.tar.xz/ext/json/json_parser.tab.h Changed

php-8.2.23.tar.xz/ext/json/json_scanner.c -> php-8.2.28.tar.xz/ext/json/json_scanner.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 3.1 */
+/* Generated by re2c 2.0.3 */
 /*
   +----------------------------------------------------------------------+
   | Copyright (c) The PHP Group                                          |
@@ -111,40 +111,6 @@
 	{
 		YYCTYPE yych;
 		unsigned int yyaccept = 0;
-		static const unsigned char yybm_JS = {
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,  64,   0,   0,   0,  64,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			 64,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-			  0,   0,   0,   0,   0,   0,   0,   0, 
-		};
 		if (YYGETCONDITION() < 2) {
 			if (YYGETCONDITION() < 1) {
 				goto yyc_JS;
@@ -160,94 +126,129 @@
 		}
 /* *********************************** */
 yyc_JS:
-		yych = *YYCURSOR;
-		if (yych <= '') {
-			if (yych <= '"') {
-				if (yych <= '\f') {
-					if (yych <= 0x08) {
-						if (yych >= 0x01) goto yy1;
-					} else {
-						if (yych <= '\t') goto yy2;
-						if (yych <= '\n') goto yy5;
-						goto yy1;
-					}
-				} else {
-					if (yych <= 0x1F) {
-						if (yych <= '\r') goto yy6;
-						goto yy1;
-					} else {
-						if (yych <= ' ') goto yy2;
-						if (yych <= '!') goto yy7;
-						goto yy9;
-					}
-				}
-			} else {
-				if (yych <= '0') {
-					if (yych <= ',') {
-						if (yych <= '+') goto yy7;
-						goto yy10;
-					} else {
-						if (yych <= '-') goto yy11;
-						if (yych <= '/') goto yy7;
-						goto yy12;
-					}
-				} else {
-					if (yych <= 'Z') {
-						if (yych <= '9') goto yy14;
-						if (yych <= ':') goto yy15;
-						goto yy7;
-					} else {
-						if (yych <= '') goto yy16;
-						if (yych <= '\\') goto yy7;
-						goto yy17;
-					}
-				}
-			}
-		} else {
-			if (yych <= '}') {
-				if (yych <= 's') {
-					if (yych <= 'f') {
-						if (yych <= 'e') goto yy7;
-						goto yy18;
+		{
+			static const unsigned char yybm = {
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,  64,   0,   0,   0,  64,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				 64,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				128, 128, 128, 128, 128, 128, 128, 128, 
+				128, 128,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+			};
+			yych = *YYCURSOR;
+			if (yych <= '') {
+				if (yych <= '"') {
+					if (yych <= '\f') {
+						if (yych <= 0x08) {
+							if (yych >= 0x01) goto yy4;
+						} else {
+							if (yych <= '\t') goto yy6;
+							if (yych <= '\n') goto yy9;
+							goto yy4;
+						}
 					} else {
-						if (yych == 'n') goto yy19;
-						goto yy7;
+						if (yych <= 0x1F) {
+							if (yych <= '\r') goto yy10;
+							goto yy4;
+						} else {
+							if (yych <= ' ') goto yy6;
+							if (yych <= '!') goto yy11;
+							goto yy13;
+						}
 					}
 				} else {
-					if (yych <= 'z') {
-						if (yych <= 't') goto yy20;
-						goto yy7;
+					if (yych <= '0') {
+						if (yych <= ',') {
+							if (yych <= '+') goto yy11;
+							goto yy15;
+						} else {
+							if (yych <= '-') goto yy17;
+							if (yych <= '/') goto yy11;
+							goto yy18;
+						}
 					} else {
-						if (yych <= '{') goto yy21;
-						if (yych <= '|') goto yy7;
-						goto yy22;
+						if (yych <= 'Z') {
+							if (yych <= '9') goto yy20;
+							if (yych <= ':') goto yy22;
+							goto yy11;
+						} else {
+							if (yych <= '') goto yy24;
+							if (yych <= '\\') goto yy11;
+							goto yy26;
+						}
 					}
 				}
 			} else {
-				if (yych <= 0xEC) {
-					if (yych <= 0xC1) {
-						if (yych <= 0x7F) goto yy7;
-						goto yy23;
+				if (yych <= '}') {
+					if (yych <= 's') {
+						if (yych <= 'f') {
+							if (yych <= 'e') goto yy11;
+							goto yy28;
+						} else {
+							if (yych == 'n') goto yy29;
+							goto yy11;
+						}
 					} else {
-						if (yych <= 0xDF) goto yy25;
-						if (yych <= 0xE0) goto yy26;
-						goto yy27;
+						if (yych <= 'z') {
+							if (yych <= 't') goto yy30;
+							goto yy11;
+						} else {
+							if (yych <= '{') goto yy31;
+							if (yych <= '|') goto yy11;
+							goto yy33;
+						}
 					}
 				} else {
-					if (yych <= 0xF0) {
-						if (yych <= 0xED) goto yy28;
-						if (yych <= 0xEF) goto yy27;
-						goto yy29;
+					if (yych <= 0xEC) {
+						if (yych <= 0xC1) {
+							if (yych <= 0x7F) goto yy11;
+							goto yy35;
+						} else {
+							if (yych <= 0xDF) goto yy37;
+							if (yych <= 0xE0) goto yy38;
+							goto yy39;
+						}
 					} else {
-						if (yych <= 0xF3) goto yy30;
-						if (yych <= 0xF4) goto yy31;
-						goto yy23;
+						if (yych <= 0xF0) {
+							if (yych <= 0xED) goto yy40;
+							if (yych <= 0xEF) goto yy39;
+							goto yy41;
+						} else {
+							if (yych <= 0xF3) goto yy42;
+							if (yych <= 0xF4) goto yy43;
+							goto yy35;
+						}
 					}
 				}
 			}
-		}
-		++YYCURSOR;
-		{
+			++YYCURSOR;
+			{
 		if (s->limit < s->cursor) {
 			return PHP_JSON_T_EOI;
 		} else {
@@ -255,63 +256,63 @@
 			return PHP_JSON_T_ERROR;
 		}
 	}
-yy1:
-		++YYCURSOR;
-		{
+yy4:
+			++YYCURSOR;
+			{
 		s->errcode = PHP_JSON_ERROR_CTRL_CHAR;
 		return PHP_JSON_T_ERROR;
 	}
-yy2:
-		yych = *++YYCURSOR;
-yy3:
-		if (yybm_JS0+yych & 64) {
-			goto yy2;
-		}
-yy4:
-		{ goto std; }
-yy5:
-		++YYCURSOR;
-		goto yy4;
 yy6:
-		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy5;
-		goto yy3;
+			yych = *++YYCURSOR;
 yy7:
-		++YYCURSOR;
+			if (yybm0+yych & 64) {
+				goto yy6;
+			}
 yy8:
-		{
+			{ goto std; }
+yy9:
+			++YYCURSOR;
+			goto yy8;
+yy10:
+			yych = *++YYCURSOR;
+			if (yych == '\n') goto yy9;
+			goto yy7;
+yy11:
+			++YYCURSOR;
+yy12:
+			{
 		s->errcode = PHP_JSON_ERROR_SYNTAX;
 		return PHP_JSON_T_ERROR;
 	}
-yy9:
-		++YYCURSOR;
-		{
+yy13:
+			++YYCURSOR;
+			{
 		s->str_start = s->cursor;
 		s->str_esc = 0;
 		s->utf8_invalid = 0;
 		s->utf8_invalid_count = 0;
 		PHP_JSON_CONDITION_SET_AND_GOTO(STR_P1);
 	}
-yy10:
-		++YYCURSOR;
-		{ return ','; }
-yy11:
-		yych = *++YYCURSOR;
-		if (yych <= '/') goto yy8;
-		if (yych <= '0') goto yy12;
-		if (yych <= '9') goto yy14;
-		goto yy8;
-yy12:
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 'D') {
-			if (yych == '.') goto yy32;
-		} else {
-			if (yych <= 'E') goto yy34;
-			if (yych == 'e') goto yy34;
-		}
-yy13:
-		{
+yy15:
+			++YYCURSOR;
+			{ return ','; }
+yy17:
+			yych = *++YYCURSOR;
+			if (yych <= '/') goto yy12;
+			if (yych <= '0') goto yy18;
+			if (yych <= '9') goto yy20;
+			goto yy12;
+yy18:
+			yyaccept = 0;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 'D') {
+				if (yych == '.') goto yy44;
+			} else {
+				if (yych <= 'E') goto yy46;
+				if (yych == 'e') goto yy46;
+			}
+yy19:
+			{
 		bool bigint = 0, negative = s->token0 == '-';
 		size_t digits = (size_t) (s->cursor - s->token - negative);
 		if (digits >= PHP_JSON_INT_MAX_LENGTH) {
@@ -335,244 +336,245 @@
 			return PHP_JSON_T_DOUBLE;
 		}
 	}
-yy14:
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yybm_JS0+yych & 128) {
-			goto yy14;
-		}
-		if (yych <= 'D') {
-			if (yych == '.') goto yy32;
-			goto yy13;
-		} else {
-			if (yych <= 'E') goto yy34;
-			if (yych == 'e') goto yy34;
-			goto yy13;
-		}
-yy15:
-		++YYCURSOR;
-		{ return ':'; }
-yy16:
-		++YYCURSOR;
-		{ return ''; }
-yy17:
-		++YYCURSOR;
-		{ return ''; }
-yy18:
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'a') goto yy35;
-		goto yy8;
-yy19:
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'u') goto yy36;
-		goto yy8;
 yy20:
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'r') goto yy37;
-		goto yy8;
-yy21:
-		++YYCURSOR;
-		{ return '{'; }
+			yyaccept = 0;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yybm0+yych & 128) {
+				goto yy20;
+			}
+			if (yych <= 'D') {
+				if (yych == '.') goto yy44;
+				goto yy19;
+			} else {
+				if (yych <= 'E') goto yy46;
+				if (yych == 'e') goto yy46;
+				goto yy19;
+			}
 yy22:
-		++YYCURSOR;
-		{ return '}'; }
-yy23:
-		++YYCURSOR;
+			++YYCURSOR;
+			{ return ':'; }
 yy24:
-		{
-		s->errcode = PHP_JSON_ERROR_UTF8;
-		return PHP_JSON_T_ERROR;
-	}
-yy25:
-		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy24;
-		if (yych <= 0xBF) goto yy7;
-		goto yy24;
+			++YYCURSOR;
+			{ return ''; }
 yy26:
-		yyaccept = 2;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x9F) goto yy24;
-		if (yych <= 0xBF) goto yy38;
-		goto yy24;
-yy27:
-		yyaccept = 2;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy24;
-		if (yych <= 0xBF) goto yy38;
-		goto yy24;
+			++YYCURSOR;
+			{ return ''; }
 yy28:
-		yyaccept = 2;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy24;
-		if (yych <= 0x9F) goto yy38;
-		goto yy24;
+			yyaccept = 1;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych == 'a') goto yy47;
+			goto yy12;
 yy29:
-		yyaccept = 2;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x8F) goto yy24;
-		if (yych <= 0xBF) goto yy39;
-		goto yy24;
+			yyaccept = 1;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych == 'u') goto yy48;
+			goto yy12;
 yy30:
-		yyaccept = 2;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy24;
-		if (yych <= 0xBF) goto yy39;
-		goto yy24;
+			yyaccept = 1;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych == 'r') goto yy49;
+			goto yy12;
 yy31:
-		yyaccept = 2;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy24;
-		if (yych <= 0x8F) goto yy39;
-		goto yy24;
-yy32:
-		yych = *++YYCURSOR;
-		if (yych <= '/') goto yy33;
-		if (yych <= '9') goto yy40;
+			++YYCURSOR;
+			{ return '{'; }
 yy33:
-		YYCURSOR = YYMARKER;
-		if (yyaccept <= 1) {
-			if (yyaccept == 0) {
-				goto yy13;
-			} else {
-				goto yy8;
-			}
-		} else {
-			if (yyaccept == 2) {
-				goto yy24;
-			} else {
-				goto yy41;
-			}
-		}
-yy34:
-		yych = *++YYCURSOR;
-		if (yych <= ',') {
-			if (yych == '+') goto yy42;
-			goto yy33;
-		} else {
-			if (yych <= '-') goto yy42;
-			if (yych <= '/') goto yy33;
-			if (yych <= '9') goto yy43;
-			goto yy33;
-		}
+			++YYCURSOR;
+			{ return '}'; }
 yy35:
-		yych = *++YYCURSOR;
-		if (yych == 'l') goto yy44;
-		goto yy33;
+			++YYCURSOR;
 yy36:
-		yych = *++YYCURSOR;
-		if (yych == 'l') goto yy45;
-		goto yy33;
+			{
+		s->errcode = PHP_JSON_ERROR_UTF8;
+		return PHP_JSON_T_ERROR;
+	}
 yy37:
-		yych = *++YYCURSOR;
-		if (yych == 'u') goto yy46;
-		goto yy33;
+			yych = *++YYCURSOR;
+			if (yych <= 0x7F) goto yy36;
+			if (yych <= 0xBF) goto yy11;
+			goto yy36;
 yy38:
-		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy33;
-		if (yych <= 0xBF) goto yy7;
-		goto yy33;
+			yyaccept = 2;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 0x9F) goto yy36;
+			if (yych <= 0xBF) goto yy50;
+			goto yy36;
 yy39:
-		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy33;
-		if (yych <= 0xBF) goto yy38;
-		goto yy33;
+			yyaccept = 2;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 0x7F) goto yy36;
+			if (yych <= 0xBF) goto yy50;
+			goto yy36;
 yy40:
-		yyaccept = 3;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 'D') {
-			if (yych <= '/') goto yy41;
-			if (yych <= '9') goto yy40;
-		} else {
-			if (yych <= 'E') goto yy34;
-			if (yych == 'e') goto yy34;
-		}
+			yyaccept = 2;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 0x7F) goto yy36;
+			if (yych <= 0x9F) goto yy50;
+			goto yy36;
 yy41:
-		{
-		ZVAL_DOUBLE(&s->value, zend_strtod((char *) s->token, NULL));
-		return PHP_JSON_T_DOUBLE;
-	}
+			yyaccept = 2;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 0x8F) goto yy36;
+			if (yych <= 0xBF) goto yy51;
+			goto yy36;
 yy42:
-		yych = *++YYCURSOR;
-		if (yych <= '/') goto yy33;
-		if (yych >= ':') goto yy33;
+			yyaccept = 2;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 0x7F) goto yy36;
+			if (yych <= 0xBF) goto yy51;
+			goto yy36;
 yy43:
-		yych = *++YYCURSOR;
-		if (yych <= '/') goto yy41;
-		if (yych <= '9') goto yy43;
-		goto yy41;
+			yyaccept = 2;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 0x7F) goto yy36;
+			if (yych <= 0x8F) goto yy51;
+			goto yy36;
 yy44:
-		yych = *++YYCURSOR;
-		if (yych == 's') goto yy47;
-		goto yy33;
+			yych = *++YYCURSOR;
+			if (yych <= '/') goto yy45;
+			if (yych <= '9') goto yy52;
 yy45:
-		yych = *++YYCURSOR;
-		if (yych == 'l') goto yy48;
-		goto yy33;
+			YYCURSOR = YYMARKER;
+			if (yyaccept <= 1) {
+				if (yyaccept == 0) {
+					goto yy19;
+				} else {
+					goto yy12;
+				}
+			} else {
+				if (yyaccept == 2) {
+					goto yy36;
+				} else {
+					goto yy54;
+				}
+			}
 yy46:
-		yych = *++YYCURSOR;
-		if (yych == 'e') goto yy49;
-		goto yy33;
+			yych = *++YYCURSOR;
+			if (yych <= ',') {
+				if (yych == '+') goto yy55;
+				goto yy45;
+			} else {
+				if (yych <= '-') goto yy55;
+				if (yych <= '/') goto yy45;
+				if (yych <= '9') goto yy56;
+				goto yy45;
+			}
 yy47:
-		yych = *++YYCURSOR;
-		if (yych == 'e') goto yy50;
-		goto yy33;
+			yych = *++YYCURSOR;
+			if (yych == 'l') goto yy58;
+			goto yy45;
 yy48:
-		++YYCURSOR;
-		{
+			yych = *++YYCURSOR;
+			if (yych == 'l') goto yy59;
+			goto yy45;
+yy49:
+			yych = *++YYCURSOR;
+			if (yych == 'u') goto yy60;
+			goto yy45;
+yy50:
+			yych = *++YYCURSOR;
+			if (yych <= 0x7F) goto yy45;
+			if (yych <= 0xBF) goto yy11;
+			goto yy45;
+yy51:
+			yych = *++YYCURSOR;
+			if (yych <= 0x7F) goto yy45;
+			if (yych <= 0xBF) goto yy50;
+			goto yy45;
+yy52:
+			yyaccept = 3;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 'D') {
+				if (yych <= '/') goto yy54;
+				if (yych <= '9') goto yy52;
+			} else {
+				if (yych <= 'E') goto yy46;
+				if (yych == 'e') goto yy46;
+			}
+yy54:
+			{
+		ZVAL_DOUBLE(&s->value, zend_strtod((char *) s->token, NULL));
+		return PHP_JSON_T_DOUBLE;
+	}
+yy55:
+			yych = *++YYCURSOR;
+			if (yych <= '/') goto yy45;
+			if (yych >= ':') goto yy45;
+yy56:
+			yych = *++YYCURSOR;
+			if (yych <= '/') goto yy54;
+			if (yych <= '9') goto yy56;
+			goto yy54;
+yy58:
+			yych = *++YYCURSOR;
+			if (yych == 's') goto yy61;
+			goto yy45;
+yy59:
+			yych = *++YYCURSOR;
+			if (yych == 'l') goto yy62;
+			goto yy45;
+yy60:
+			yych = *++YYCURSOR;
+			if (yych == 'e') goto yy64;
+			goto yy45;
+yy61:
+			yych = *++YYCURSOR;
+			if (yych == 'e') goto yy66;
+			goto yy45;
+yy62:
+			++YYCURSOR;
+			{
 		ZVAL_NULL(&s->value);
 		return PHP_JSON_T_NUL;
 	}
-yy49:
-		++YYCURSOR;
-		{
+yy64:
+			++YYCURSOR;
+			{
 		ZVAL_TRUE(&s->value);
 		return PHP_JSON_T_TRUE;
 	}
-yy50:
-		++YYCURSOR;
-		{
+yy66:
+			++YYCURSOR;
+			{
 		ZVAL_FALSE(&s->value);
 		return PHP_JSON_T_FALSE;
 	}
+		}
 /* *********************************** */
 yyc_STR_P1:
 		yych = *YYCURSOR;
 		if (yych <= 0xDF) {
 			if (yych <= '') {
-				if (yych <= 0x1F) goto yy52;
-				if (yych == '"') goto yy54;
-				goto yy53;
+				if (yych <= 0x1F) goto yy70;
+				if (yych == '"') goto yy74;
+				goto yy72;
 			} else {
-				if (yych <= '\\') goto yy55;
-				if (yych <= 0x7F) goto yy53;
-				if (yych <= 0xC1) goto yy57;
-				goto yy59;
+				if (yych <= '\\') goto yy76;
+				if (yych <= 0x7F) goto yy72;
+				if (yych <= 0xC1) goto yy78;
+				goto yy80;
 			}
 		} else {
 			if (yych <= 0xEF) {
-				if (yych <= 0xE0) goto yy60;
-				if (yych == 0xED) goto yy62;
-				goto yy61;
+				if (yych <= 0xE0) goto yy81;
+				if (yych == 0xED) goto yy83;
+				goto yy82;
 			} else {
-				if (yych <= 0xF0) goto yy63;
-				if (yych <= 0xF3) goto yy64;
-				if (yych <= 0xF4) goto yy65;
-				goto yy57;
+				if (yych <= 0xF0) goto yy84;
+				if (yych <= 0xF3) goto yy85;
+				if (yych <= 0xF4) goto yy86;
+				goto yy78;
 			}
 		}
-yy52:
+yy70:
 		++YYCURSOR;
 		{
 		s->errcode = PHP_JSON_ERROR_CTRL_CHAR;
 		return PHP_JSON_T_ERROR;
 	}
-yy53:
+yy72:
 		++YYCURSOR;
 		{ PHP_JSON_CONDITION_GOTO(STR_P1); }
-yy54:
+yy74:
 		++YYCURSOR;
 		{
 		zend_string *str;
@@ -595,41 +597,41 @@
 			return PHP_JSON_T_STRING;
 		}
 	}
-yy55:
+yy76:
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'e') {
 			if (yych <= '/') {
-				if (yych == '"') goto yy66;
-				if (yych >= '/') goto yy66;
+				if (yych == '"') goto yy87;
+				if (yych >= '/') goto yy87;
 			} else {
 				if (yych <= '\\') {
-					if (yych >= '\\') goto yy66;
+					if (yych >= '\\') goto yy87;
 				} else {
-					if (yych == 'b') goto yy66;
+					if (yych == 'b') goto yy87;
 				}
 			}
 		} else {
 			if (yych <= 'q') {
-				if (yych <= 'f') goto yy66;
-				if (yych == 'n') goto yy66;
+				if (yych <= 'f') goto yy87;
+				if (yych == 'n') goto yy87;
 			} else {
 				if (yych <= 's') {
-					if (yych <= 'r') goto yy66;
+					if (yych <= 'r') goto yy87;
 				} else {
-					if (yych <= 't') goto yy66;
-					if (yych <= 'u') goto yy67;
+					if (yych <= 't') goto yy87;
+					if (yych <= 'u') goto yy89;
 				}
 			}
 		}
-yy56:
+yy77:
 		{
 		s->errcode = PHP_JSON_ERROR_SYNTAX;
 		return PHP_JSON_T_ERROR;
 	}
-yy57:
+yy78:
 		++YYCURSOR;
-yy58:
+yy79:
 		{
 		if (s->options & (PHP_JSON_INVALID_UTF8_IGNORE | PHP_JSON_INVALID_UTF8_SUBSTITUTE)) {
 			if (s->options & PHP_JSON_INVALID_UTF8_SUBSTITUTE) {
@@ -647,329 +649,329 @@
 		s->errcode = PHP_JSON_ERROR_UTF8;
 		return PHP_JSON_T_ERROR;
 	}
-yy59:
+yy80:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy58;
-		if (yych <= 0xBF) goto yy53;
-		goto yy58;
-yy60:
+		if (yych <= 0x7F) goto yy79;
+		if (yych <= 0xBF) goto yy72;
+		goto yy79;
+yy81:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x9F) goto yy58;
-		if (yych <= 0xBF) goto yy69;
-		goto yy58;
-yy61:
+		if (yych <= 0x9F) goto yy79;
+		if (yych <= 0xBF) goto yy91;
+		goto yy79;
+yy82:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy58;
-		if (yych <= 0xBF) goto yy69;
-		goto yy58;
-yy62:
+		if (yych <= 0x7F) goto yy79;
+		if (yych <= 0xBF) goto yy91;
+		goto yy79;
+yy83:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy58;
-		if (yych <= 0x9F) goto yy69;
-		goto yy58;
-yy63:
+		if (yych <= 0x7F) goto yy79;
+		if (yych <= 0x9F) goto yy91;
+		goto yy79;
+yy84:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x8F) goto yy58;
-		if (yych <= 0xBF) goto yy70;
-		goto yy58;
-yy64:
+		if (yych <= 0x8F) goto yy79;
+		if (yych <= 0xBF) goto yy92;
+		goto yy79;
+yy85:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy58;
-		if (yych <= 0xBF) goto yy70;
-		goto yy58;
-yy65:
+		if (yych <= 0x7F) goto yy79;
+		if (yych <= 0xBF) goto yy92;
+		goto yy79;
+yy86:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy58;
-		if (yych <= 0x8F) goto yy70;
-		goto yy58;
-yy66:
+		if (yych <= 0x7F) goto yy79;
+		if (yych <= 0x8F) goto yy92;
+		goto yy79;
+yy87:
 		++YYCURSOR;
 		{
 		s->str_esc++;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
-yy67:
+yy89:
 		yych = *++YYCURSOR;
 		if (yych <= 'D') {
 			if (yych <= '9') {
-				if (yych <= '/') goto yy68;
-				if (yych <= '0') goto yy71;
-				goto yy72;
+				if (yych <= '/') goto yy90;
+				if (yych <= '0') goto yy93;
+				goto yy94;
 			} else {
-				if (yych <= '@') goto yy68;
-				if (yych <= 'C') goto yy72;
-				goto yy73;
+				if (yych <= '@') goto yy90;
+				if (yych <= 'C') goto yy94;
+				goto yy95;
 			}
 		} else {
 			if (yych <= 'c') {
-				if (yych <= 'F') goto yy72;
-				if (yych >= 'a') goto yy72;
+				if (yych <= 'F') goto yy94;
+				if (yych >= 'a') goto yy94;
 			} else {
-				if (yych <= 'd') goto yy73;
-				if (yych <= 'f') goto yy72;
+				if (yych <= 'd') goto yy95;
+				if (yych <= 'f') goto yy94;
 			}
 		}
-yy68:
+yy90:
 		YYCURSOR = YYMARKER;
 		if (yyaccept <= 1) {
 			if (yyaccept == 0) {
-				goto yy56;
+				goto yy77;
 			} else {
-				goto yy58;
+				goto yy79;
 			}
 		} else {
-			goto yy88;
+			goto yy113;
 		}
-yy69:
+yy91:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy68;
-		if (yych <= 0xBF) goto yy53;
-		goto yy68;
-yy70:
+		if (yych <= 0x7F) goto yy90;
+		if (yych <= 0xBF) goto yy72;
+		goto yy90;
+yy92:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy68;
-		if (yych <= 0xBF) goto yy69;
-		goto yy68;
-yy71:
+		if (yych <= 0x7F) goto yy90;
+		if (yych <= 0xBF) goto yy91;
+		goto yy90;
+yy93:
 		yych = *++YYCURSOR;
 		if (yych <= '9') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '0') goto yy74;
-			if (yych <= '7') goto yy75;
-			goto yy76;
+			if (yych <= '/') goto yy90;
+			if (yych <= '0') goto yy96;
+			if (yych <= '7') goto yy97;
+			goto yy98;
 		} else {
 			if (yych <= 'F') {
-				if (yych <= '@') goto yy68;
-				goto yy76;
+				if (yych <= '@') goto yy90;
+				goto yy98;
 			} else {
-				if (yych <= '`') goto yy68;
-				if (yych <= 'f') goto yy76;
-				goto yy68;
+				if (yych <= '`') goto yy90;
+				if (yych <= 'f') goto yy98;
+				goto yy90;
 			}
 		}
-yy72:
+yy94:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy76;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy98;
+			goto yy90;
 		} else {
-			if (yych <= 'F') goto yy76;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy76;
-			goto yy68;
+			if (yych <= 'F') goto yy98;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy98;
+			goto yy90;
 		}
-yy73:
+yy95:
 		yych = *++YYCURSOR;
 		if (yych <= 'B') {
 			if (yych <= '7') {
-				if (yych <= '/') goto yy68;
-				goto yy76;
+				if (yych <= '/') goto yy90;
+				goto yy98;
 			} else {
-				if (yych <= '9') goto yy77;
-				if (yych <= '@') goto yy68;
-				goto yy77;
+				if (yych <= '9') goto yy99;
+				if (yych <= '@') goto yy90;
+				goto yy99;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych <= 'F') goto yy78;
-				goto yy68;
+				if (yych <= 'F') goto yy100;
+				goto yy90;
 			} else {
-				if (yych <= 'b') goto yy77;
-				if (yych <= 'f') goto yy78;
-				goto yy68;
+				if (yych <= 'b') goto yy99;
+				if (yych <= 'f') goto yy100;
+				goto yy90;
 			}
 		}
-yy74:
+yy96:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '7') goto yy79;
-			if (yych <= '9') goto yy80;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '7') goto yy101;
+			if (yych <= '9') goto yy102;
+			goto yy90;
 		} else {
-			if (yych <= 'F') goto yy80;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy80;
-			goto yy68;
+			if (yych <= 'F') goto yy102;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy102;
+			goto yy90;
 		}
-yy75:
+yy97:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy80;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy102;
+			goto yy90;
 		} else {
-			if (yych <= 'F') goto yy80;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy80;
-			goto yy68;
+			if (yych <= 'F') goto yy102;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy102;
+			goto yy90;
 		}
-yy76:
+yy98:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy81;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy103;
+			goto yy90;
 		} else {
-			if (yych <= 'F') goto yy81;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy81;
-			goto yy68;
+			if (yych <= 'F') goto yy103;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy103;
+			goto yy90;
 		}
-yy77:
+yy99:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy82;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy104;
+			goto yy90;
 		} else {
-			if (yych <= 'F') goto yy82;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy82;
-			goto yy68;
+			if (yych <= 'F') goto yy104;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy104;
+			goto yy90;
 		}
-yy78:
+yy100:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy83;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy105;
+			goto yy90;
 		} else {
-			if (yych <= 'F') goto yy83;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy83;
-			goto yy68;
+			if (yych <= 'F') goto yy105;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy105;
+			goto yy90;
 		}
-yy79:
+yy101:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy84;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy106;
+			goto yy90;
 		} else {
-			if (yych <= 'F') goto yy84;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy84;
-			goto yy68;
+			if (yych <= 'F') goto yy106;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy106;
+			goto yy90;
 		}
-yy80:
+yy102:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy85;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy108;
+			goto yy90;
 		} else {
-			if (yych <= 'F') goto yy85;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy85;
-			goto yy68;
+			if (yych <= 'F') goto yy108;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy108;
+			goto yy90;
 		}
-yy81:
+yy103:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy86;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy110;
+			goto yy90;
 		} else {
-			if (yych <= 'F') goto yy86;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy86;
-			goto yy68;
+			if (yych <= 'F') goto yy110;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy110;
+			goto yy90;
 		}
-yy82:
+yy104:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy87;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy112;
+			goto yy90;
 		} else {
-			if (yych <= 'F') goto yy87;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy87;
-			goto yy68;
+			if (yych <= 'F') goto yy112;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy112;
+			goto yy90;
 		}
-yy83:
+yy105:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy89;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy114;
+			goto yy90;
 		} else {
-			if (yych <= 'F') goto yy89;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy89;
-			goto yy68;
+			if (yych <= 'F') goto yy114;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy114;
+			goto yy90;
 		}
-yy84:
+yy106:
 		++YYCURSOR;
 		{
 		s->str_esc += 5;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
-yy85:
+yy108:
 		++YYCURSOR;
 		{
 		s->str_esc += 4;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
-yy86:
+yy110:
 		++YYCURSOR;
 		{
 		s->str_esc += 3;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
-yy87:
+yy112:
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '\\') goto yy90;
-yy88:
+		if (yych == '\\') goto yy115;
+yy113:
 		{
 		s->errcode = PHP_JSON_ERROR_UTF16;
 		return PHP_JSON_T_ERROR;
 	}
-yy89:
+yy114:
 		++YYCURSOR;
-		goto yy88;
-yy90:
+		goto yy113;
+yy115:
 		yych = *++YYCURSOR;
-		if (yych != 'u') goto yy68;
+		if (yych != 'u') goto yy90;
 		yych = *++YYCURSOR;
-		if (yych == 'D') goto yy91;
-		if (yych != 'd') goto yy68;
-yy91:
+		if (yych == 'D') goto yy117;
+		if (yych != 'd') goto yy90;
+yy117:
 		yych = *++YYCURSOR;
-		if (yych <= 'B') goto yy68;
-		if (yych <= 'F') goto yy92;
-		if (yych <= 'b') goto yy68;
-		if (yych >= 'g') goto yy68;
-yy92:
+		if (yych <= 'B') goto yy90;
+		if (yych <= 'F') goto yy118;
+		if (yych <= 'b') goto yy90;
+		if (yych >= 'g') goto yy90;
+yy118:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych >= ':') goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych >= ':') goto yy90;
 		} else {
-			if (yych <= 'F') goto yy93;
-			if (yych <= '`') goto yy68;
-			if (yych >= 'g') goto yy68;
+			if (yych <= 'F') goto yy119;
+			if (yych <= '`') goto yy90;
+			if (yych >= 'g') goto yy90;
 		}
-yy93:
+yy119:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych >= ':') goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych >= ':') goto yy90;
 		} else {
-			if (yych <= 'F') goto yy94;
-			if (yych <= '`') goto yy68;
-			if (yych >= 'g') goto yy68;
+			if (yych <= 'F') goto yy120;
+			if (yych <= '`') goto yy90;
+			if (yych >= 'g') goto yy90;
 		}
-yy94:
+yy120:
 		++YYCURSOR;
 		{
 		s->str_esc += 8;
@@ -980,40 +982,40 @@
 		yych = *YYCURSOR;
 		if (yych <= 0xDF) {
 			if (yych <= '') {
-				if (yych == '"') goto yy97;
+				if (yych == '"') goto yy126;
 			} else {
-				if (yych <= '\\') goto yy98;
-				if (yych <= 0x7F) goto yy96;
-				if (yych <= 0xC1) goto yy100;
-				goto yy102;
+				if (yych <= '\\') goto yy128;
+				if (yych <= 0x7F) goto yy124;
+				if (yych <= 0xC1) goto yy130;
+				goto yy132;
 			}
 		} else {
 			if (yych <= 0xEF) {
-				if (yych <= 0xE0) goto yy103;
-				if (yych == 0xED) goto yy105;
-				goto yy104;
+				if (yych <= 0xE0) goto yy133;
+				if (yych == 0xED) goto yy135;
+				goto yy134;
 			} else {
-				if (yych <= 0xF0) goto yy106;
-				if (yych <= 0xF3) goto yy107;
-				if (yych <= 0xF4) goto yy108;
-				goto yy100;
+				if (yych <= 0xF0) goto yy136;
+				if (yych <= 0xF3) goto yy137;
+				if (yych <= 0xF4) goto yy138;
+				goto yy130;
 			}
 		}
-yy96:
+yy124:
 		++YYCURSOR;
 		{ PHP_JSON_CONDITION_GOTO(STR_P2_BIN); }
-yy97:
+yy126:
 		++YYCURSOR;
 		YYSETCONDITION(yycJS);
 		{
 		PHP_JSON_SCANNER_COPY_ESC();
 		return PHP_JSON_T_STRING;
 	}
-yy98:
+yy128:
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'u') goto yy109;
-yy99:
+		if (yych == 'u') goto yy139;
+yy129:
 		{
 		char esc;
 		PHP_JSON_SCANNER_COPY_ESC();
@@ -1046,9 +1048,9 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy100:
+yy130:
 		++YYCURSOR;
-yy101:
+yy131:
 		{
 		if (s->utf8_invalid) {
 			PHP_JSON_SCANNER_COPY_ESC();
@@ -1061,225 +1063,225 @@
 		}
 		PHP_JSON_CONDITION_GOTO(STR_P2_BIN);
 	}
-yy102:
+yy132:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy101;
-		if (yych <= 0xBF) goto yy96;
-		goto yy101;
-yy103:
+		if (yych <= 0x7F) goto yy131;
+		if (yych <= 0xBF) goto yy124;
+		goto yy131;
+yy133:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x9F) goto yy101;
-		if (yych <= 0xBF) goto yy111;
-		goto yy101;
-yy104:
+		if (yych <= 0x9F) goto yy131;
+		if (yych <= 0xBF) goto yy141;
+		goto yy131;
+yy134:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy101;
-		if (yych <= 0xBF) goto yy111;
-		goto yy101;
-yy105:
+		if (yych <= 0x7F) goto yy131;
+		if (yych <= 0xBF) goto yy141;
+		goto yy131;
+yy135:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy101;
-		if (yych <= 0x9F) goto yy111;
-		goto yy101;
-yy106:
+		if (yych <= 0x7F) goto yy131;
+		if (yych <= 0x9F) goto yy141;
+		goto yy131;
+yy136:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x8F) goto yy101;
-		if (yych <= 0xBF) goto yy112;
-		goto yy101;
-yy107:
+		if (yych <= 0x8F) goto yy131;
+		if (yych <= 0xBF) goto yy142;
+		goto yy131;
+yy137:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy101;
-		if (yych <= 0xBF) goto yy112;
-		goto yy101;
-yy108:
+		if (yych <= 0x7F) goto yy131;
+		if (yych <= 0xBF) goto yy142;
+		goto yy131;
+yy138:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy101;
-		if (yych <= 0x8F) goto yy112;
-		goto yy101;
-yy109:
+		if (yych <= 0x7F) goto yy131;
+		if (yych <= 0x8F) goto yy142;
+		goto yy131;
+yy139:
 		yych = *++YYCURSOR;
 		if (yych <= 'D') {
 			if (yych <= '9') {
-				if (yych <= '/') goto yy110;
-				if (yych <= '0') goto yy113;
-				goto yy114;
+				if (yych <= '/') goto yy140;
+				if (yych <= '0') goto yy143;
+				goto yy144;
 			} else {
-				if (yych <= '@') goto yy110;
-				if (yych <= 'C') goto yy114;
-				goto yy115;
+				if (yych <= '@') goto yy140;
+				if (yych <= 'C') goto yy144;
+				goto yy145;
 			}
 		} else {
 			if (yych <= 'c') {
-				if (yych <= 'F') goto yy114;
-				if (yych >= 'a') goto yy114;
+				if (yych <= 'F') goto yy144;
+				if (yych >= 'a') goto yy144;
 			} else {
-				if (yych <= 'd') goto yy115;
-				if (yych <= 'f') goto yy114;
+				if (yych <= 'd') goto yy145;
+				if (yych <= 'f') goto yy144;
 			}
 		}
-yy110:
+yy140:
 		YYCURSOR = YYMARKER;
 		if (yyaccept == 0) {
-			goto yy99;
+			goto yy129;
 		} else {
-			goto yy101;
+			goto yy131;
 		}
-yy111:
+yy141:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy110;
-		if (yych <= 0xBF) goto yy96;
-		goto yy110;
-yy112:
+		if (yych <= 0x7F) goto yy140;
+		if (yych <= 0xBF) goto yy124;
+		goto yy140;
+yy142:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy110;
-		if (yych <= 0xBF) goto yy111;
-		goto yy110;
-yy113:
+		if (yych <= 0x7F) goto yy140;
+		if (yych <= 0xBF) goto yy141;
+		goto yy140;
+yy143:
 		yych = *++YYCURSOR;
 		if (yych <= '9') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '0') goto yy116;
-			if (yych <= '7') goto yy117;
-			goto yy118;
+			if (yych <= '/') goto yy140;
+			if (yych <= '0') goto yy146;
+			if (yych <= '7') goto yy147;
+			goto yy148;
 		} else {
 			if (yych <= 'F') {
-				if (yych <= '@') goto yy110;
-				goto yy118;
+				if (yych <= '@') goto yy140;
+				goto yy148;
 			} else {
-				if (yych <= '`') goto yy110;
-				if (yych <= 'f') goto yy118;
-				goto yy110;
+				if (yych <= '`') goto yy140;
+				if (yych <= 'f') goto yy148;
+				goto yy140;
 			}
 		}
-yy114:
+yy144:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy118;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy148;
+			goto yy140;
 		} else {
-			if (yych <= 'F') goto yy118;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy118;
-			goto yy110;
+			if (yych <= 'F') goto yy148;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy148;
+			goto yy140;
 		}
-yy115:
+yy145:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '7') goto yy118;
-			if (yych <= '9') goto yy119;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '7') goto yy148;
+			if (yych <= '9') goto yy149;
+			goto yy140;
 		} else {
-			if (yych <= 'B') goto yy119;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'b') goto yy119;
-			goto yy110;
+			if (yych <= 'B') goto yy149;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'b') goto yy149;
+			goto yy140;
 		}
-yy116:
+yy146:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '7') goto yy120;
-			if (yych <= '9') goto yy121;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '7') goto yy150;
+			if (yych <= '9') goto yy151;
+			goto yy140;
 		} else {
-			if (yych <= 'F') goto yy121;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy121;
-			goto yy110;
+			if (yych <= 'F') goto yy151;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy151;
+			goto yy140;
 		}
-yy117:
+yy147:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy121;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy151;
+			goto yy140;
 		} else {
-			if (yych <= 'F') goto yy121;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy121;
-			goto yy110;
+			if (yych <= 'F') goto yy151;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy151;
+			goto yy140;
 		}
-yy118:
+yy148:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy122;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy152;
+			goto yy140;
 		} else {
-			if (yych <= 'F') goto yy122;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy122;
-			goto yy110;
+			if (yych <= 'F') goto yy152;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy152;
+			goto yy140;
 		}
-yy119:
+yy149:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy123;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy153;
+			goto yy140;
 		} else {
-			if (yych <= 'F') goto yy123;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy123;
-			goto yy110;
+			if (yych <= 'F') goto yy153;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy153;
+			goto yy140;
 		}
-yy120:
+yy150:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy124;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy154;
+			goto yy140;
 		} else {
-			if (yych <= 'F') goto yy124;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy124;
-			goto yy110;
+			if (yych <= 'F') goto yy154;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy154;
+			goto yy140;
 		}
-yy121:
+yy151:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy125;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy156;
+			goto yy140;
 		} else {
-			if (yych <= 'F') goto yy125;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy125;
-			goto yy110;
+			if (yych <= 'F') goto yy156;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy156;
+			goto yy140;
 		}
-yy122:
+yy152:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy126;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy158;
+			goto yy140;
 		} else {
-			if (yych <= 'F') goto yy126;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy126;
-			goto yy110;
+			if (yych <= 'F') goto yy158;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy158;
+			goto yy140;
 		}
-yy123:
+yy153:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy127;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy160;
+			goto yy140;
 		} else {
-			if (yych <= 'F') goto yy127;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy127;
-			goto yy110;
+			if (yych <= 'F') goto yy160;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy160;
+			goto yy140;
 		}
-yy124:
+yy154:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 2);
@@ -1288,7 +1290,7 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy125:
+yy156:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 3);
@@ -1298,7 +1300,7 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy126:
+yy158:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 4);
@@ -1309,41 +1311,41 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy127:
+yy160:
 		yych = *++YYCURSOR;
-		if (yych != '\\') goto yy110;
+		if (yych != '\\') goto yy140;
 		yych = *++YYCURSOR;
-		if (yych != 'u') goto yy110;
+		if (yych != 'u') goto yy140;
 		yych = *++YYCURSOR;
-		if (yych == 'D') goto yy128;
-		if (yych != 'd') goto yy110;
-yy128:
+		if (yych == 'D') goto yy163;
+		if (yych != 'd') goto yy140;
+yy163:
 		yych = *++YYCURSOR;
-		if (yych <= 'B') goto yy110;
-		if (yych <= 'F') goto yy129;
-		if (yych <= 'b') goto yy110;
-		if (yych >= 'g') goto yy110;
-yy129:
+		if (yych <= 'B') goto yy140;
+		if (yych <= 'F') goto yy164;
+		if (yych <= 'b') goto yy140;
+		if (yych >= 'g') goto yy140;
+yy164:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych >= ':') goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych >= ':') goto yy140;
 		} else {
-			if (yych <= 'F') goto yy130;
-			if (yych <= '`') goto yy110;
-			if (yych >= 'g') goto yy110;
+			if (yych <= 'F') goto yy165;
+			if (yych <= '`') goto yy140;
+			if (yych >= 'g') goto yy140;
 		}
-yy130:
+yy165:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych >= ':') goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych >= ':') goto yy140;
 		} else {
-			if (yych <= 'F') goto yy131;
-			if (yych <= '`') goto yy110;
-			if (yych >= 'g') goto yy110;
+			if (yych <= 'F') goto yy166;
+			if (yych <= '`') goto yy140;
+			if (yych >= 'g') goto yy140;
 		}
-yy131:
+yy166:
 		++YYCURSOR;
 		{
 		int utf32, utf16_hi, utf16_lo;
@@ -1361,21 +1363,21 @@
 /* *********************************** */
 yyc_STR_P2_UTF:
 		yych = *YYCURSOR;
-		if (yych == '"') goto yy133;
-		if (yych == '\\') goto yy134;
+		if (yych == '"') goto yy172;
+		if (yych == '\\') goto yy174;
 		++YYCURSOR;
 		{ PHP_JSON_CONDITION_GOTO(STR_P2_UTF); }
-yy133:
+yy172:
 		++YYCURSOR;
 		YYSETCONDITION(yycJS);
 		{
 		PHP_JSON_SCANNER_COPY_ESC();
 		return PHP_JSON_T_STRING;
 	}
-yy134:
+yy174:
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'u') goto yy136;
-yy135:
+		if (yych == 'u') goto yy176;
+yy175:
 		{
 		char esc;
 		PHP_JSON_SCANNER_COPY_ESC();
@@ -1408,170 +1410,170 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy136:
+yy176:
 		yych = *++YYCURSOR;
 		if (yych <= 'D') {
 			if (yych <= '9') {
-				if (yych <= '/') goto yy137;
-				if (yych <= '0') goto yy138;
-				goto yy139;
+				if (yych <= '/') goto yy177;
+				if (yych <= '0') goto yy178;
+				goto yy179;
 			} else {
-				if (yych <= '@') goto yy137;
-				if (yych <= 'C') goto yy139;
-				goto yy140;
+				if (yych <= '@') goto yy177;
+				if (yych <= 'C') goto yy179;
+				goto yy180;
 			}
 		} else {
 			if (yych <= 'c') {
-				if (yych <= 'F') goto yy139;
-				if (yych >= 'a') goto yy139;
+				if (yych <= 'F') goto yy179;
+				if (yych >= 'a') goto yy179;
 			} else {
-				if (yych <= 'd') goto yy140;
-				if (yych <= 'f') goto yy139;
+				if (yych <= 'd') goto yy180;
+				if (yych <= 'f') goto yy179;
 			}
 		}
-yy137:
+yy177:
 		YYCURSOR = YYMARKER;
-		goto yy135;
-yy138:
+		goto yy175;
+yy178:
 		yych = *++YYCURSOR;
 		if (yych <= '9') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '0') goto yy141;
-			if (yych <= '7') goto yy142;
-			goto yy143;
+			if (yych <= '/') goto yy177;
+			if (yych <= '0') goto yy181;
+			if (yych <= '7') goto yy182;
+			goto yy183;
 		} else {
 			if (yych <= 'F') {
-				if (yych <= '@') goto yy137;
-				goto yy143;
+				if (yych <= '@') goto yy177;
+				goto yy183;
 			} else {
-				if (yych <= '`') goto yy137;
-				if (yych <= 'f') goto yy143;
-				goto yy137;
+				if (yych <= '`') goto yy177;
+				if (yych <= 'f') goto yy183;
+				goto yy177;
 			}
 		}
-yy139:
+yy179:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy143;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy183;
+			goto yy177;
 		} else {
-			if (yych <= 'F') goto yy143;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy143;
-			goto yy137;
+			if (yych <= 'F') goto yy183;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy183;
+			goto yy177;
 		}
-yy140:
+yy180:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '7') goto yy143;
-			if (yych <= '9') goto yy144;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '7') goto yy183;
+			if (yych <= '9') goto yy184;
+			goto yy177;
 		} else {
-			if (yych <= 'B') goto yy144;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'b') goto yy144;
-			goto yy137;
+			if (yych <= 'B') goto yy184;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'b') goto yy184;
+			goto yy177;
 		}
-yy141:
+yy181:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '7') goto yy145;
-			if (yych <= '9') goto yy146;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '7') goto yy185;
+			if (yych <= '9') goto yy186;
+			goto yy177;
 		} else {
-			if (yych <= 'F') goto yy146;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy146;
-			goto yy137;
+			if (yych <= 'F') goto yy186;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy186;
+			goto yy177;
 		}
-yy142:
+yy182:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy146;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy186;
+			goto yy177;
 		} else {
-			if (yych <= 'F') goto yy146;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy146;
-			goto yy137;
+			if (yych <= 'F') goto yy186;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy186;
+			goto yy177;
 		}
-yy143:
+yy183:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy147;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy187;
+			goto yy177;
 		} else {
-			if (yych <= 'F') goto yy147;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy147;
-			goto yy137;
+			if (yych <= 'F') goto yy187;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy187;
+			goto yy177;
 		}
-yy144:
+yy184:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy148;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy188;
+			goto yy177;
 		} else {
-			if (yych <= 'F') goto yy148;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy148;
-			goto yy137;
+			if (yych <= 'F') goto yy188;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy188;
+			goto yy177;
 		}
-yy145:
+yy185:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy149;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy189;
+			goto yy177;
 		} else {
-			if (yych <= 'F') goto yy149;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy149;
-			goto yy137;
+			if (yych <= 'F') goto yy189;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy189;
+			goto yy177;
 		}
-yy146:
+yy186:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy150;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy191;
+			goto yy177;
 		} else {
-			if (yych <= 'F') goto yy150;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy150;
-			goto yy137;
+			if (yych <= 'F') goto yy191;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy191;
+			goto yy177;
 		}
-yy147:
+yy187:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy151;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy193;
+			goto yy177;
 		} else {
-			if (yych <= 'F') goto yy151;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy151;
-			goto yy137;
+			if (yych <= 'F') goto yy193;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy193;
+			goto yy177;
 		}
-yy148:
+yy188:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy152;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy195;
+			goto yy177;
 		} else {
-			if (yych <= 'F') goto yy152;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy152;
-			goto yy137;
+			if (yych <= 'F') goto yy195;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy195;
+			goto yy177;
 		}
-yy149:
+yy189:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 2);
@@ -1580,7 +1582,7 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy150:
+yy191:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 3);
@@ -1590,7 +1592,7 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy151:
+yy193:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 4);
@@ -1601,41 +1603,41 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy152:
+yy195:
 		yych = *++YYCURSOR;
-		if (yych != '\\') goto yy137;
+		if (yych != '\\') goto yy177;
 		yych = *++YYCURSOR;
-		if (yych != 'u') goto yy137;
+		if (yych != 'u') goto yy177;
 		yych = *++YYCURSOR;
-		if (yych == 'D') goto yy153;
-		if (yych != 'd') goto yy137;
-yy153:
+		if (yych == 'D') goto yy198;
+		if (yych != 'd') goto yy177;
+yy198:
 		yych = *++YYCURSOR;
-		if (yych <= 'B') goto yy137;
-		if (yych <= 'F') goto yy154;
-		if (yych <= 'b') goto yy137;
-		if (yych >= 'g') goto yy137;
-yy154:
+		if (yych <= 'B') goto yy177;
+		if (yych <= 'F') goto yy199;
+		if (yych <= 'b') goto yy177;
+		if (yych >= 'g') goto yy177;
+yy199:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych >= ':') goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych >= ':') goto yy177;
 		} else {
-			if (yych <= 'F') goto yy155;
-			if (yych <= '`') goto yy137;
-			if (yych >= 'g') goto yy137;
+			if (yych <= 'F') goto yy200;
+			if (yych <= '`') goto yy177;
+			if (yych >= 'g') goto yy177;
 		}
-yy155:
+yy200:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych >= ':') goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych >= ':') goto yy177;
 		} else {
-			if (yych <= 'F') goto yy156;
-			if (yych <= '`') goto yy137;
-			if (yych >= 'g') goto yy137;
+			if (yych <= 'F') goto yy201;
+			if (yych <= '`') goto yy177;
+			if (yych >= 'g') goto yy177;
 		}
-yy156:
+yy201:
 		++YYCURSOR;
 		{
 		int utf32, utf16_hi, utf16_lo;

php-8.2.23.tar.xz/ext/json/php_json_scanner_defs.h -> php-8.2.28.tar.xz/ext/json/php_json_scanner_defs.h Changed

php-8.2.23.tar.xz/ext/ldap/ldap.c -> php-8.2.28.tar.xz/ext/ldap/ldap.c Changed

@@ -1429,6 +1429,11 @@
 			ret = 0;
 			goto cleanup;
 		}
+		if (!zend_array_is_list(Z_ARRVAL_P(link))) {
+			zend_argument_value_error(1, "must be a list");
+			ret = 0;
+			goto cleanup;
+		}
 
 		if (base_dn_ht) {
 			nbases = zend_hash_num_elements(base_dn_ht);
@@ -2145,17 +2150,11 @@
 			ldap_modsi->mod_type = estrndup(ZSTR_VAL(attribute), ZSTR_LEN(attribute));
 		} else {
 			php_error_docref(NULL, E_WARNING, "Unknown attribute in the data");
-			/* Free allocated memory */
-			while (i >= 0) {
-				if (ldap_modsi->mod_type) {
-					efree(ldap_modsi->mod_type);
-				}
-				efree(ldap_modsi);
-				i--;
-			}
-			efree(num_berval);
-			efree(ldap_mods);
-			RETURN_FALSE;
+			RETVAL_FALSE;
+			num_bervali = 0;
+			num_attribs = i + 1;
+			ldap_modsi->mod_bvalues = NULL;
+			goto cleanup;
 		}
 
 		value = zend_hash_get_current_data(Z_ARRVAL_P(entry));
@@ -2176,6 +2175,8 @@
 			convert_to_string(value);
 			if (EG(exception)) {
 				RETVAL_FALSE;
+				num_bervali = 0;
+				num_attribs = i + 1;
 				goto cleanup;
 			}
 			ldap_modsi->mod_bvalues0 = (struct berval *) emalloc (sizeof(struct berval));
@@ -2192,6 +2193,8 @@
 				}
 				convert_to_string(ivalue);
 				if (EG(exception)) {
+					num_bervali = j;
+					num_attribs = i + 1;
 					RETVAL_FALSE;
 					goto cleanup;
 				}
@@ -2544,8 +2547,11 @@
 			/* for the modification hashtable... */
 			zend_hash_internal_pointer_reset(Z_ARRVAL_P(mod));
 			num_modprops = zend_hash_num_elements(Z_ARRVAL_P(mod));
+			bool has_attrib_key = false;
+			bool has_modtype_key = false;
 
 			for (j = 0; j < num_modprops; j++) {
+
 				/* are the keys strings? */
 				if (zend_hash_get_current_key(Z_ARRVAL_P(mod), &modkey, &tmpUlong) != HASH_KEY_IS_STRING) {
 					zend_argument_type_error(3, "must only contain string-indexed arrays");
@@ -2567,6 +2573,7 @@
 
 				/* does the value type match the key? */
 				if (_ldap_str_equal_to_const(ZSTR_VAL(modkey), ZSTR_LEN(modkey), LDAP_MODIFY_BATCH_ATTRIB)) {
+					has_attrib_key = true;
 					if (Z_TYPE_P(modinfo) != IS_STRING) {
 						zend_type_error("%s(): Option \"" LDAP_MODIFY_BATCH_ATTRIB "\" must be of type string, %s given", get_active_function_name(), zend_zval_type_name(modinfo));
 						RETURN_THROWS();
@@ -2578,6 +2585,7 @@
 					}
 				}
 				else if (_ldap_str_equal_to_const(ZSTR_VAL(modkey), ZSTR_LEN(modkey), LDAP_MODIFY_BATCH_MODTYPE)) {
+					has_modtype_key = true;
 					if (Z_TYPE_P(modinfo) != IS_LONG) {
 						zend_type_error("%s(): Option \"" LDAP_MODIFY_BATCH_MODTYPE "\" must be of type int, %s given", get_active_function_name(), zend_zval_type_name(modinfo));
 						RETURN_THROWS();
@@ -2641,6 +2649,15 @@
 
 				zend_hash_move_forward(Z_ARRVAL_P(mod));
 			}
+
+			if (!has_attrib_key) {
+				zend_value_error("%s(): Required option \"" LDAP_MODIFY_BATCH_ATTRIB "\" is missing", get_active_function_name());
+				RETURN_THROWS();
+			}
+			if (!has_modtype_key) {
+				zend_value_error("%s(): Required option \"" LDAP_MODIFY_BATCH_MODTYPE "\" is missing", get_active_function_name());
+				RETURN_THROWS();
+			}
 		}
 	}
 	/* validation was successful */
@@ -3684,13 +3701,23 @@
 	zend_string *ret;
 
 	for (i = 0; i < valuelen; i++) {
-		len += (map(unsigned char) valuei) ? 3 : 1;
+		size_t addend = (map(unsigned char) valuei) ? 3 : 1;
+		if (len > ZSTR_MAX_LEN - addend) {
+			return NULL;
+		}
+		len += addend;
 	}
 	/* Per RFC 4514, a leading and trailing space must be escaped */
 	if ((flags & PHP_LDAP_ESCAPE_DN) && (value0 == ' ')) {
+		if (len > ZSTR_MAX_LEN - 2) {
+			return NULL;
+		}
 		len += 2;
 	}
 	if ((flags & PHP_LDAP_ESCAPE_DN) && ((valuelen > 1) && (valuevaluelen - 1 == ' '))) {
+		if (len > ZSTR_MAX_LEN - 2) {
+			return NULL;
+		}
 		len += 2;
 	}
 
@@ -3757,7 +3784,13 @@
 		php_ldap_escape_map_set_chars(map, ignores, ignoreslen, 0);
 	}
 
-	RETURN_NEW_STR(php_ldap_do_escape(map, value, valuelen, flags));
+	zend_string *result = php_ldap_do_escape(map, value, valuelen, flags);
+	if (UNEXPECTED(!result)) {
+		zend_argument_value_error(1, "is too long");
+		RETURN_THROWS();
+	}
+
+	RETURN_NEW_STR(result);
 }
 
 #ifdef STR_TRANSLATION

php-8.2.28.tar.xz/ext/ldap/tests/GHSA-g665-fm4p-vhff-1.phpt Added

php-8.2.28.tar.xz/ext/ldap/tests/GHSA-g665-fm4p-vhff-2.phpt Added

php-8.2.28.tar.xz/ext/ldap/tests/gh16032-1.phpt Added

php-8.2.28.tar.xz/ext/ldap/tests/gh16032-2.phpt Added

php-8.2.28.tar.xz/ext/ldap/tests/gh16101.phpt Added

php-8.2.28.tar.xz/ext/ldap/tests/gh16132-1.phpt Added

php-8.2.28.tar.xz/ext/ldap/tests/gh16132-2.phpt Added

php-8.2.28.tar.xz/ext/ldap/tests/gh16136.phpt Added

php-8.2.23.tar.xz/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt -> php-8.2.28.tar.xz/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt Changed

php-8.2.23.tar.xz/ext/ldap/tests/ldap_unbind_variation.phpt -> php-8.2.28.tar.xz/ext/ldap/tests/ldap_unbind_variation.phpt Changed

php-8.2.23.tar.xz/ext/libxml/libxml.c -> php-8.2.28.tar.xz/ext/libxml/libxml.c Changed

@@ -364,41 +364,52 @@
 		if (Z_TYPE(s->wrapperdata) == IS_ARRAY) {
 			zval *header;
 
-			ZEND_HASH_FOREACH_VAL_IND(Z_ARRVAL(s->wrapperdata), header) {
+			/* Scan backwards: The header array might contain the headers for multiple responses, if
+			 * a redirect was followed.
+			 */
+			ZEND_HASH_REVERSE_FOREACH_VAL_IND(Z_ARRVAL(s->wrapperdata), header) {
 				const char buf = "Content-Type:";
-				if (Z_TYPE_P(header) == IS_STRING &&
-						!zend_binary_strncasecmp(Z_STRVAL_P(header), Z_STRLEN_P(header), buf, sizeof(buf)-1, sizeof(buf)-1)) {
-					char needle = "charset=";
-					char *haystack = estrndup(Z_STRVAL_P(header), Z_STRLEN_P(header));
-					char *encoding = php_stristr(haystack, needle, Z_STRLEN_P(header), strlen(needle));
-
-					if (encoding) {
-						char *end;
-
-						encoding += sizeof("charset=")-1;
-						if (*encoding == '"') {
-							encoding++;
-						}
-						end = strchr(encoding, ';');
-						if (end == NULL) {
-							end = encoding + strlen(encoding);
-						}
-						end--; /* end == encoding-1 isn't a buffer underrun */
-						while (*end == ' ' || *end == '\t') {
-							end--;
-						}
-						if (*end == '"') {
-							end--;
-						}
-						if (encoding >= end) continue;
-						*(end+1) = '\0';
-						enc = xmlParseCharEncoding(encoding);
-						if (enc <= XML_CHAR_ENCODING_NONE) {
-							enc = XML_CHAR_ENCODING_NONE;
+				if (Z_TYPE_P(header) == IS_STRING) {
+					/* If no colon is found in the header, we assume it's the HTTP status line and bail out. */
+					char *colon = memchr(Z_STRVAL_P(header), ':', Z_STRLEN_P(header));
+					char *space = memchr(Z_STRVAL_P(header), ' ', Z_STRLEN_P(header));
+					if (colon == NULL || space < colon) {
+						break;
+					}
+
+					if (!zend_binary_strncasecmp(Z_STRVAL_P(header), Z_STRLEN_P(header), buf, sizeof(buf)-1, sizeof(buf)-1)) {
+						char needle = "charset=";
+						char *haystack = estrndup(Z_STRVAL_P(header), Z_STRLEN_P(header));
+						char *encoding = php_stristr(haystack, needle, Z_STRLEN_P(header), sizeof("charset=")-1);
+
+						if (encoding) {
+							char *end;
+
+							encoding += sizeof("charset=")-1;
+							if (*encoding == '"') {
+								encoding++;
+							}
+							end = strchr(encoding, ';');
+							if (end == NULL) {
+								end = encoding + strlen(encoding);
+							}
+							end--; /* end == encoding-1 isn't a buffer underrun */
+							while (*end == ' ' || *end == '\t') {
+								end--;
+							}
+							if (*end == '"') {
+								end--;
+							}
+							if (encoding >= end) continue;
+							*(end+1) = '\0';
+							enc = xmlParseCharEncoding(encoding);
+							if (enc <= XML_CHAR_ENCODING_NONE) {
+								enc = XML_CHAR_ENCODING_NONE;
+							}
 						}
+						efree(haystack);
+						break; /* found content-type */
 					}
-					efree(haystack);
-					break; /* found content-type */
 				}
 			} ZEND_HASH_FOREACH_END();
 		}

php-8.2.23.tar.xz/ext/libxml/tests/bug61367-read_2.phpt -> php-8.2.28.tar.xz/ext/libxml/tests/bug61367-read_2.phpt Changed

php-8.2.23.tar.xz/ext/libxml/tests/libxml_disable_entity_loader_2.phpt -> php-8.2.28.tar.xz/ext/libxml/tests/libxml_disable_entity_loader_2.phpt Changed

php-8.2.23.tar.xz/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt -> php-8.2.28.tar.xz/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt Changed

php-8.2.23.tar.xz/ext/mbstring/mbstring.c -> php-8.2.28.tar.xz/ext/mbstring/mbstring.c Changed

@@ -2172,6 +2172,16 @@
 		Z_PARAM_STR_OR_NULL(encoding)
 	ZEND_PARSE_PARAMETERS_END();
 
+	if (from == ZEND_LONG_MIN) {
+		zend_argument_value_error(2, "must be between " ZEND_LONG_FMT " and " ZEND_LONG_FMT, (ZEND_LONG_MIN + 1), ZEND_LONG_MAX);
+		RETURN_THROWS();
+	}
+
+	if (!len_is_null && len == ZEND_LONG_MIN) {
+		zend_argument_value_error(3, "must be between " ZEND_LONG_FMT " and " ZEND_LONG_FMT, (ZEND_LONG_MIN + 1), ZEND_LONG_MAX);
+		RETURN_THROWS();
+	}
+
 	string.encoding = php_mb_get_encoding(encoding, 4);
 	if (!string.encoding) {
 		RETURN_THROWS();
@@ -3289,7 +3299,7 @@
 		if (ret != NULL) {
 			zval_ptr_dtor(orig_var);
 			// TODO: avoid reallocation ???
-			ZVAL_STRINGL(orig_var, (char *)ret->val, ret->len);
+			ZVAL_STRINGL(orig_var, (const char *) ret->val, ret->len);
 			efree(ret->val);
 		}
 	} else if (Z_TYPE_P(var) == IS_ARRAY || Z_TYPE_P(var) == IS_OBJECT) {
@@ -3305,7 +3315,22 @@
 
 		ht = HASH_OF(var);
 		if (ht != NULL) {
-			ZEND_HASH_FOREACH_VAL_IND(ht, entry) {
+			ZEND_HASH_FOREACH_VAL(ht, entry) {
+				/* Can be a typed property declaration, in which case we need to remove the reference from the source list.
+				 * Just using ZEND_TRY_ASSIGN_STRINGL is not sufficient because that would not unwrap the reference
+				 * and change values through references (see bug #26639). */
+				if (Z_TYPE_P(entry) == IS_INDIRECT) {
+					ZEND_ASSERT(Z_TYPE_P(var) == IS_OBJECT);
+
+					entry = Z_INDIRECT_P(entry);
+					if (Z_ISREF_P(entry) && Z_TYPE_P(Z_REFVAL_P(entry)) == IS_STRING) {
+						zend_property_info *info = zend_get_typed_property_info_for_slot(Z_OBJ_P(var), entry);
+						if (info) {
+							ZEND_REF_DEL_TYPE_SOURCE(Z_REF_P(entry), info);
+						}
+					}
+				}
+
 				if (mb_recursive_convert_variable(convd, entry)) {
 					if (Z_REFCOUNTED_P(var)) {
 						Z_UNPROTECT_RECURSION_P(var);
@@ -4179,7 +4204,8 @@
 #define PHP_MBSTR_MAIL_MIME_HEADER2 "Content-Type: text/plain"
 #define PHP_MBSTR_MAIL_MIME_HEADER3 "; charset="
 #define PHP_MBSTR_MAIL_MIME_HEADER4 "Content-Transfer-Encoding: "
-	if (str_headers != NULL) {
+
+	if (str_headers != NULL && ZSTR_LEN(str_headers) > 0) {
 		p = ZSTR_VAL(str_headers);
 		n = ZSTR_LEN(str_headers);
 		mbfl_memory_device_strncat(&device, p, n);

php-8.2.28.tar.xz/ext/mbstring/tests/gh16229.phpt Added

php-8.2.28.tar.xz/ext/mbstring/tests/gh16261.phpt Added

php-8.2.28.tar.xz/ext/mbstring/tests/gh16360.phpt Added

php-8.2.23.tar.xz/ext/mysqli/tests/063.phpt -> php-8.2.28.tar.xz/ext/mysqli/tests/063.phpt Changed

php-8.2.23.tar.xz/ext/mysqli/tests/bug71863.phpt -> php-8.2.28.tar.xz/ext/mysqli/tests/bug71863.phpt Changed

php-8.2.23.tar.xz/ext/mysqli/tests/bug73462.phpt -> php-8.2.28.tar.xz/ext/mysqli/tests/bug73462.phpt Changed

php-8.2.28.tar.xz/ext/mysqli/tests/fake_server.inc Added

@@ -0,0 +1,872 @@
+<?php
+
+function my_mysqli_data_fields(): array
+{
+    return 
+        'intval' => 
+            'type' => '03',
+            'charset' => '3f00',
+            'length' => '0b000000',
+            'flags' => '0110',
+            'decimal' => '00',
+            'query_data_packet_length' => '080000',
+            'query_data_value' => '023134',
+            'stmt_data_packet_length' => '0b0000',
+            'stmt_data_value' => '0e000000'
+        ,
+        'fltval' => 
+            'type' => '04',
+            'charset' => '3f00',
+            'length' => '0c000000',
+            'flags' => '0110',
+            'decimal' => '1f',
+            'query_data_packet_length' => '090000',
+            'query_data_value' => '03322e33',
+            'stmt_data_packet_length' => '0b0000',
+            'stmt_data_value' => '33331340',
+        ,
+        'dblval' => 
+            'type' => '05',
+            'charset' => '3f00',
+            'length' => '16000000',
+            'flags' => '0110',
+            'decimal' => '1f',
+            'query_data_packet_length' => '090000',
+            'query_data_value' => '03312e32',
+            'stmt_data_packet_length' => '0f0000',
+            'stmt_data_value' => '333333333333f33f'
+        ,
+        'datval' => 
+            'type' => '0a',
+            'charset' => '3f00',
+            'length' => '0a000000',
+            'flags' => '8110',
+            'decimal' => '00',
+            'query_data_packet_length' => '100000',
+            'query_data_value' => '0a323031342d31322d3135',
+            'stmt_data_packet_length' => '0c0000',
+            'stmt_data_value' => '04de070c0f'
+        ,
+        'timval' => 
+            'type' => '0b',
+            'charset' => '3f00',
+            'length' => '0a000000',
+            'flags' => '8110',
+            'decimal' => '00',
+            'query_data_packet_length' => '0e0000',
+            'query_data_value' => '0831333a30303a3032',
+            'stmt_data_packet_length' => '100000',
+            'stmt_data_value' => '080000000000150801'
+        ,
+        'dtival' => 
+            'type' => '0c',
+            'charset' => '3f00',
+            'length' => '13000000',
+            'flags' => '8110',
+            'decimal' => '00',
+            'query_data_packet_length' => '190000',
+            'query_data_value' => '13323031342d31322d31362031333a30303a3031',
+            'stmt_data_packet_length' => '0f0000',
+            'stmt_data_value' => '07de070c100d0001'
+        ,
+        'bitval' => 
+            'type' => '10',
+            'charset' => '3f00',
+            'length' => '40000000',
+            'flags' => '2110',
+            'decimal' => '00',
+            'query_data_packet_length' => '0e0000',
+            'query_data_value' => '080808080808080808',
+            'stmt_data_packet_length' => '100000',
+            'stmt_data_value' => '080808080808080808'
+        ,
+        'strval' => 
+            'type' => 'fd',
+            'charset' => 'e000',
+            'length' => 'c8000000',
+            'flags' => '0110',
+            'decimal' => '00',
+            'query_data_packet_length' => '0a0000',
+            'query_data_value' => '0474657374',
+            'stmt_data_packet_length' => '0c0000',
+            'stmt_data_value' => '0474657374'
+        ,
+    ;
+}
+
+function my_mysqli_data_field(string $field): array
+{
+    $fields = my_mysqli_data_fields();
+    if (!isset($fields$field)) {
+        throw new Exception("Unknown field $field");
+    }
+    return $fields$field;
+}
+
+
+
+class my_mysqli_fake_packet_item
+{
+    public function __construct(public string|null $name, public string $value, public bool $is_hex = true)
+    {
+    }
+}
+
+class my_mysqli_fake_packet
+{
+    private array $data = array();
+
+    public function __get(string $name)
+    {
+        foreach ($this->data as $item) {
+            if ($item->name === $name) {
+                return $item->value;
+            }
+        }
+        return null;
+    }
+
+    public function __set(string $name, string|my_mysqli_fake_packet_item $value)
+    {
+        if ($value instanceof my_mysqli_fake_packet_item) {
+            if ($value->name === null) {
+                $value->name = $name;
+            }
+        } else {
+            $value = new my_mysqli_fake_packet_item($name, $value, true);
+        }
+
+        for ($i = 0; $i < count($this->data); $i++) {
+            if ($this->data$i->name === $name) {
+                $this->data$i = $value;
+                return;
+            }
+        }
+
+        $this->data = $value;
+    }
+
+    public function to_bytes(): string
+    {
+        $bytes = '';
+        foreach ($this->data as $item) {
+            $bytes .= $item->is_hex ? hex2bin($item->value) : $item->value;
+        }
+        return $bytes;
+    }
+}
+
+class my_mysqli_fake_packet_generator
+{
+    public static function create_packet_item(int|string $value, bool $is_hex = false, string $format = 'v'): my_mysqli_fake_packet_item
+    {
+        if (is_string($value)) {
+            $packed_value = $value;
+        } else {
+            $packed_value = pack($format, $value);
+        }
+        return new my_mysqli_fake_packet_item(null, $packed_value, $is_hex);
+    }
+
+    public function server_ok(): my_mysqli_fake_packet
+    {
+        $packet = new my_mysqli_fake_packet();
+        $packet->packet_length = "070000";
+        $packet->packet_number = "02";
+        $packet->header = "00"; // OK
+        $packet->affected_rows = "00";
+        $packet->last_insert_id = "00";
+        $packet->server_status = "0200";
+        $packet->warning_count = "0000";
+        return $packet;
+    }
+
+    public function server_greetings(): my_mysqli_fake_packet
+    {
+        $packet = new my_mysqli_fake_packet();
+        $packet->packet_length = "580000";
+        $packet->packet_number = "00";
+        $packet->proto_version = "0a";
+        $packet->version = self::create_packet_item('5.5.5-10.5.18-MariaDB' . chr(0));
+        $packet->thread_id = "03000000";
+        $packet->salt = "473e3f6047257c67";
+        $packet->filler = "00";
+        $packet->server_capabilities = self::create_packet_item(0b1111011111111110);
+        $packet->server_character_set = "08";
+        $packet->server_status = self::create_packet_item(0b000000000000010);
+        $packet->extended_server_capabilities = self::create_packet_item(0b1000000111111111);
+        $packet->auth_plugin = "15";
+        $packet->unused = "000000000000";
+        $packet->mariadb_extended_server_capabilities = self::create_packet_item(0b1111, false, 'V');
+        $packet->mariadb_extended_server_capabilities_salt = "6c6b55463f49335f686c643100";
+        $packet->mariadb_extended_server_capabilities_auth_plugin = self::create_packet_item('mysql_native_password');
+
+        return $packet;
+    }
+
+    public function server_tabular_query_response(): array
+    {
+        $qr1 = new my_mysqli_fake_packet();
+        $qr1->packet_length = "010000";
+        $qr1->packet_number = "01";
+        $qr1->field_count = "01";
+
+        $qr2 = new my_mysqli_fake_packet();
+        $qr2->packet_length = "190000";
+        $qr2->packet_number = "02";
+        $qr2->catalog_length_plus_name = "0164";
+        $qr2->db_length_plus_name = "0164";
+        $qr2->table_length_plus_name = "0164";
+        $qr2->original_t = "0164";
+        $qr2->name_length_plus_name = "0164";
+        $qr2->original_n = "0164";
+        $qr2->canary = "0c";
+        $qr2->charset = "3f00";
+        $qr2->length = "0b000000";
+        $qr2->type = "03";
+        $qr2->flags = "0350";
+        $qr2->decimals = "000000";
+
+        $qr3 = new my_mysqli_fake_packet();
+        $qr3->full = "05000003fe00002200";
+
+        $qr4 = new my_mysqli_fake_packet();
+        $qr4->full = "0400000401350174";
+
+        $qr5 = new my_mysqli_fake_packet();
+        $qr5->full = "05000005fe00002200";
+
+        return $qr1, $qr2, $qr3, $qr4, $qr5;
+    }
+
+    public function server_upsert_query_response(): array
+    {
+        $qr1 = new my_mysqli_fake_packet();
+        $qr1->packet_length = "010000";
+        $qr1->packet_number = "01";
+        $qr1->field_count = "00"; // UPSERT
+        $qr1->affected_rows = "00";
+        $qr1->affected_rows = "00";
+        $qr1->last_insert_id = "00";
+        $qr1->server_status = "0000";
+        $qr1->warning_count = "0000";
+        $qr1->len = "01";
+        $qr1->filename = "65";
+        $qr1->packet_length = sprintf("%02x0000", strlen($qr1->to_bytes())-4);
+
+        return $qr1;
+    }
+
+    public function server_stmt_prepare_response_start($num_field): my_mysqli_fake_packet
+    {
+        $pr1 = new my_mysqli_fake_packet();
+        $pr1->packet_length = "0c0000";
+        $pr1->packet_number = "01";
+        $pr1->response_code = '00'; // OK
+        $pr1->statement_id = '01000000';
+        $pr1->num_fields = $num_field;
+        $pr1->num_params = '0000';
+        $pr1->filler = '00';
+        $pr1->warnings = '0000';
+
+        return $pr1;
+    }
+
+    public function server_stmt_prepare_response_end($packer_number): my_mysqli_fake_packet
+    {
+        $pr3 = new my_mysqli_fake_packet();
+        $pr3->packet_length = "050000";
+        $pr3->packet_number = $packer_number;
+        $pr3->packet_type = 'fe'; // EOF
+        $pr3->warnings = '0000';
+        $pr3->server_status = '0200';
+
+        return $pr3;
+    }
+
+    public function server_stmt_prepare_items_response(): array
+    {
+        $pr1 = $this->server_stmt_prepare_response_start('0100');
+
+        $pr2 = new my_mysqli_fake_packet();
+        $pr2->packet_length = "300000";
+        $pr2->packet_number = "02";
+        $pr2->catalogue_len = '03';
+        $pr2->catalogue = '646566'; // def
+        $pr2->db_len = '08';
+        $pr2->db = '7068705f74657374'; // php_test
+        $pr2->table_len = '05';
+        $pr2->table = '6974656d73'; // items
+        $pr2->orig_table_len = '05';
+        $pr2->orig_table = '6974656d73'; // items
+        $pr2->name_len = '04';
+        $pr2->name = '6974656d';
+        $pr2->orig_name_len = '04';
+        $pr2->orig_name = '6974656d';
+        $pr2->something = '0c';
+        $pr2->charset = 'e000';
+        $pr2->length = 'c8000000';
+        $pr2->field_type = 'fd'; // FIELD_TYPE_VAR_STRING
+        $pr2->flags = '0110';
+        $pr2->decimal = '00';
+        $pr2->padding = '0000';
+
+        $pr3 = $this->server_stmt_prepare_response_end('03');
+
+        return $pr1, $pr2, $pr3;
+    }
+
+    public function server_stmt_prepare_data_response_field($packet_number, $field_name): my_mysqli_fake_packet
+    {
+        if (strlen($field_name) != 6) {
+            throw new Exception("Invalid field length - only 6 is allowed");
+        }
+
+        $field = my_mysqli_data_field($field_name);
+
+        $pr = new my_mysqli_fake_packet();
+        $pr->packet_length = "320000";
+        $pr->packet_number = $packet_number;
+        $pr->catalogue_len = '03';
+        $pr->catalogue = bin2hex('def');
+        $pr->db_len = '08';
+        $pr->db = bin2hex('php_test');
+        $pr->table_len = '04';
+        $pr->table = bin2hex('data');
+        $pr->orig_table_len = '04';
+        $pr->orig_table = bin2hex('data');
+        $pr->name_len = '06';
+        $pr->name = bin2hex($field_name);
+        $pr->orig_name_len = '06';
+        $pr->orig_name =  bin2hex($field_name);
+        $pr->something = '0c';
+        $pr->charset = $field'charset';
+        $pr->length = $field'length';
+        $pr->field_type = $field'type';
+        $pr->flags = $field'flags';
+        $pr->decimal = $field'decimal';
+        $pr->padding = '0000';
+
+        return $pr;
+    }
+
+    public function server_stmt_prepare_data_response(string $field_name): array
+    {
+        $pr1 = $this->server_stmt_prepare_response_start('0200');
+
+        $pr2 = $this->server_stmt_prepare_data_response_field('02', 'strval');
+        $pr3 = $this->server_stmt_prepare_data_response_field('03', $field_name);
+
+        $pr4 = $this->server_stmt_prepare_response_end('04');
+
+        return $pr1, $pr2, $pr3, $pr4;
+    }
+
+    public function server_stmt_execute_items_response(): array
+    {
+        $pr1 = new my_mysqli_fake_packet();
+        $pr1->packet_length = "010000";
+        $pr1->packet_number = "01";
+        $pr1->num_fields = '01';
+
+        $pr2 = new my_mysqli_fake_packet();
+        $pr2->packet_length = "300000";
+        $pr2->packet_number = "02";
+        $pr2->catalogue_len = '03';
+        $pr2->catalogue = '646566'; // def
+        $pr2->db_len = '08';
+        $pr2->db = '7068705f74657374'; // php_test
+        $pr2->table_len = '05';
+        $pr2->table = '6974656d73'; // items
+        $pr2->orig_table_len = '05';
+        $pr2->orig_table = '6974656d73'; // items
+        $pr2->name_len = '04';
+        $pr2->name = '6974656d';
+        $pr2->orig_name_len = '04';
+        $pr2->orig_name = '6974656d';
+        $pr2->something = '0c';
+        $pr2->charset = 'e000';
+        $pr2->length = 'c8000000';
+        $pr2->field_type = 'fd'; // FIELD_TYPE_VAR_STRING
+        $pr2->flags = '0110';
+        $pr2->decimal = '00';
+        $pr2->padding = '0000';
+
+        $pr3 = new my_mysqli_fake_packet();
+        $pr3->packet_length = "050000";
+        $pr3->packet_number = "03";
+        $pr3->packet_type = 'fe'; // EOF
+        $pr3->warnings = '0000';
+        $pr3->server_status = '2200';
+
+        $pr4 = new my_mysqli_fake_packet();
+        $pr4->packet_length = "070000";
+        $pr4->packet_number = "04";
+        $pr4->packet_type = '00'; // OK
+        $pr4->affected_rows = '00';
+        $pr4->row_data_len = '04';
+        $pr4->row_data = '74657374'; // item
+
+        $pr5 = new my_mysqli_fake_packet();
+        $pr5->full = '05000005fe00002200';
+
+        return $pr1, $pr2, $pr3, $pr4, $pr5;
+    }
+
+    private function server_execute_data_response_start(string $field_name): array
+    {
+        $pr1 = new my_mysqli_fake_packet();
+        $pr1->packet_length = "010000";
+        $pr1->packet_number = "01";
+        $pr1->num_fields = '02';
+
+        $pr2 = new my_mysqli_fake_packet();
+        $pr2->packet_length = "320000";
+        $pr2->packet_number = "02";
+        $pr2->catalogue_len = '03';
+        $pr2->catalogue = '646566'; // def
+        $pr2->db_len = '08';
+        $pr2->db = '7068705f74657374'; // php_test
+        $pr2->table_len = '04';
+        $pr2->table = bin2hex('data');
+        $pr2->orig_table_len = '04';
+        $pr2->orig_table = bin2hex('data');
+        $pr2->name_len = '06';
+        $pr2->name = bin2hex('strval');
+        $pr2->orig_name_len = '06';
+        $pr2->orig_name =  bin2hex('strval');
+        $pr2->something = '0c';
+        $pr2->charset = 'e000';
+        $pr2->length = 'c8000000';
+        $pr2->field_type = 'fd'; // FIELD_TYPE_VAR_STRING
+        $pr2->flags = '0110';
+        $pr2->decimal = '00';
+        $pr2->padding = '0000';
+
+        $field = my_mysqli_data_field($field_name);
+
+        $pr3 = new my_mysqli_fake_packet();
+        $pr3->packet_length = "320000";
+        $pr3->packet_number = "03";
+        $pr3->catalogue_len = '03';
+        $pr3->catalogue = '646566'; // def
+        $pr3->db_len = '08';
+        $pr3->db = '7068705f74657374'; // php_test
+        $pr3->table_len = '04';
+        $pr3->table = bin2hex('data');
+        $pr3->orig_table_len = '04';
+        $pr3->orig_table = bin2hex('data');
+        $pr3->name_len = '06';
+        $pr3->name = bin2hex($field_name);
+        $pr3->orig_name_len = '06';
+        $pr3->orig_name =  bin2hex($field_name);
+        $pr3->something = '0c';
+        $pr3->charset = $field'charset';
+        $pr3->length = $field'length';
+        $pr3->field_type = $field'type';
+        $pr3->flags = $field'flags';
+        $pr3->decimal = $field'decimal';
+        $pr3->padding = '0000';
+
+        $pr4 = new my_mysqli_fake_packet();
+        $pr4->packet_length = "050000";
+        $pr4->packet_number = "04";
+        $pr4->packet_type = 'fe'; // EOF
+        $pr4->warnings = '0000';
+        $pr4->server_status = '2200';
+
+        return $field, $pr1, $pr2, $pr3, $pr4;
+    }
+
+    private function server_execute_data_response_end(): my_mysqli_fake_packet
+    {
+        $pr6 = new my_mysqli_fake_packet();
+        $pr6->packet_length = '050000';
+        $pr6->packet_number = "06";
+        $pr6->packet_type = 'fe'; // EOF
+        $pr6->warnings = '0000';
+        $pr6->server_status = '2200';
+
+        return $pr6;
+    }
+
+    public function server_stmt_execute_data_response(string $field_name): array
+    {
+        $field, $pr1, $pr2, $pr3, $pr4 = $this->server_execute_data_response_start($field_name);
+
+        $pr5 = new my_mysqli_fake_packet();
+        $pr5->packet_length = $field'stmt_data_packet_length';
+        $pr5->packet_number = "05";
+        $pr5->packet_type = '00'; // OK
+        $pr5->affected_rows = '00';
+        $pr5->row_field1_len = '04';
+        $pr5->row_field1_data = '74657374'; // test
+        $pr5->row_field2 = $field'stmt_data_value';
+
+        return $pr1, $pr2, $pr3, $pr4, $pr5, $this->server_execute_data_response_end();
+    }
+
+    public function server_query_execute_data_response(string $field_name): array
+    {
+        $field, $pr1, $pr2, $pr3, $pr4 = $this->server_execute_data_response_start($field_name);
+
+        $pr5 = new my_mysqli_fake_packet();
+        $pr5->packet_length = $field'query_data_packet_length';
+        $pr5->packet_number = "05";
+        $pr5->row_field1_len = '04';
+        $pr5->row_field1_data = '74657374'; // test
+        $pr5->row_field2 = $field'query_data_value';
+
+        return $pr1, $pr2, $pr3, $pr4, $pr5, $this->server_execute_data_response_end();
+    }
+}
+
+class my_mysqli_fake_server_conn
+{
+    private $conn;
+    public $packet_generator;
+
+    public function __construct($socket)
+    {
+        $this->packet_generator = new my_mysqli_fake_packet_generator();
+        $this->conn = stream_socket_accept($socket);
+        if ($this->conn) {
+            fprintf(STDERR, "* Connection established\n");
+        } else {
+            fprintf(STDERR, "* Failed to establish connection\n");
+        }
+    }
+
+    public function packets_to_bytes(array $packets): string
+    {
+        return implode('', array_map(fn($s) => $s->to_bytes(), $packets));
+    }
+
+    public function send($payload, $message = null): void
+    {
+        if ($message) {
+            fprintf(STDERR, "* Sending - %s: %s\n", $message, bin2hex($payload));
+        }
+        fwrite($this->conn, $payload);
+    }
+
+    public function read($bytes_len = 1024)
+    {
+        // wait 20ms to fill the buffer
+        usleep(20000);
+        $data = fread($this->conn, $bytes_len);
+        if ($data) {
+            fprintf(STDERR, "* Received: %s\n", bin2hex($data));
+        }
+    }
+
+    public function close()
+    {
+        fclose($this->conn);
+    }
+
+    public function send_server_greetings()
+    {
+        $this->send($this->packet_generator->server_greetings()->to_bytes(), "Server Greeting");
+    }
+
+    public function send_server_ok()
+    {
+        $this->send($this->packet_generator->server_ok()->to_bytes(), "Server OK");
+    }
+
+    public function send_server_tabular_query_response(): void
+    {
+        $packets = $this->packet_generator->server_tabular_query_response();
+        $this->send($this->packets_to_bytes($packets), "Tabular response");
+    }
+
+    public function send_server_stmt_prepare_items_response(): void
+    {
+        $packets = $this->packet_generator->server_stmt_prepare_items_response();
+        $this->send($this->packets_to_bytes($packets), "Stmt prepare items");
+    }
+
+
+    public function send_server_stmt_prepare_data_response(string $field_name): void
+    {
+        $packets = $this->packet_generator->server_stmt_prepare_data_response($field_name);
+        $this->send($this->packets_to_bytes($packets), "Stmt prepare data $field_name");
+    }
+
+    public function send_server_stmt_execute_items_response(): void
+    {
+        $packets = $this->packet_generator->server_stmt_execute_items_response();
+        $this->send($this->packets_to_bytes($packets), "Stmt execute items");
+    }
+
+    public function send_server_stmt_execute_data_response(string $field_name): void
+    {
+        $packets = $this->packet_generator->server_stmt_execute_data_response($field_name);
+        $this->send($this->packets_to_bytes($packets), "Stmt execute data $field_name");
+    }
+
+    public function send_server_query_execute_data_response(string $field_name): void
+    {
+        $packets = $this->packet_generator->server_query_execute_data_response($field_name);
+        $this->send($this->packets_to_bytes($packets), "Query execute data $field_name");
+    }
+}
+
+class my_mysqli_fake_server_process
+{
+    private int $port;
+
+    public function __construct(private $process, private array $pipes) {}
+
+    public function terminate(bool $wait = false): void
+    {
+        if ($wait) {
+            $this->wait();
+        }
+        proc_terminate($this->process);
+    }
+
+    public function wait(): void
+    {
+        $line = fgets($this->pipes1);
+        if (preg_match('/\\*\ Server started on \d+\.\d+\.\d+\.\d+:(\d+)/', $line, $matches)) {
+            $this->port = (int)$matches1;
+        }
+        echo $line;
+    }
+
+    public function getPort(): int
+    {
+        return $this->port ?? throw new RuntimeException("Port not set");
+    }
+}
+
+function my_mysqli_test_tabular_response_def_over_read(my_mysqli_fake_server_conn $conn): void
+{
+    $rh = $conn->packet_generator->server_tabular_query_response();
+
+    // Length of the packet is modified to include the next added data
+    $rh1->packet_length = "1e0000";
+
+    // We add a length field encoded on 4 bytes which evaluates to 65536. If the process crashes because
+    // the heap has been overread, lower this value.
+    $rh1->extra_def_size = "fd000001";  # 65536
+
+    // Filler
+    $rh1->extra_def_data = "aa";
+
+    $trrh = $conn->packets_to_bytes($rh);
+
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send_server_ok();
+    $conn->read();
+    $conn->send($trrh, "Malicious Tabular Response Extract heap through buffer over-read");
+    $conn->read(65536);
+}
+
+function my_mysqli_test_upsert_response_filename_over_read(my_mysqli_fake_server_conn $conn): void
+{
+    $rh = $conn->packet_generator->server_upsert_query_response();
+
+    // Set extra length to overread
+    $rh0->len = "fa";
+
+    $trrh = $conn->packets_to_bytes($rh);
+
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send_server_ok();
+    $conn->read();
+    $conn->send($trrh, "Malicious Tabular Response Extract heap through buffer over-read");
+    $conn->read(65536);
+}
+
+function my_mysqli_test_auth_response_message_over_read(my_mysqli_fake_server_conn $conn): void
+{
+    $p = $conn->packet_generator->server_ok();
+    $p->packet_length = "090000";
+    $p->message_len = "fcff";
+
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send($p->to_bytes(), "Malicious OK Auth Response Extract heap through buffer over-read");
+    $conn->read();
+}
+
+function my_mysqli_test_stmt_response_row_over_read_string(my_mysqli_fake_server_conn $conn): void
+{
+    $rh = $conn->packet_generator->server_stmt_execute_items_response();
+
+    // Set extra length to overread
+    $rh3->row_data_len = "fa";
+
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send_server_ok();
+    $conn->read();
+    $conn->send_server_stmt_prepare_items_response();
+    $conn->read();
+    $conn->send($conn->packets_to_bytes($rh), "Malicious Stmt Response for items Extract heap through buffer over-read");
+    $conn->read(65536);
+}
+
+function my_mysqli_test_stmt_response_row_over_read_two_fields(
+    my_mysqli_fake_server_conn $conn,
+    string $field_name,
+    string $row_field1_len = '06'
+): void {
+    $rh = $conn->packet_generator->server_stmt_execute_data_response($field_name);
+
+    // Set extra length to overread by two bytes
+    $rh4->row_field1_len = $row_field1_len;
+
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send_server_ok();
+    $conn->read();
+    $conn->send_server_stmt_prepare_data_response($field_name);
+    $conn->read();
+    $conn->send(
+        $conn->packets_to_bytes($rh),
+        "Malicious Stmt Response for data $field_name Extract heap through buffer over-read"
+    );
+    $conn->read(65536);
+}
+
+function my_mysqli_test_stmt_response_row_over_read_int(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'intval');
+}
+
+function my_mysqli_test_stmt_response_row_over_read_float(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'fltval');
+}
+
+function my_mysqli_test_stmt_response_row_over_read_double(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'dblval');
+}
+
+function my_mysqli_test_stmt_response_row_over_read_date(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'datval');
+}
+
+function my_mysqli_test_stmt_response_row_over_read_time(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'timval', '0c');
+}
+
+function my_mysqli_test_stmt_response_row_over_read_datetime(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'dtival');
+}
+
+function my_mysqli_test_stmt_response_row_no_space(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'strval', '09');
+}
+
+function my_mysqli_test_stmt_response_row_over_read_bit(my_mysqli_fake_server_conn $conn): void
+{
+    my_mysqli_test_stmt_response_row_over_read_two_fields($conn, 'bitval');
+}
+
+function my_mysqli_test_stmt_response_row_read_two_fields(my_mysqli_fake_server_conn $conn): void
+{
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send_server_ok();
+    $conn->read();
+    $field_names = array_keys(my_mysqli_data_fields());
+    foreach ($field_names as $field_name) {
+        $conn->send_server_stmt_prepare_data_response($field_name);
+        $conn->read(65536);
+        $conn->send_server_stmt_execute_data_response($field_name);
+        $conn->read(65536);
+    }
+}
+
+function my_mysqli_test_query_response_row_length_overflow(my_mysqli_fake_server_conn $conn): void
+{
+    $rh = $conn->packet_generator->server_query_execute_data_response('strval');
+
+    // Set extra length to overread by two bytes
+    $rh4->row_field2 = 'fefefefefe';
+
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send_server_ok();
+    $conn->read();
+    $conn->send($conn->packets_to_bytes($rh), "Malicious Query Response for data strval field length overflow");
+    $conn->read(65536);
+}
+
+function my_mysqli_test_query_response_row_read_two_fields(my_mysqli_fake_server_conn $conn): void
+{
+    $conn->send_server_greetings();
+    $conn->read();
+    $conn->send_server_ok();
+    $conn->read();
+    $field_names = array_keys(my_mysqli_data_fields());
+    foreach ($field_names as $field_name) {
+        $conn->send_server_query_execute_data_response($field_name);
+        $conn->read();
+    }
+}
+
+function run_fake_server(string $test_function, int|string $port = 0): int
+{
+    $host = '127.0.0.1';
+
+    $socket = @stream_socket_server("tcp://$host:$port", $errno, $errstr);
+    if (!$socket) {
+        die("Failed to create socket: $errstr ($errno)\n");
+    }
+    if (intval($port) === 0) {
+        $address = stream_socket_get_name($socket, false);
+        list($host, $port) = explode(":", $address);
+    }
+
+    echo "* Server started on $host:$port\n";
+
+    try {
+        $conn = new my_mysqli_fake_server_conn($socket);
+        $test_function_name = 'my_mysqli_test_' . $test_function;
+        call_user_func($test_function_name, $conn);
+        $conn->close();
+    } catch (Exception $e) {
+        fprintf(STDERR, "! Exception: " . $e->getMessage() . "\n");
+    }
+
+    fclose($socket);
+
+    echo "* Server finished\n";
+}
+
+
+function run_fake_server_in_background($test_function, $port = 0): my_mysqli_fake_server_process
+{
+    $command = PHP_BINARY, '-n', __FILE__, 'mysqli_fake_server', $test_function, $port;
+
+    $descriptorspec = array(
+        0 => array("pipe", "r"),
+        1 => array("pipe", "w"),
+        2 => STDERR,
+    );
+
+    $process = proc_open($command, $descriptorspec, $pipes);
+
+    if (is_resource($process)) {
+        return new my_mysqli_fake_server_process($process, $pipes);
+    } else {
+        throw new Exception("Failed to start server process");
+    }
+}
+
+if (isset($argv) && $argc > 2 && $argv1 == 'mysqli_fake_server') {
+    run_fake_server($argv2, $argv3 ?? 0);
+}

php-8.2.28.tar.xz/ext/mysqli/tests/gh15432.phpt Added

php-8.2.28.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-auth-message.phpt Added

@@ -0,0 +1,37 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - auth message buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('auth_response_message_over_read');
+$process->wait();
+
+try {
+    $conn = new mysqli( $servername, $username, $password, "", $process->getPort());
+    $info = mysqli_info($conn);
+    var_dump($info);
+} catch (Exception $e) {
+    echo $e->getMessage() . PHP_EOL;
+}
+
+$process->terminate();
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Malicious OK Auth Response Extract heap through buffer over-read: 0900000200000002000000fcff
+
+Warning: mysqli::__construct(): OK packet message length is past the packet size in %s on line %d
+Unknown error while trying to connect via tcp://127.0.0.1:%d
+done!

php-8.2.28.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-def.phpt Added

@@ -0,0 +1,45 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - tabular default)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('tabular_response_def_over_read');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Running query on the fake server...\n";
+
+$result = $conn->query("SELECT * from users");
+
+if ($result) {
+    $all_fields = $result->fetch_fields();
+    var_dump($result->fetch_all(MYSQLI_ASSOC));
+    var_dump(get_object_vars($all_fields0)"def");
+}
+
+$conn->close();
+
+$process->terminate();
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Running query on the fake server...
+* Received: 140000000353454c454354202a2066726f6d207573657273
+* Sending - Malicious Tabular Response Extract heap through buffer over-read: 01000001011e0000020164016401640164016401640c3f000b000000030350000000fd000001aa05000003fe00002200040000040135017405000005fe00002200
+
+Warning: mysqli::query(): Protocol error. Server sent default for unsupported field list (mysqlnd_wireprotocol.c:%d) in %s on line %d
+done!

php-8.2.28.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-filename.phpt Added

@@ -0,0 +1,42 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - upsert filename buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('upsert_response_filename_over_read');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+echo "* Running query on the fake server...\n";
+
+$result = $conn->query("SELECT * from users");
+$info = mysqli_info($conn);
+
+var_dump($info);
+
+$process->terminate();
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Running query on the fake server...
+* Received: 140000000353454c454354202a2066726f6d207573657273
+* Sending - Malicious Tabular Response Extract heap through buffer over-read: 0900000100000000000000fa65
+
+Warning: mysqli::query(): RSET_HEADER packet additional data length is past 249 bytes the packet size in %s on line %d
+
+Warning: mysqli::query(): Error reading result set's header in %s on line %d
+NULL
+done!

php-8.2.28.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-query-len-overflow.phpt Added

@@ -0,0 +1,47 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row no space for the field)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('query_response_row_length_overflow');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Query the fake server...\n";
+$sql = "SELECT strval, strval FROM data";
+
+$result = $conn->query($sql);
+
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row'strval');
+    }
+}
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Query the fake server...
+* Received: 200000000353454c4543542073747276616c2c2073747276616c2046524f4d2064617461
+* Sending - Malicious Query Response for data strval field length overflow: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd011000000005000004fe000022000a0000050474657374fefefefefe05000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after end of packet in %s on line %d
+* Received: 0100000001
+* Server finished
+done!

php-8.2.28.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-bit.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row bit buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_bit');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT bitval, timval FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"bitval");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542062697476616c2c2074696d76616c2046524f4d2064617461
+* Sending - Stmt prepare data bitval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610662697476616c0662697476616c0c3f004000000010211000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data bitval Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610662697476616c0662697476616c0c3f004000000010211000000005000004fe00002200100000050000067465737408080808080808080805000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.2.28.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-date.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row date buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_date');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT strval, datval FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"datval");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542073747276616c2c2064617476616c2046524f4d2064617461
+* Sending - Stmt prepare data datval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664617476616c0664617476616c0c3f000a0000000a811000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data datval Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664617476616c0664617476616c0c3f000a0000000a811000000005000004fe000022000c0000050000067465737404de070c0f05000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.2.28.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-datetime.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row datetime buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_datetime');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT strval, dtival FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"dtival");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542073747276616c2c2064746976616c2046524f4d2064617461
+* Sending - Stmt prepare data dtival: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664746976616c0664746976616c0c3f00130000000c811000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data dtival Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664746976616c0664746976616c0c3f00130000000c811000000005000004fe000022000f0000050000067465737407de070c100d000105000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.2.28.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-double.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row double buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_double');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT strval, dblval FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"dblval");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542073747276616c2c2064626c76616c2046524f4d2064617461
+* Sending - Stmt prepare data dblval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664626c76616c0664626c76616c0c3f00160000000501101f000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data dblval Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664626c76616c0664626c76616c0c3f00160000000501101f000005000004fe000022000f00000500000674657374333333333333f33f05000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.2.28.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-float.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row int buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_float');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT strval, fltval FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"fltval");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542073747276616c2c20666c7476616c2046524f4d2064617461
+* Sending - Stmt prepare data fltval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106666c7476616c06666c7476616c0c3f000c0000000401101f000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data fltval Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106666c7476616c06666c7476616c0c3f000c0000000401101f000005000004fe000022000b000005000006746573743333134005000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.2.28.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-int.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row int buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_int');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT strval, intval FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"intval");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542073747276616c2c20696e7476616c2046524f4d2064617461
+* Sending - Stmt prepare data intval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106696e7476616c06696e7476616c0c3f000b00000003011000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data intval Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106696e7476616c06696e7476616c0c3f000b00000003011000000005000004fe000022000b000005000006746573740e00000005000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.2.28.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-no-space.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row no space for the field)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_no_space');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT strval, strval FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"strval");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542073747276616c2c2073747276616c2046524f4d2064617461
+* Sending - Stmt prepare data strval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd011000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data strval Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd011000000005000004fe000022000c00000500000974657374047465737405000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. No packet space left for the field in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.2.28.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-string.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row string buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_string');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT item FROM items");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"item");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 170000001653454c454354206974656d2046524f4d206974656d73
+* Sending - Stmt prepare items: 0c0000010001000000010000000000003000000203646566087068705f74657374056974656d73056974656d73046974656d046974656d0ce000c8000000fd011000000005000003fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for items Extract heap through buffer over-read: 01000001013000000203646566087068705f74657374056974656d73056974656d73046974656d046974656d0ce000c8000000fd011000000005000003fe00002200070000040000fa7465737405000005fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 05000000190100000%d
+* Server finished
+done!

php-8.2.28.tar.xz/ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-time.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GHSA-h35g-vwh6-m678 (mysqlnd leaks partial content of the heap - stmt row time buffer over-read)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_over_read_time');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+echo "* Preparing statement on the fake server...\n";
+$stmt = $conn->prepare("SELECT strval, timval FROM data");
+
+$stmt->execute();
+$result = $stmt->get_result();
+
+// Fetch and display the results
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        var_dump($row"timval");
+    }
+}
+$stmt->close();
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Preparing statement on the fake server...
+* Received: 200000001653454c4543542073747276616c2c2074696d76616c2046524f4d2064617461
+* Sending - Stmt prepare data timval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610674696d76616c0674696d76616c0c3f000a0000000b811000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Malicious Stmt Response for data timval Extract heap through buffer over-read: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610674696d76616c0674696d76616c0c3f000a0000000b811000000005000004fe000022001000000500000c7465737408000000000015080105000006fe00002200
+
+Warning: mysqli_result::fetch_assoc(): Malformed server packet. Field length pointing after the end of packet in %s on line %d
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.2.23.tar.xz/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt -> php-8.2.28.tar.xz/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt Changed

php-8.2.28.tar.xz/ext/mysqli/tests/protocol_query_row_fetch_data.phpt Added

@@ -0,0 +1,73 @@
+--TEST--
+MySQL protocol - statement row data fetch)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('query_response_row_read_two_fields');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+function my_query($conn, $field)
+{
+    $sql = "SELECT strval, $field FROM data";
+
+    $result = $conn->query($sql);
+
+    if ($result->num_rows > 0) {
+        while ($row = $result->fetch_assoc()) {
+            var_dump($row$field);
+        }
+    }
+}
+
+foreach (my_mysqli_data_fields() as $field_name => $field) {
+    my_query($conn, $field_name);
+}
+
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Received: 200000000353454c4543542073747276616c2c20696e7476616c2046524f4d2064617461
+* Sending - Query execute data intval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106696e7476616c06696e7476616c0c3f000b00000003011000000005000004fe0000220008000005047465737402313405000006fe00002200
+string(2) "14"
+* Received: 200000000353454c4543542073747276616c2c20666c7476616c2046524f4d2064617461
+* Sending - Query execute data fltval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106666c7476616c06666c7476616c0c3f000c0000000401101f000005000004fe0000220009000005047465737403322e3305000006fe00002200
+string(3) "2.3"
+* Received: 200000000353454c4543542073747276616c2c2064626c76616c2046524f4d2064617461
+* Sending - Query execute data dblval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664626c76616c0664626c76616c0c3f00160000000501101f000005000004fe0000220009000005047465737403312e3205000006fe00002200
+string(3) "1.2"
+* Received: 200000000353454c4543542073747276616c2c2064617476616c2046524f4d2064617461
+* Sending - Query execute data datval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664617476616c0664617476616c0c3f000a0000000a811000000005000004fe000022001000000504746573740a323031342d31322d313505000006fe00002200
+string(10) "2014-12-15"
+* Received: 200000000353454c4543542073747276616c2c2074696d76616c2046524f4d2064617461
+* Sending - Query execute data timval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610674696d76616c0674696d76616c0c3f000a0000000b811000000005000004fe000022000e00000504746573740831333a30303a303205000006fe00002200
+string(8) "13:00:02"
+* Received: 200000000353454c4543542073747276616c2c2064746976616c2046524f4d2064617461
+* Sending - Query execute data dtival: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664746976616c0664746976616c0c3f00130000000c811000000005000004fe0000220019000005047465737413323031342d31322d31362031333a30303a303105000006fe00002200
+string(19) "2014-12-16 13:00:01"
+* Received: 200000000353454c4543542073747276616c2c2062697476616c2046524f4d2064617461
+* Sending - Query execute data bitval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610662697476616c0662697476616c0c3f004000000010211000000005000004fe000022000e000005047465737408080808080808080805000006fe00002200
+string(18) "578721382704613384"
+* Received: 200000000353454c4543542073747276616c2c2073747276616c2046524f4d2064617461
+* Sending - Query execute data strval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd011000000005000004fe000022000a0000050474657374047465737405000006fe00002200
+string(4) "test"
+* Received: 0100000001
+* Server finished
+done!

php-8.2.28.tar.xz/ext/mysqli/tests/protocol_stmt_row_fetch_data.phpt Added

@@ -0,0 +1,90 @@
+--TEST--
+MySQL protocol - statement row data fetch)
+--EXTENSIONS--
+mysqli
+--FILE--
+<?php
+require_once 'fake_server.inc';
+
+$servername = "127.0.0.1";
+$username = "root";
+$password = "";
+
+$process = run_fake_server_in_background('stmt_response_row_read_two_fields');
+$process->wait();
+
+$conn = new mysqli($servername, $username, $password, "", $process->getPort());
+
+function my_query($conn, $field)
+{
+    $stmt = $conn->prepare("SELECT strval, $field FROM data");
+
+    $stmt->execute();
+    $result = $stmt->get_result();
+
+    if ($result->num_rows > 0) {
+        while ($row = $result->fetch_assoc()) {
+            var_dump($row$field);
+        }
+    }
+}
+
+foreach (my_mysqli_data_fields() as $field_name => $field) {
+    my_query($conn, $field_name);
+}
+
+$conn->close();
+
+$process->terminate(true);
+
+print "done!";
+?>
+--EXPECTF--
+* Server started on 127.0.0.1:%d
+* Connection established
+* Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
+* Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
+* Sending - Server OK: 0700000200000002000000
+* Received: 200000001653454c4543542073747276616c2c20696e7476616c2046524f4d2064617461
+* Sending - Stmt prepare data intval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106696e7476616c06696e7476616c0c3f000b00000003011000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data intval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106696e7476616c06696e7476616c0c3f000b00000003011000000005000004fe000022000b000005000004746573740e00000005000006fe00002200
+int(14)
+* Received: 050000001901000000200000001653454c4543542073747276616c2c20666c7476616c2046524f4d2064617461
+* Sending - Stmt prepare data fltval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106666c7476616c06666c7476616c0c3f000c0000000401101f000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data fltval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f746573740464617461046461746106666c7476616c06666c7476616c0c3f000c0000000401101f000005000004fe000022000b000005000004746573743333134005000006fe00002200
+float(2.3)
+* Received: 050000001901000000200000001653454c4543542073747276616c2c2064626c76616c2046524f4d2064617461
+* Sending - Stmt prepare data dblval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664626c76616c0664626c76616c0c3f00160000000501101f000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data dblval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664626c76616c0664626c76616c0c3f00160000000501101f000005000004fe000022000f00000500000474657374333333333333f33f05000006fe00002200
+float(1.2)
+* Received: 050000001901000000200000001653454c4543542073747276616c2c2064617476616c2046524f4d2064617461
+* Sending - Stmt prepare data datval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664617476616c0664617476616c0c3f000a0000000a811000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data datval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664617476616c0664617476616c0c3f000a0000000a811000000005000004fe000022000c0000050000047465737404de070c0f05000006fe00002200
+string(10) "2014-12-15"
+* Received: 050000001901000000200000001653454c4543542073747276616c2c2074696d76616c2046524f4d2064617461
+* Sending - Stmt prepare data timval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610674696d76616c0674696d76616c0c3f000a0000000b811000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data timval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610674696d76616c0674696d76616c0c3f000a0000000b811000000005000004fe00002200100000050000047465737408000000000015080105000006fe00002200
+string(8) "21:08:01"
+* Received: 050000001901000000200000001653454c4543542073747276616c2c2064746976616c2046524f4d2064617461
+* Sending - Stmt prepare data dtival: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664746976616c0664746976616c0c3f00130000000c811000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data dtival: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610664746976616c0664746976616c0c3f00130000000c811000000005000004fe000022000f0000050000047465737407de070c100d000105000006fe00002200
+string(19) "2014-12-16 13:00:01"
+* Received: 050000001901000000200000001653454c4543542073747276616c2c2062697476616c2046524f4d2064617461
+* Sending - Stmt prepare data bitval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610662697476616c0662697476616c0c3f004000000010211000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data bitval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610662697476616c0662697476616c0c3f004000000010211000000005000004fe00002200100000050000047465737408080808080808080805000006fe00002200
+%s578721382704613384%s
+* Received: 050000001901000000200000001653454c4543542073747276616c2c2073747276616c2046524f4d2064617461
+* Sending - Stmt prepare data strval: 0c0000010001000000020000000000003200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd011000000005000004fe00000200
+* Received: 0a00000017010000000001000000
+* Sending - Stmt execute data strval: 01000001023200000203646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd01100000003200000303646566087068705f74657374046461746104646174610673747276616c0673747276616c0ce000c8000000fd011000000005000004fe000022000c00000500000474657374047465737405000006fe00002200
+string(4) "test"
+* Received: 0500000019010000000100000001
+* Server finished
+done!

php-8.2.23.tar.xz/ext/mysqlnd/mysqlnd_ps_codec.c -> php-8.2.28.tar.xz/ext/mysqlnd/mysqlnd_ps_codec.c Changed

@@ -50,11 +50,46 @@
 #define MYSQLND_PS_SKIP_RESULT_W_LEN	-1
 #define MYSQLND_PS_SKIP_RESULT_STR		-2
 
+static inline void ps_fetch_over_read_error(const zend_uchar ** row)
+{
+	php_error_docref(NULL, E_WARNING, "Malformed server packet. Field length pointing after the end of packet");
+	*row = NULL;
+}
+
+static inline bool ps_fetch_is_packet_over_read_with_variable_length(const unsigned int pack_len,
+		const zend_uchar ** row, const zend_uchar *p, unsigned int length)
+{
+	if (pack_len == 0) {
+		return false;
+	}
+	size_t length_len = *row - p;
+	if (length_len > pack_len || length > pack_len - length_len) {
+		ps_fetch_over_read_error(row);
+		return true;
+	}
+	return false;
+}
+
+static inline bool ps_fetch_is_packet_over_read_with_static_length(const unsigned int pack_len,
+		const zend_uchar ** row, unsigned int length)
+{
+	if (pack_len > 0 && length > pack_len) {
+		ps_fetch_over_read_error(row);
+		return true;
+	}
+	return false;
+}
+
+
 /* {{{ ps_fetch_from_1_to_8_bytes */
 void
 ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, const unsigned int pack_len,
 						   const zend_uchar ** row, unsigned int byte_count)
 {
+	if (UNEXPECTED(ps_fetch_is_packet_over_read_with_static_length(pack_len, row, byte_count))) {
+		return;
+	}
+
 	bool is_bit = field->type == MYSQL_TYPE_BIT;
 	DBG_ENTER("ps_fetch_from_1_to_8_bytes");
 	DBG_INF_FMT("zv=%p byte_count=%u", zv, byte_count);
@@ -174,6 +209,11 @@
 	float fval;
 	double dval;
 	DBG_ENTER("ps_fetch_float");
+
+	if (UNEXPECTED(ps_fetch_is_packet_over_read_with_static_length(pack_len, row, 4))) {
+		return;
+	}
+
 	float4get(fval, *row);
 	(*row)+= 4;
 	DBG_INF_FMT("value=%f", fval);
@@ -196,6 +236,11 @@
 {
 	double value;
 	DBG_ENTER("ps_fetch_double");
+
+	if (UNEXPECTED(ps_fetch_is_packet_over_read_with_static_length(pack_len, row, 8))) {
+		return;
+	}
+
 	float8get(value, *row);
 	ZVAL_DOUBLE(zv, value);
 	(*row)+= 8;
@@ -211,9 +256,14 @@
 {
 	struct st_mysqlnd_time t;
 	zend_ulong length; /* First byte encodes the length */
+	const zend_uchar *p = *row;
 	DBG_ENTER("ps_fetch_time");
 
 	if ((length = php_mysqlnd_net_field_length(row))) {
+		if (UNEXPECTED(ps_fetch_is_packet_over_read_with_variable_length(pack_len, row, p, length))) {
+			return;
+		}
+
 		const zend_uchar * to = *row;
 
 		t.time_type = MYSQLND_TIMESTAMP_TIME;
@@ -256,9 +306,14 @@
 {
 	struct st_mysqlnd_time t = {0};
 	zend_ulong length; /* First byte encodes the length*/
+	const zend_uchar *p = *row;
 	DBG_ENTER("ps_fetch_date");
 
 	if ((length = php_mysqlnd_net_field_length(row))) {
+		if (UNEXPECTED(ps_fetch_is_packet_over_read_with_variable_length(pack_len, row, p, length))) {
+			return;
+		}
+
 		const zend_uchar * to = *row;
 
 		t.time_type = MYSQLND_TIMESTAMP_DATE;
@@ -288,9 +343,14 @@
 {
 	struct st_mysqlnd_time t;
 	zend_ulong length; /* First byte encodes the length*/
+	const zend_uchar *p = *row;
 	DBG_ENTER("ps_fetch_datetime");
 
 	if ((length = php_mysqlnd_net_field_length(row))) {
+		if (UNEXPECTED(ps_fetch_is_packet_over_read_with_variable_length(pack_len, row, p, length))) {
+			return;
+		}
+
 		const zend_uchar * to = *row;
 
 		t.time_type = MYSQLND_TIMESTAMP_DATETIME;
@@ -332,7 +392,11 @@
 static void
 ps_fetch_string(zval * zv, const MYSQLND_FIELD * const field, const unsigned int pack_len, const zend_uchar ** row)
 {
+	const zend_uchar *p = *row;
 	const zend_ulong length = php_mysqlnd_net_field_length(row);
+	if (UNEXPECTED(ps_fetch_is_packet_over_read_with_variable_length(pack_len, row, p, length))) {
+		return;
+	}
 	DBG_ENTER("ps_fetch_string");
 	DBG_INF_FMT("len = " ZEND_ULONG_FMT, length);
 	DBG_INF("copying from the row buffer");
@@ -348,7 +412,11 @@
 static void
 ps_fetch_bit(zval * zv, const MYSQLND_FIELD * const field, const unsigned int pack_len, const zend_uchar ** row)
 {
+	const zend_uchar *p = *row;
 	const zend_ulong length = php_mysqlnd_net_field_length(row);
+	if (UNEXPECTED(ps_fetch_is_packet_over_read_with_variable_length(pack_len, row, p, length))) {
+		return;
+	}
 	ps_fetch_from_1_to_8_bytes(zv, field, pack_len, row, length);
 }
 /* }}} */

php-8.2.23.tar.xz/ext/mysqlnd/mysqlnd_result.c -> php-8.2.28.tar.xz/ext/mysqlnd/mysqlnd_result.c Changed

php-8.2.23.tar.xz/ext/mysqlnd/mysqlnd_wireprotocol.c -> php-8.2.28.tar.xz/ext/mysqlnd/mysqlnd_wireprotocol.c Changed

@@ -447,8 +447,31 @@
 	if (packet->server_capabilities & CLIENT_PLUGIN_AUTH) {
 		BAIL_IF_NO_MORE_DATA;
 		/* The server is 5.5.x and supports authentication plugins */
-		packet->auth_protocol = estrdup((char *)p);
-		p+= strlen(packet->auth_protocol) + 1; /* eat the '\0' */
+		size_t remaining_size = packet->header.size - (size_t)(p - buf);
+		if (remaining_size == 0) {
+			/* Might be better to fail but this will fail anyway */
+			packet->auth_protocol = estrdup("");
+		} else {
+			/* Check if NUL present */
+			char *null_terminator = memchr(p, '\0', remaining_size);
+			size_t auth_protocol_len;
+			if (null_terminator) {
+				/* If present, do basically estrdup */
+				auth_protocol_len = null_terminator - (char *)p;
+			} else {
+				/* If not present, copy the rest of the buffer */
+				auth_protocol_len = remaining_size;
+			}
+			char *auth_protocol = emalloc(auth_protocol_len + 1);
+			memcpy(auth_protocol, p, auth_protocol_len);
+			auth_protocolauth_protocol_len = '\0';
+			packet->auth_protocol = auth_protocol;
+
+			p += auth_protocol_len;
+			if (null_terminator) {
+				p++;
+			}
+		}
 	}
 
 	DBG_INF_FMT("proto=%u server=%s thread_id=%u",
@@ -721,7 +744,14 @@
 
 		/* There is a message */
 		if (packet->header.size > (size_t) (p - buf) && (net_len = php_mysqlnd_net_field_length(&p))) {
-			packet->message_len = MIN(net_len, buf_len - (p - begin));
+			/* p can get past packet size when getting field length so it needs to be checked first
+			 * and after that it can be checked that the net_len is not greater than the packet size */
+			if ((p - buf) > packet->header.size || packet->header.size - (p - buf) < net_len) {
+				DBG_ERR_FMT("OK packet message length is past the packet size");
+				php_error_docref(NULL, E_WARNING, "OK packet message length is past the packet size");
+				DBG_RETURN(FAIL);
+			}
+			packet->message_len = net_len;
 			packet->message = mnd_pestrndup((char *)p, packet->message_len, FALSE);
 		} else {
 			packet->message = NULL;
@@ -1105,6 +1135,17 @@
 			BAIL_IF_NO_MORE_DATA;
 			/* Check for additional textual data */
 			if (packet->header.size  > (size_t) (p - buf) && (len = php_mysqlnd_net_field_length(&p))) {
+				/* p can get past packet size when getting field length so it needs to be checked first
+				 * and after that it can be checked that the len is not greater than the packet size */
+				if ((p - buf) > packet->header.size || packet->header.size - (p - buf) < len) {
+					size_t local_file_name_over_read = ((p - buf) - packet->header.size) + len;
+					DBG_ERR_FMT("RSET_HEADER packet additional data length is past %zu bytes the packet size",
+						local_file_name_over_read);
+					php_error_docref(NULL, E_WARNING,
+						"RSET_HEADER packet additional data length is past %zu bytes the packet size",
+						local_file_name_over_read);
+					DBG_RETURN(FAIL);
+				}
 				packet->info_or_local_file.s = mnd_emalloc(len + 1);
 				memcpy(packet->info_or_local_file.s, p, len);
 				packet->info_or_local_file.slen = '\0';
@@ -1255,23 +1296,16 @@
 		meta->flags |= NUM_FLAG;
 	}
 
-
-	/*
-	  def could be empty, thus don't allocate on the root.
-	  NULL_LENGTH (0xFB) comes from COM_FIELD_LIST when the default value is NULL.
-	  Otherwise the string is length encoded.
-	*/
+	/* COM_FIELD_LIST is no longer supported so def should not be present */
 	if (packet->header.size > (size_t) (p - buf) &&
 		(len = php_mysqlnd_net_field_length(&p)) &&
 		len != MYSQLND_NULL_LENGTH)
 	{
-		BAIL_IF_NO_MORE_DATA;
-		DBG_INF_FMT("Def found, length " ZEND_ULONG_FMT, len);
-		meta->def = packet->memory_pool->get_chunk(packet->memory_pool, len + 1);
-		memcpy(meta->def, p, len);
-		meta->deflen = '\0';
-		meta->def_length = len;
-		p += len;
+		DBG_ERR_FMT("Protocol error. Server sent default for unsupported field list");
+		php_error_docref(NULL, E_WARNING,
+			"Protocol error. Server sent default for unsupported field list (mysqlnd_wireprotocol.c:%u)",
+			__LINE__);
+		DBG_RETURN(FAIL);
 	}
 
 	root_ptr = meta->root = packet->memory_pool->get_chunk(packet->memory_pool, total_len);
@@ -1434,8 +1468,10 @@
 									  const unsigned int field_count, const MYSQLND_FIELD * const fields_metadata,
 									  const bool as_int_or_float, MYSQLND_STATS * const stats)
 {
-	unsigned int i;
-	const zend_uchar * p = row_buffer->ptr;
+	unsigned int i, j;
+	size_t rbs = row_buffer->size;
+	const zend_uchar * rbp = row_buffer->ptr;
+	const zend_uchar * p = rbp;
 	const zend_uchar * null_ptr;
 	zend_uchar bit;
 	zval *current_field, *end_field, *start_field;
@@ -1468,7 +1504,21 @@
 			statistic = STAT_BINARY_TYPE_FETCHED_NULL;
 		} else {
 			enum_mysqlnd_field_types type = fields_metadatai.type;
-			mysqlnd_ps_fetch_functionstype.func(current_field, &fields_metadatai, 0, &p);
+			size_t row_position = p - rbp;
+			if (rbs <= row_position) {
+				for (j = 0, current_field = start_field; j < i; current_field++, j++) {
+					zval_ptr_dtor(current_field);
+				}
+				php_error_docref(NULL, E_WARNING, "Malformed server packet. No packet space left for the field");
+				DBG_RETURN(FAIL);
+			}
+			mysqlnd_ps_fetch_functionstype.func(current_field, &fields_metadatai, rbs - row_position, &p);
+			if (p == NULL) {
+				for (j = 0, current_field = start_field; j < i; current_field++, j++) {
+					zval_ptr_dtor(current_field);
+				}
+				DBG_RETURN(FAIL);
+			}
 
 			if (MYSQLND_G(collect_statistics)) {
 				switch (fields_metadatai.type) {
@@ -1525,7 +1575,7 @@
 									unsigned int field_count, const MYSQLND_FIELD * fields_metadata,
 									bool as_int_or_float, MYSQLND_STATS * stats)
 {
-	unsigned int i;
+	unsigned int i, j;
 	zval *current_field, *end_field, *start_field;
 	zend_uchar * p = row_buffer->ptr;
 	const size_t data_size = row_buffer->size;
@@ -1546,9 +1596,11 @@
 		/* NULL or NOT NULL, this is the question! */
 		if (len == MYSQLND_NULL_LENGTH) {
 			ZVAL_NULL(current_field);
-		} else if ((p + len) > packet_end) {
-			php_error_docref(NULL, E_WARNING, "Malformed server packet. Field length pointing %zu"
-											  " bytes after end of packet", (p + len) - packet_end - 1);
+		} else if (p > packet_end || len > packet_end - p) {
+			php_error_docref(NULL, E_WARNING, "Malformed server packet. Field length pointing after end of packet");
+			for (j = 0, current_field = start_field; j < i; current_field++, j++) {
+				zval_ptr_dtor(current_field);
+			}
 			DBG_RETURN(FAIL);
 		} else {
 			struct st_mysqlnd_perm_bind perm_bind =

php-8.2.23.tar.xz/ext/oci8/php_oci8_int.h -> php-8.2.28.tar.xz/ext/oci8/php_oci8_int.h Changed

php-8.2.23.tar.xz/ext/opcache/ZendAccelerator.c -> php-8.2.28.tar.xz/ext/opcache/ZendAccelerator.c Changed

php-8.2.23.tar.xz/ext/opcache/jit/dynasm/dasm_x86.h -> php-8.2.28.tar.xz/ext/opcache/jit/dynasm/dasm_x86.h Changed

php-8.2.23.tar.xz/ext/opcache/jit/zend_jit.c -> php-8.2.28.tar.xz/ext/opcache/jit/zend_jit.c Changed

@@ -103,6 +103,8 @@
 #define JIT_STUB(name, offset, adjustment) \
 	{JIT_STUB_PREFIX #name, zend_jit_ ## name ## _stub, offset, adjustment}
 
+bool zend_jit_startup_ok = false;
+
 zend_ulong zend_jit_profile_counter = 0;
 int zend_jit_profile_counter_rid = -1;
 
@@ -669,16 +671,16 @@
 	return NULL;
 }
 
-static bool zend_may_be_dynamic_property(zend_class_entry *ce, zend_string *member, bool on_this, zend_string *filename)
+static bool zend_may_be_dynamic_property(zend_class_entry *ce, zend_string *member, bool on_this, const zend_op_array *op_array)
 {
 	zend_property_info *info;
 
-	if (!ce || (ce->ce_flags & ZEND_ACC_TRAIT)) {
+	if (!ce || (ce->ce_flags & ZEND_ACC_TRAIT) || (op_array->fn_flags & ZEND_ACC_TRAIT_CLONE)) {
 		return 1;
 	}
 
 	if (!(ce->ce_flags & ZEND_ACC_IMMUTABLE)) {
-		if (ce->info.user.filename != filename) {
+		if (ce->info.user.filename != op_array->filename) {
 			/* class declaration might be changed independently */
 			return 1;
 		}
@@ -3169,7 +3171,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -3217,7 +3219,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -3258,7 +3260,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -3761,7 +3763,7 @@
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							op1_addr = 0;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							on_this = 1;
 						} else {
 							op1_info = OP1_INFO();
@@ -3912,7 +3914,7 @@
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							op1_addr = 0;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							on_this = 1;
 						} else {
 							op1_info = OP1_INFO();
@@ -3970,7 +3972,13 @@
 				case ZEND_OP_DATA:
 				case ZEND_SWITCH_LONG:
 				case ZEND_SWITCH_STRING:
+					break;
 				case ZEND_MATCH:
+					/* We have to exit to the VM because the MATCH handler performs an N-way jump for
+					 * which we can't generate simple (opcache.jit=1201) JIT code. */
+					if (!zend_jit_tail_handler(&dasm_state, opline)) {
+						goto jit_failure;
+					}
 					break;
 				case ZEND_JMP:
 					if (JIT_G(opt_level) < ZEND_JIT_LEVEL_INLINE) {
@@ -4184,16 +4192,19 @@
 	}
 }
 
-static int zend_real_jit_func(zend_op_array *op_array, zend_script *script, const zend_op *rt_opline)
+static int zend_real_jit_func(zend_op_array *op_array, zend_script *script, const zend_op *rt_opline, uint8_t trigger)
 {
 	zend_ssa ssa;
 	void *checkpoint;
 	zend_func_info *func_info;
+	uint8_t orig_trigger;
 
 	if (*dasm_ptr == dasm_end) {
 		return FAILURE;
 	}
 
+	orig_trigger = JIT_G(trigger);
+	JIT_G(trigger) = trigger;
 	checkpoint = zend_arena_checkpoint(CG(arena));
 
 	/* Build SSA */
@@ -4226,11 +4237,13 @@
 
 	zend_jit_cleanup_func_info(op_array);
 	zend_arena_release(&CG(arena), checkpoint);
+	JIT_G(trigger) = orig_trigger;
 	return SUCCESS;
 
 jit_failure:
 	zend_jit_cleanup_func_info(op_array);
 	zend_arena_release(&CG(arena), checkpoint);
+	JIT_G(trigger) = orig_trigger;
 	return FAILURE;
 }
 
@@ -4261,7 +4274,7 @@
 			opline->handler = jit_extension->orig_handler;
 
 			/* perform real JIT for this function */
-			zend_real_jit_func(op_array, NULL, NULL);
+			zend_real_jit_func(op_array, NULL, NULL, ZEND_JIT_ON_FIRST_EXEC);
 		} zend_catch {
 			do_bailout = true;
 		} zend_end_try();
@@ -4307,7 +4320,7 @@
 			jit_extension = (zend_jit_op_array_extension*)ZEND_FUNC_INFO(op_array);
 			opline->handler = jit_extension->orig_handler;
 			if (((double)counter / (double)zend_jit_profile_counter) > JIT_G(prof_threshold)) {
-				zend_real_jit_func(op_array, NULL, NULL);
+				zend_real_jit_func(op_array, NULL, NULL, ZEND_JIT_ON_PROF_REQUEST);
 			}
 		}
 	} ZEND_HASH_FOREACH_END();
@@ -4333,7 +4346,7 @@
 			}
 
 			/* perform real JIT for this function */
-			zend_real_jit_func(op_array, NULL, opline);
+			zend_real_jit_func(op_array, NULL, opline, ZEND_JIT_ON_HOT_COUNTERS);
 		} zend_catch {
 			do_bailout = 1;
 		} zend_end_try();
@@ -4501,7 +4514,7 @@
 	} else if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE) {
 		return zend_jit_setup_hot_trace_counters(op_array);
 	} else if (JIT_G(trigger) == ZEND_JIT_ON_SCRIPT_LOAD) {
-		return zend_real_jit_func(op_array, script, NULL);
+		return zend_real_jit_func(op_array, script, NULL, ZEND_JIT_ON_SCRIPT_LOAD);
 	} else {
 		ZEND_UNREACHABLE();
 	}
@@ -4758,7 +4771,7 @@
 	JIT_G(opt_level) = jit % 10;
 
 	jit /= 10;
-	if (jit % 10 > 5) return FAILURE;
+	if (jit % 10 > 5 || jit % 10 == 4) return FAILURE;
 	JIT_G(trigger) = jit % 10;
 
 	jit /= 10;
@@ -5085,6 +5098,13 @@
 
 ZEND_EXT_API void zend_jit_activate(void)
 {
+#ifdef ZTS
+	if (!zend_jit_startup_ok) {
+		JIT_G(enabled) = 0;
+		JIT_G(on) = 0;
+		return;
+	}
+#endif
 	zend_jit_profile_counter = 0;
 	if (JIT_G(on)) {
 		if (JIT_G(trigger) == ZEND_JIT_ON_HOT_COUNTERS) {

php-8.2.23.tar.xz/ext/opcache/jit/zend_jit.h -> php-8.2.28.tar.xz/ext/opcache/jit/zend_jit.h Changed

php-8.2.23.tar.xz/ext/opcache/jit/zend_jit_arm64.dasc -> php-8.2.28.tar.xz/ext/opcache/jit/zend_jit_arm64.dasc Changed

@@ -504,7 +504,11 @@
 ||#else
 |	.long 0xd53bd051 // TODO: hard-coded: mrs TMP3, tpidr_el0
 ||	if (tsrm_ls_cache_tcb_offset == 0) {
+||#ifdef __MUSL__
+|		ldr TMP3, TMP3, #-8
+||#else
 |		ldr TMP3, TMP3, #0
+||#endif
 |		MEM_ACCESS_64_WITH_UOFFSET_64 ldr, TMP3, TMP3, tsrm_tls_index, TMP1
 |		MEM_ACCESS_64_WITH_UOFFSET_64 ldr, reg, TMP3, tsrm_tls_offset, TMP1
 ||	} else {
@@ -1548,6 +1552,9 @@
 ||			}
 |			IF_GC_MAY_NOT_LEAK FCARG1x, >4, Rw(tmp_reg1), Rw(tmp_reg2)
 |			// gc_possible_root(Z_COUNTED_P(z))
+||			if (opline) {
+|				SET_EX_OPLINE opline, TMP1
+||			}
 |			EXT_CALL gc_possible_root, Rx(tmp_reg1)
 ||		}
 ||		if (cold && ((op_info) & ((MAY_BE_ANY|MAY_BE_UNDEF|MAY_BE_INDIRECT|MAY_BE_GUARD)-(MAY_BE_OBJECT|MAY_BE_RESOURCE))) != 0) {
@@ -2787,6 +2794,20 @@
 		/* Index is offset by 1 on FreeBSD (https://github.com/freebsd/freebsd-src/blob/22ca6db50f4e6bd75a141f57cf953d8de6531a06/lib/libc/gen/tls.c#L88) */
 		tsrm_tls_index = (tlsdesc->index + 1) * 8;
 	}
+# elif defined(__MUSL__)
+	if (tsrm_ls_cache_tcb_offset == 0) {
+		size_t **where;
+
+		__asm__(
+			"adrp %0, :tlsdesc:_tsrm_ls_cache\n"
+			"add %0, %0, :tlsdesc_lo12:_tsrm_ls_cache\n"
+			: "=r" (where));
+		/* See https://github.com/ARM-software/abi-aa/blob/2a70c42d62e9c3eb5887fa50b71257f20daca6f9/aaelf64/aaelf64.rst */
+		size_t *tlsdesc = where1;
+
+		tsrm_tls_offset = tlsdesc1;
+		tsrm_tls_index = tlsdesc0 * 8;
+	}
 # else
 	ZEND_ASSERT(tsrm_ls_cache_tcb_offset != 0);
 # endif
@@ -5944,6 +5965,9 @@
 			if (RC_MAY_BE_N(var_info) && (var_info & (MAY_BE_ARRAY|MAY_BE_OBJECT)) != 0) {
 				|4:
 				|	IF_GC_MAY_NOT_LEAK FCARG1x, >8, TMP1w, TMP2w
+				if (opline) {
+					|	SET_EX_OPLINE opline, REG0
+				}
 				|	EXT_CALL gc_possible_root, REG0
 				if (in_cold) {
 					|	b >8
@@ -5971,6 +5995,9 @@
 				|	GET_ZVAL_PTR FCARG1x, var_use_addr, TMP1
 				|	GC_DELREF FCARG1x, TMP1w
 				|	IF_GC_MAY_NOT_LEAK FCARG1x, >5, TMP1w, TMP2w
+				if (opline) {
+					|	SET_EX_OPLINE opline, TMP1
+				}
 				|	EXT_CALL gc_possible_root, TMP1
 				if (Z_REG(var_use_addr) != ZREG_FP) {
 					|	ldr Rx(Z_REG(var_use_addr)), T1 // restore
@@ -11831,6 +11858,9 @@
 			|3:
 			|	// GC_ZVAL_CHECK_POSSIBLE_ROOT(variable_ptr)
 			|	IF_GC_MAY_NOT_LEAK FCARG1x, >5, TMP1w, TMP2w
+			if (opline) {
+				|	SET_EX_OPLINE opline, REG0
+			}
 			|	EXT_CALL gc_possible_root, REG0
 			|	b >5
 		}
@@ -12200,7 +12230,7 @@
 		|	cmp REG2, TMP1
 		|	bne >5
 		|	MEM_ACCESS_64_WITH_UOFFSET ldr, REG0, REG0, ((opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS)  + sizeof(void*)), TMP1
-		may_be_dynamic = zend_may_be_dynamic_property(ce, Z_STR_P(member), opline->op1_type == IS_UNUSED, op_array->filename);
+		may_be_dynamic = zend_may_be_dynamic_property(ce, Z_STR_P(member), opline->op1_type == IS_UNUSED, op_array);
 		if (may_be_dynamic) {
 			|	tst REG0, REG0
 			if (opline->opcode == ZEND_FETCH_OBJ_W) {
@@ -13829,7 +13859,9 @@
 
 static int zend_jit_fetch_this(dasm_State **Dst, const zend_op *opline, const zend_op_array *op_array, bool check_only)
 {
-	if (!op_array->scope || (op_array->fn_flags & ZEND_ACC_STATIC)) {
+	if (!op_array->scope ||
+			(op_array->fn_flags & ZEND_ACC_STATIC) ||
+			((op_array->fn_flags & (ZEND_ACC_CLOSURE|ZEND_ACC_IMMUTABLE)) == ZEND_ACC_CLOSURE)) {
 		if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE) {
 			if (!JIT_G(current_frame) ||
 			    !TRACE_FRAME_IS_THIS_CHECKED(JIT_G(current_frame))) {

php-8.2.23.tar.xz/ext/opcache/jit/zend_jit_helpers.c -> php-8.2.28.tar.xz/ext/opcache/jit/zend_jit_helpers.c Changed

php-8.2.23.tar.xz/ext/opcache/jit/zend_jit_trace.c -> php-8.2.28.tar.xz/ext/opcache/jit/zend_jit_trace.c Changed

@@ -1247,7 +1247,8 @@
 			}
 		} else if (p->op == ZEND_JIT_TRACE_DO_ICALL) {
 			if (JIT_G(opt_level) < ZEND_JIT_LEVEL_OPT_FUNC) {
-				if (p->func != (zend_function*)&zend_pass_function
+				if (p->func
+				 && p->func != (zend_function*)&zend_pass_function
 				 && (zend_string_equals_literal(p->func->common.function_name, "extract")
 				  || zend_string_equals_literal(p->func->common.function_name, "compact")
 				  || zend_string_equals_literal(p->func->common.function_name, "get_defined_vars"))) {
@@ -4647,7 +4648,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -4738,7 +4739,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -4818,7 +4819,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -5403,6 +5404,9 @@
 							res_type = Z_TYPE_P(RT_CONSTANT(opline, opline->op1));
 						} else if (op1_type != IS_UNKNOWN) {
 							res_type = op1_type;
+							if (res_type == IS_UNDEF) {
+								res_type = IS_NULL;
+							}
 						}
 						if (op_array->type == ZEND_EVAL_CODE
 						 // TODO: support for top-level code
@@ -5838,7 +5842,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -6117,7 +6121,7 @@
 						if (opline->op1_type == IS_UNUSED) {
 							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
 							ce = op_array->scope;
-							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							ce_is_instanceof = !(ce->ce_flags & ZEND_ACC_FINAL);
 							op1_addr = 0;
 							on_this = 1;
 						} else {
@@ -6221,7 +6225,7 @@
 					goto jit_failure;
 				}
 				if ((p+1)->op == ZEND_JIT_TRACE_INIT_CALL && (p+1)->func) {
-					if (opline->opcode == ZEND_NEW && ssa_op->result_def >= 0) {
+					if (opline->opcode == ZEND_NEW && opline->result_type != IS_UNUSED) {
 						SET_STACK_TYPE(stack, EX_VAR_TO_NUM(opline->result.var), IS_OBJECT, 1);
 					}
 					if (zend_jit_may_be_polymorphic_call(opline) ||
@@ -6959,7 +6963,7 @@
 					for (i = 0; i < op_array->last_var + op_array->T; i++) {
 						SET_STACK_TYPE(stack, i, IS_UNKNOWN, 1);
 					}
-					exit_point = zend_jit_trace_get_exit_point(opline, ZEND_JIT_EXIT_TO_VM);
+					exit_point = zend_jit_trace_get_exit_point(zend_jit_tracest->link.opline, ZEND_JIT_EXIT_TO_VM);
 					timeout_exit_addr = zend_jit_trace_get_exit_addr(exit_point);
 					if (!timeout_exit_addr) {
 						goto jit_failure;
@@ -7163,6 +7167,11 @@
 			t->polymorphism = 0;
 			t->jmp_table_size = 0;
 			t->op_array = trace_buffer0.op_array;
+			if (!(t->op_array->fn_flags & ZEND_ACC_IMMUTABLE)) {
+				zend_jit_op_array_trace_extension *jit_extension =
+					(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(t->op_array);
+				t->op_array = jit_extension->op_array;
+			}
 			t->opline = trace_buffer1.opline;
 			t->exit_info = exit_info;
 			t->stack_map = NULL;

php-8.2.23.tar.xz/ext/opcache/jit/zend_jit_vm_helpers.c -> php-8.2.28.tar.xz/ext/opcache/jit/zend_jit_vm_helpers.c Changed

php-8.2.23.tar.xz/ext/opcache/jit/zend_jit_x86.dasc -> php-8.2.28.tar.xz/ext/opcache/jit/zend_jit_x86.dasc Changed

@@ -1443,6 +1443,9 @@
 |1:
 ||			}
 |			IF_GC_MAY_NOT_LEAK FCARG1a, >4
+||			if (opline) {
+|				SET_EX_OPLINE opline, r0
+||			}
 |			// gc_possible_root(Z_COUNTED_P(z))
 |			EXT_CALL gc_possible_root, r0
 ||		}
@@ -6488,6 +6491,9 @@
 			if (RC_MAY_BE_N(var_info) && (var_info & (MAY_BE_ARRAY|MAY_BE_OBJECT)) != 0) {
 				|4:
 				|	IF_GC_MAY_NOT_LEAK FCARG1a, >8
+				if (opline) {
+					|	SET_EX_OPLINE opline, r0
+				}
 				|	EXT_CALL gc_possible_root, r0
 				if (in_cold) {
 					|	jmp >8
@@ -6515,6 +6521,9 @@
 				|	GET_ZVAL_PTR FCARG1a, var_use_addr
 				|	GC_DELREF FCARG1a
 				|	IF_GC_MAY_NOT_LEAK FCARG1a, >5
+				if (opline) {
+					|	SET_EX_OPLINE opline, r0
+				}
 				|	EXT_CALL gc_possible_root, r0
 				if (Z_REG(var_use_addr) != ZREG_FP) {
 					|	mov Ra(Z_REG(var_use_addr)), T1 // restore
@@ -9231,19 +9240,11 @@
 	int32_t exit_point;
 	const void *exit_addr;
 
-	if (func->type == ZEND_INTERNAL_FUNCTION) {
-#ifdef ZEND_WIN32
-		// TODO: ASLR may cause different addresses in different workers ???
-		return 0;
-#endif
-	} else if (func->type == ZEND_USER_FUNCTION) {
+	if (func->type == ZEND_USER_FUNCTION) {
 		if (!zend_accel_in_shm(func->op_array.opcodes)) {
 			/* op_array and op_array->opcodes are not persistent. We can't link. */
 			return 0;
 		}
-	} else {
-		ZEND_UNREACHABLE();
-		return 0;
 	}
 
 	exit_point = zend_jit_trace_get_exit_point(to_opline, ZEND_JIT_EXIT_POLYMORPHISM);
@@ -9277,6 +9278,22 @@
 		|		cmp aword r1 + offsetof(zend_op_array, opcodes), opcodes
 		|	.endif
 		|	jne &exit_addr
+#ifdef _WIN32
+	} else if (func->type == ZEND_INTERNAL_FUNCTION) {
+		const zif_handler handler = func->internal_function.handler;
+
+		|   .if X64
+		||		if (!IS_SIGNED_32BIT(handler)) {
+		|			mov64 r2, ((ptrdiff_t)handler)
+		|			cmp aword r1 + offsetof(zend_internal_function, handler), r2
+		||		} else {
+		|			cmp aword r1 + offsetof(zend_internal_function, handler), handler
+		||		}
+		|	.else
+		|		cmp aword r1 + offsetof(zend_internal_function, handler), handler
+		|	.endif
+		|	jne &exit_addr
+#endif
 	} else {
 		|   .if X64
 		||		if (!IS_SIGNED_32BIT(func)) {
@@ -9423,6 +9440,22 @@
 					|		cmp aword r0 + offsetof(zend_op_array, opcodes), opcodes
 					|	.endif
 					|	jz >3
+#ifdef _WIN32
+				} else if (func->type == ZEND_INTERNAL_FUNCTION) {
+					const zif_handler handler = func->internal_function.handler;
+
+					|   .if X64
+					||		if (!IS_SIGNED_32BIT(handler)) {
+					|			mov64 r1, ((ptrdiff_t)handler)
+					|			cmp aword r0 + offsetof(zend_internal_function, handler), r1
+					||		} else {
+					|			cmp aword r0 + offsetof(zend_internal_function, handler), handler
+					||		}
+					|	.else
+					|		cmp aword r0 + offsetof(zend_internal_function, handler), handler
+					|	.endif
+					|	jz >3
+#endif
 				} else {
 					|   .if X64
 					||		if (!IS_SIGNED_32BIT(func)) {
@@ -9609,11 +9642,7 @@
 	if ((!func || zend_jit_may_be_modified(func, op_array))
 	 && trace
 	 && trace->op == ZEND_JIT_TRACE_INIT_CALL
-	 && trace->func
-#ifdef _WIN32
-	 && trace->func->type != ZEND_INTERNAL_FUNCTION
-#endif
-	) {
+	 && trace->func) {
 		int32_t exit_point;
 		const void *exit_addr;
 
@@ -9642,6 +9671,22 @@
 			|		cmp aword r0 + offsetof(zend_op_array, opcodes), opcodes
 			|	.endif
 			|	jne &exit_addr
+#ifdef _WIN32
+		} else if (func->type == ZEND_INTERNAL_FUNCTION) {
+			const zif_handler handler = func->internal_function.handler;
+
+			|   .if X64
+			||		if (!IS_SIGNED_32BIT(handler)) {
+			|			mov64 r1, ((ptrdiff_t)handler)
+			|			cmp aword r0 + offsetof(zend_internal_function, handler), r1
+			||		} else {
+			|			cmp aword r0 + offsetof(zend_internal_function, handler), handler
+			||		}
+			|	.else
+			|		cmp aword r0 + offsetof(zend_internal_function, handler), handler
+			|	.endif
+			|	jne &exit_addr
+#endif
 		} else {
 			|   .if X64
 			||		if (!IS_SIGNED_32BIT(func)) {
@@ -12583,6 +12628,9 @@
 			|3:
 			|	// GC_ZVAL_CHECK_POSSIBLE_ROOT(variable_ptr)
 			|	IF_GC_MAY_NOT_LEAK FCARG1a, >5
+			if (opline) {
+				|	SET_EX_OPLINE opline, r0
+			}
 			|	EXT_CALL gc_possible_root, r1
 			|	jmp >5
 		}
@@ -12964,7 +13012,7 @@
 		|	cmp r2, aword FCARG1a + offsetof(zend_object, ce)
 		|	jne >5
 		|	mov r0, aword r0 + (opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS) + sizeof(void*)
-		may_be_dynamic = zend_may_be_dynamic_property(ce, Z_STR_P(member), opline->op1_type == IS_UNUSED, op_array->filename);
+		may_be_dynamic = zend_may_be_dynamic_property(ce, Z_STR_P(member), opline->op1_type == IS_UNUSED, op_array);
 		if (may_be_dynamic) {
 			|	test r0, r0
 			if (opline->opcode == ZEND_FETCH_OBJ_W) {
@@ -14749,7 +14797,9 @@
 
 static int zend_jit_fetch_this(dasm_State **Dst, const zend_op *opline, const zend_op_array *op_array, bool check_only)
 {
-	if (!op_array->scope || (op_array->fn_flags & ZEND_ACC_STATIC)) {
+	if (!op_array->scope ||
+			(op_array->fn_flags & ZEND_ACC_STATIC) ||
+			((op_array->fn_flags & (ZEND_ACC_CLOSURE|ZEND_ACC_IMMUTABLE)) == ZEND_ACC_CLOSURE)) {
 		if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE) {
 			if (!JIT_G(current_frame) ||
 			    !TRACE_FRAME_IS_THIS_CHECKED(JIT_G(current_frame))) {

php-8.2.23.tar.xz/ext/opcache/tests/bug78185.phpt -> php-8.2.28.tar.xz/ext/opcache/tests/bug78185.phpt Changed

php-8.2.23.tar.xz/ext/opcache/tests/gh9164.phpt -> php-8.2.28.tar.xz/ext/opcache/tests/gh9164.phpt Changed

php-8.2.23.tar.xz/ext/opcache/tests/gh9259_003.phpt -> php-8.2.28.tar.xz/ext/opcache/tests/gh9259_003.phpt Changed

php-8.2.28.tar.xz/ext/opcache/tests/jit/assign_obj_005.phpt Added

php-8.2.28.tar.xz/ext/opcache/tests/jit/gh15652.phpt Added

php-8.2.28.tar.xz/ext/opcache/tests/jit/gh15658.phpt Added

php-8.2.28.tar.xz/ext/opcache/tests/jit/gh15666.phpt Added

php-8.2.28.tar.xz/ext/opcache/tests/jit/gh15973.phpt Added

php-8.2.28.tar.xz/ext/opcache/tests/jit/gh16393.phpt Added

php-8.2.28.tar.xz/ext/opcache/tests/jit/gh16499.phpt Added

php-8.2.28.tar.xz/ext/opcache/tests/jit/gh16770.phpt Added

php-8.2.28.tar.xz/ext/opcache/tests/jit/gh16829.phpt Added

php-8.2.28.tar.xz/ext/opcache/tests/jit/gh16829_1.inc Added

php-8.2.28.tar.xz/ext/opcache/tests/jit/gh16829_2.inc Added

php-8.2.28.tar.xz/ext/opcache/tests/jit/gh9011.phpt Added

php-8.2.23.tar.xz/ext/opcache/tests/opcache_invalidate_deleted_file.phpt -> php-8.2.28.tar.xz/ext/opcache/tests/opcache_invalidate_deleted_file.phpt Changed

php-8.2.23.tar.xz/ext/opcache/zend_accelerator_util_funcs.c -> php-8.2.28.tar.xz/ext/opcache/zend_accelerator_util_funcs.c Changed

php-8.2.23.tar.xz/ext/opcache/zend_persist.c -> php-8.2.28.tar.xz/ext/opcache/zend_persist.c Changed

php-8.2.23.tar.xz/ext/openssl/openssl.c -> php-8.2.28.tar.xz/ext/openssl/openssl.c Changed

@@ -1457,11 +1457,13 @@
 
 	*free_cert = 1;
 
-	if (!try_convert_to_string(val)) {
+	zend_string *str = zval_try_get_string(val);
+	if (str == NULL) {
 		return NULL;
 	}
-
-	return php_openssl_x509_from_str(Z_STR_P(val), arg_num, is_from_array, option_name);
+	X509 *cert = php_openssl_x509_from_str(str, arg_num, is_from_array, option_name);
+	zend_string_release(str);
+	return cert;
 }
 /* }}} */
 
@@ -1493,7 +1495,7 @@
 	}
 
 	if (!php_openssl_check_path(filename, filename_len, file_path, 2)) {
-		return;
+		goto exit_cleanup_cert;
 	}
 
 	bio_out = BIO_new_file(file_path, PHP_OPENSSL_BIO_MODE_W(PKCS7_BINARY));
@@ -1511,13 +1513,14 @@
 		php_error_docref(NULL, E_WARNING, "Error opening file %s", file_path);
 	}
 
-	if (cert_str) {
-		X509_free(cert);
-	}
-
 	if (!BIO_free(bio_out)) {
 		php_openssl_store_errors();
 	}
+
+exit_cleanup_cert:
+	if (cert_str) {
+		X509_free(cert);
+	}
 }
 /* }}} */
 
@@ -2089,7 +2092,7 @@
 	/* Can return NULL on error or memory allocation failure */
 	if (!bn_serial) {
 		php_openssl_store_errors();
-		RETURN_FALSE;
+		goto err;
 	}
 
 	hex_serial = BN_bn2hex(bn_serial);
@@ -2097,7 +2100,7 @@
 	/* Can return NULL on error or memory allocation failure */
 	if (!hex_serial) {
 		php_openssl_store_errors();
-		RETURN_FALSE;
+		goto err;
 	}
 
 	str_serial = i2s_ASN1_INTEGER(NULL, asn1_serial);
@@ -2169,19 +2172,15 @@
 		bio_out = BIO_new(BIO_s_mem());
 		if (bio_out == NULL) {
 			php_openssl_store_errors();
-			RETURN_FALSE;
+			goto err_subitem;
 		}
 		if (nid == NID_subject_alt_name) {
 			if (openssl_x509v3_subjectAltName(bio_out, extension) == 0) {
 				BIO_get_mem_ptr(bio_out, &bio_buf);
 				add_assoc_stringl(&subitem, extname, bio_buf->data, bio_buf->length);
 			} else {
-				zend_array_destroy(Z_ARR_P(return_value));
 				BIO_free(bio_out);
-				if (cert_str) {
-					X509_free(cert);
-				}
-				RETURN_FALSE;
+				goto err_subitem;
 			}
 		}
 		else if (X509V3_EXT_print(bio_out, extension, 0, 0)) {
@@ -2196,6 +2195,16 @@
 	if (cert_str) {
 		X509_free(cert);
 	}
+	return;
+
+err_subitem:
+	zval_ptr_dtor(&subitem);
+err:
+	zend_array_destroy(Z_ARR_P(return_value));
+	if (cert_str) {
+		X509_free(cert);
+	}
+	RETURN_FALSE;
 }
 /* }}} */
 
@@ -3062,7 +3071,7 @@
 	}
 
 	if (!php_openssl_check_path(filename, filename_len, file_path, 2)) {
-		return;
+		goto exit_cleanup;
 	}
 
 	bio_out = BIO_new_file(file_path, PHP_OPENSSL_BIO_MODE_W(PKCS7_BINARY));
@@ -3082,6 +3091,7 @@
 		php_error_docref(NULL, E_WARNING, "Error opening file %s", file_path);
 	}
 
+exit_cleanup:
 	if (csr_str) {
 		X509_REQ_free(csr);
 	}
@@ -3198,6 +3208,11 @@
 		goto cleanup;
 	}
 
+	if (num_days < 0 || num_days > LONG_MAX / 86400) {
+		php_error_docref(NULL, E_WARNING, "Days must be between 0 and %ld", LONG_MAX / 86400);
+		goto cleanup;
+	}
+
 	if (PHP_SSL_REQ_PARSE(&req, args) == FAILURE) {
 		goto cleanup;
 	}
@@ -3249,7 +3264,7 @@
 		goto cleanup;
 	}
 	X509_gmtime_adj(X509_getm_notBefore(new_cert), 0);
-	X509_gmtime_adj(X509_getm_notAfter(new_cert), 60*60*24*(long)num_days);
+	X509_gmtime_adj(X509_getm_notAfter(new_cert), 60*60*24*num_days);
 	i = X509_set_pubkey(new_cert, key);
 	if (!i) {
 		php_openssl_store_errors();
@@ -3518,6 +3533,7 @@
 		} else {
 			ZVAL_COPY(&tmp, zphrase);
 			if (!try_convert_to_string(&tmp)) {
+				zval_ptr_dtor(&tmp);
 				return NULL;
 			}
 
@@ -3564,19 +3580,21 @@
 		if (!(Z_TYPE_P(val) == IS_STRING || Z_TYPE_P(val) == IS_OBJECT)) {
 			TMP_CLEAN;
 		}
-		if (!try_convert_to_string(val)) {
+		zend_string *val_str = zval_try_get_string(val);
+		if (!val_str) {
 			TMP_CLEAN;
 		}
 
-		if (Z_STRLEN_P(val) > 7 && memcmp(Z_STRVAL_P(val), "file://", sizeof("file://") - 1) == 0) {
-			if (!php_openssl_check_path_str(Z_STR_P(val), file_path, arg_num)) {
+		if (ZSTR_LEN(val_str) > 7 && memcmp(ZSTR_VAL(val_str), "file://", sizeof("file://") - 1) == 0) {
+			if (!php_openssl_check_path_str(val_str, file_path, arg_num)) {
+				zend_string_release_ex(val_str, false);
 				TMP_CLEAN;
 			}
 			is_file = true;
 		}
 		/* it's an X509 file/cert of some kind, and we need to extract the data from that */
 		if (public_key) {
-			cert = php_openssl_x509_from_str(Z_STR_P(val), arg_num, false, NULL);
+			cert = php_openssl_x509_from_str(val_str, arg_num, false, NULL);
 
 			if (cert) {
 				free_cert = 1;
@@ -3586,10 +3604,11 @@
 				if (is_file) {
 					in = BIO_new_file(file_path, PHP_OPENSSL_BIO_MODE_R(PKCS7_BINARY));
 				} else {
-					in = BIO_new_mem_buf(Z_STRVAL_P(val), (int)Z_STRLEN_P(val));
+					in = BIO_new_mem_buf(ZSTR_VAL(val_str), (int)ZSTR_LEN(val_str));
 				}
 				if (in == NULL) {
 					php_openssl_store_errors();
+					zend_string_release_ex(val_str, false);
 					TMP_CLEAN;
 				}
 				key = PEM_read_bio_PUBKEY(in, NULL,NULL, NULL);
@@ -3602,10 +3621,11 @@
 			if (is_file) {
 				in = BIO_new_file(file_path, PHP_OPENSSL_BIO_MODE_R(PKCS7_BINARY));
 			} else {
-				in = BIO_new_mem_buf(Z_STRVAL_P(val), (int)Z_STRLEN_P(val));
+				in = BIO_new_mem_buf(ZSTR_VAL(val_str), (int)ZSTR_LEN(val_str));
 			}
 
 			if (in == NULL) {
+				zend_string_release_ex(val_str, false);
 				TMP_CLEAN;
 			}
 			if (passphrase == NULL) {
@@ -3618,6 +3638,8 @@
 			}
 			BIO_free(in);
 		}
+
+		zend_string_release_ex(val_str, false);
 	}
 
 	if (key == NULL) {
@@ -4548,7 +4570,7 @@
 	}
 
 	if (!php_openssl_check_path(filename, filename_len, file_path, 2)) {
-		RETURN_FALSE;
+		goto clean_exit_key;
 	}
 
 	PHP_SSL_REQ_INIT(&req);
@@ -4584,8 +4606,9 @@
 
 clean_exit:
 	PHP_SSL_REQ_DISPOSE(&req);
-	EVP_PKEY_free(key);
 	BIO_free(bio_out);
+clean_exit_key:
+	EVP_PKEY_free(key);
 }
 /* }}} */

php-8.2.23.tar.xz/ext/openssl/openssl.stub.php -> php-8.2.28.tar.xz/ext/openssl/openssl.stub.php Changed

php-8.2.23.tar.xz/ext/openssl/openssl_arginfo.h -> php-8.2.28.tar.xz/ext/openssl/openssl_arginfo.h Changed

php-8.2.23.tar.xz/ext/openssl/tests/ServerClientTestCase.inc -> php-8.2.28.tar.xz/ext/openssl/tests/ServerClientTestCase.inc Changed

@@ -4,14 +4,19 @@
 
 const WORKER_DEFAULT_NAME = 'server';
 
-function phpt_notify($worker = WORKER_DEFAULT_NAME)
+function phpt_notify(string $worker = WORKER_DEFAULT_NAME, string $message = ""): void
 {
-    ServerClientTestCase::getInstance()->notify($worker);
+    ServerClientTestCase::getInstance()->notify($worker, $message);
 }
 
-function phpt_wait($worker = WORKER_DEFAULT_NAME, $timeout = null)
+function phpt_wait($worker = WORKER_DEFAULT_NAME, $timeout = null): ?string
 {
-    ServerClientTestCase::getInstance()->wait($worker, $timeout);
+    return ServerClientTestCase::getInstance()->wait($worker, $timeout);
+}
+
+function phpt_notify_server_start($server): void
+{
+    ServerClientTestCase::getInstance()->notify_server_start($server);
 }
 
 function phpt_has_sslv3() {
@@ -148,43 +153,73 @@
         eval($code);
     }
 
-    public function run($masterCode, $workerCode)
+    /**
+     * Run client and all workers
+     *
+     * @param string       $clientCode The client PHP code
+     * @param string|array $workerCode
+     * @param bool         $ephemeral Select whether automatic port selection and automatic awaiting is used
+     * @return void
+     * @throws Exception
+     */
+    public function run(string $clientCode, string|array $workerCode, bool $ephemeral = true): void
     {
         if (!is_array($workerCode)) {
             $workerCode = WORKER_DEFAULT_NAME => $workerCode;
         }
-        foreach ($workerCode as $worker => $code) {
+        reset($workerCode);
+        $code = current($workerCode);
+        $worker = key($workerCode);
+        while ($worker != null) {
             $this->spawnWorkerProcess($worker, $this->stripPhpTagsFromCode($code));
+            $code = next($workerCode);
+            if ($ephemeral) {
+                $addr = trim($this->wait($worker));
+                if (empty($addr)) {
+                    throw new \Exception("Failed server start");
+                }
+                if ($code === false) {
+                    $clientCode = preg_replace('/{{\s*ADDR\s*}}/', $addr, $clientCode);
+                } else {
+                    $code = preg_replace('/{{\s*ADDR\s*}}/', $addr, $code);
+                }
+            }
+            $worker = key($workerCode);
         }
-        eval($this->stripPhpTagsFromCode($masterCode));
+
+        eval($this->stripPhpTagsFromCode($clientCode));
         foreach ($workerCode as $worker => $code) {
             $this->cleanupWorkerProcess($worker);
         }
     }
 
-    public function wait($worker, $timeout = null)
+    public function wait($worker, $timeout = null): ?string
     {
         $handle = $this->isWorker ? STDIN : $this->workerStdOut$worker;
         if ($timeout === null) {
-            fgets($handle);
-            return true;
+            return fgets($handle);
         }
 
         stream_set_blocking($handle, false);
         $read = $handle;
         $result = stream_select($read, $write, $except, $timeout);
         if (!$result) {
-            return false;
+            return null;
         }
 
-        fgets($handle);
+        $result = fgets($handle);
         stream_set_blocking($handle, true);
-        return true;
+        return $result;
+    }
+
+    public function notify(string $worker, string $message = ""): void
+    {
+        fwrite($this->isWorker ? STDOUT : $this->workerStdIn$worker, "$message\n");
     }
 
-    public function notify($worker)
+    public function notify_server_start($server): void
     {
-        fwrite($this->isWorker ? STDOUT : $this->workerStdIn$worker, "\n");
+        echo stream_socket_get_name($server, false) . "\n";
     }
 }

php-8.2.23.tar.xz/ext/openssl/tests/bug46127.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug46127.phpt Changed

@@ -11,14 +11,14 @@
 $certFile = __DIR__ . DIRECTORY_SEPARATOR . 'bug46127.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $sock = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($sock);
 
     $link = stream_socket_accept($sock);
     fwrite($link, "Sending bug 46127\n");
@@ -26,7 +26,7 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
 
     $clientCtx = stream_context_create('ssl' => 
@@ -34,7 +34,6 @@
         'verify_peer_name' => false
     );
 
-    phpt_wait();
     $sock = stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx);
 
     echo fgets($sock);

php-8.2.23.tar.xz/ext/openssl/tests/bug48182.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug48182.phpt Changed

@@ -12,14 +12,14 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'bug48182-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s'
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     $client = @stream_socket_accept($server, 1);
 
@@ -30,14 +30,13 @@
 
 $peerName = 'bug48182';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT | STREAM_CLIENT_ASYNC_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'cafile' => '%s',
         'peer_name' => '%s'
     );
 
-    phpt_wait();
     $client = stream_socket_client($serverUri, $errno, $errstr, 10, $clientFlags, $clientCtx);
 
     $data = "Sending data over to SSL server in async mode with contents like Hello World\n";

php-8.2.23.tar.xz/ext/openssl/tests/bug54992.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug54992.phpt Changed

@@ -12,14 +12,14 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'bug54992-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
 CODE;
@@ -28,7 +28,7 @@
 $peerName = 'bug54992_actual_peer_name';
 $wrongPeerName = 'bug54992_expected_peer_name';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -36,7 +36,6 @@
         'peer_name' => '%s',
     );
 
-    phpt_wait();
     $client = stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx);
 
     var_dump($client);
@@ -61,5 +60,5 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:%d (Unknown error) in %s on line %d
 bool(false)

php-8.2.23.tar.xz/ext/openssl/tests/bug62890.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug62890.phpt Changed

php-8.2.23.tar.xz/ext/openssl/tests/bug65538_001.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug65538_001.phpt Changed

php-8.2.23.tar.xz/ext/openssl/tests/bug65538_003.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug65538_003.phpt Changed

php-8.2.23.tar.xz/ext/openssl/tests/bug65729.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug65729.phpt Changed

@@ -12,14 +12,14 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'bug65729-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s'
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     $expected_names = 'foo.test.com.sg', 'foo.test.com', 'FOO.TEST.COM', 'foo.bar.test.com';
     foreach ($expected_names as $name) {
@@ -29,11 +29,9 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
 
-    phpt_wait();
-
     $expected_names = 'foo.test.com.sg', 'foo.test.com', 'FOO.TEST.COM', 'foo.bar.test.com';
     foreach ($expected_names as $expected_name) {
         $clientCtx = stream_context_create('ssl' => 
@@ -65,7 +63,7 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:%d (Unknown error) in %s on line %d
 bool(false)
 resource(%d) of type (stream)
 resource(%d) of type (stream)
@@ -74,5 +72,5 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:%d (Unknown error) in %s on line %d
 bool(false)

php-8.2.23.tar.xz/ext/openssl/tests/bug68265.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug68265.phpt Changed

@@ -12,21 +12,21 @@
 $san = 'DNS:debs.ak-online.be., DNS:debs.ak-online.net.';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server, 30);
 CODE;
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => false,
@@ -34,8 +34,6 @@
         'peer_name' => 'debs.ak-online.net',
     );
 
-    phpt_wait();
-
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
 CODE;

php-8.2.23.tar.xz/ext/openssl/tests/bug68879.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug68879.phpt Changed

@@ -12,21 +12,21 @@
 $san = 'DNS:test.com, DNS:www.test.com, DNS:subdomain.test.com, IP:0:0:0:0:0:FFFF:A02:1, IP:10.2.0.1';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server, 30);
 CODE;
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => false,
@@ -34,8 +34,6 @@
         'peer_name' => '10.2.0.1',
     );
 
-    phpt_wait();
-
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 30, $clientFlags, $clientCtx));
 CODE;

php-8.2.23.tar.xz/ext/openssl/tests/bug68920.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug68920.phpt Changed

@@ -11,14 +11,14 @@
 $certFile = __DIR__ . DIRECTORY_SEPARATOR . 'bug68920.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server, 30);
     stream_socket_accept($server, 30);
@@ -28,11 +28,9 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
 
-    phpt_wait();
-
     $ctx = stream_context_create('ssl' => 'verify_peer'=> false, 'peer_fingerprint' => true);
     $sock = stream_socket_client($serverUri, $errno, $errstr, 30, $clientFlags, $ctx);
     var_dump($sock);

php-8.2.23.tar.xz/ext/openssl/tests/bug69215.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug69215.phpt Changed

@@ -13,7 +13,7 @@
 $serverCertFile = __DIR__ . DIRECTORY_SEPARATOR . 'bug69215-server.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -24,14 +24,14 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server, 30);
 CODE;
 $serverCode = sprintf($serverCode, $serverCertFile, $caCertFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -41,8 +41,6 @@
         'peer_name' => 'bug69215-server',
     );
 
-    phpt_wait();
-
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
 CODE;
 $clientCode = sprintf($clientCode, $clientCertFile, $caCertFile);

php-8.2.23.tar.xz/ext/openssl/tests/bug72333.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug72333.phpt Changed

php-8.2.23.tar.xz/ext/openssl/tests/bug73072.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug73072.phpt Changed

php-8.2.23.tar.xz/ext/openssl/tests/bug74159.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug74159.phpt Changed

@@ -15,7 +15,7 @@
 // not really reliable on more powerful machine but cover different
 // scenarios which might be useful. More reliable test is bug72333.phpt
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:10012";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -23,7 +23,7 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     $client = stream_socket_accept($server, 1);
 
@@ -73,7 +73,7 @@
         exit("$errstr\n");
     });
 
-    $serverUri = "tcp://127.0.0.1:10012";
+    $serverUri = "tcp://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -81,8 +81,6 @@
         'peer_name' => '%s',
     );
 
-    phpt_wait();
-
     $fp = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
 
     stream_set_blocking($fp, false);

php-8.2.23.tar.xz/ext/openssl/tests/bug76705.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug76705.phpt Changed

php-8.2.23.tar.xz/ext/openssl/tests/bug77390.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/bug77390.phpt Changed

@@ -15,11 +15,7 @@
 $clientCode = <<<'CODE'
     $context = stream_context_create('ssl' => 'verify_peer' => false, 'peer_name' => '%s');
 
-    phpt_wait('server');
-    phpt_notify('proxy');
-
-    phpt_wait('proxy');
-    $fp = stream_socket_client("ssl://127.0.0.1:10012", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT, $context);
+    $fp = stream_socket_client("ssl://{{ ADDR }}", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT, $context);
     stream_set_blocking($fp, false);
 
     $read = $fp;
@@ -57,8 +53,8 @@
     $context = stream_context_create('ssl' => 'local_cert' => '%s');
 
     $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
-    $fp = stream_socket_server("ssl://127.0.0.1:10011", $errornum, $errorstr, $flags, $context);
-    phpt_notify();
+    $fp = stream_socket_server("ssl://127.0.0.1:0", $errornum, $errorstr, $flags, $context);
+    phpt_notify_server_start($fp);
 
     $conn = stream_socket_accept($fp);
     fwrite($conn, 'warmup');
@@ -71,14 +67,12 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $proxyCode = <<<'CODE'
-    phpt_wait();
-
-    $upstream = stream_socket_client("tcp://127.0.0.1:10011", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT);
+    $upstream = stream_socket_client("tcp://{{ ADDR }}", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT);
     stream_set_blocking($upstream, false);
 
     $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
-    $server = stream_socket_server("tcp://127.0.0.1:10012", $errornum, $errorstr, $flags);
-    phpt_notify();
+    $server = stream_socket_server("tcp://127.0.0.1:0", $errornum, $errorstr, $flags);
+    phpt_notify_server_start($server);
 
     $conn = stream_socket_accept($server);
     stream_set_blocking($conn, false);

php-8.2.23.tar.xz/ext/openssl/tests/capture_peer_cert_001.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/capture_peer_cert_001.phpt Changed

@@ -12,14 +12,14 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'capture_peer_cert_001-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s'
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
 CODE;
@@ -27,14 +27,13 @@
 
 $peerName = 'capture_peer_cert_001';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'capture_peer_cert' => true,
         'cafile' => '%s'
     );
 
-    phpt_wait();
     $client = @stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
     $cert = stream_context_get_options($clientCtx)'ssl''peer_certificate';
     var_dump(openssl_x509_parse($cert)'subject''CN');

php-8.2.23.tar.xz/ext/openssl/tests/gh10495.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/gh10495.phpt Changed

@@ -15,11 +15,7 @@
 $clientCode = <<<'CODE'
     $context = stream_context_create('ssl' => 'verify_peer' => false, 'peer_name' => '%s');
 
-    phpt_wait('server');
-    phpt_notify('proxy');
-
-    phpt_wait('proxy');
-    $fp = stream_socket_client("tlsv1.2://127.0.0.1:10012", $errornum, $errorstr, 1, STREAM_CLIENT_CONNECT, $context);
+    $fp = stream_socket_client("tlsv1.2://{{ ADDR }}", $errornum, $errorstr, 1, STREAM_CLIENT_CONNECT, $context);
 
     phpt_wait('proxy');
 
@@ -38,8 +34,8 @@
     $context = stream_context_create('ssl' => 'local_cert' => '%s');
 
     $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
-    $fp = stream_socket_server("tlsv1.2://127.0.0.1:10011", $errornum, $errorstr, $flags, $context);
-    phpt_notify();
+    $fp = stream_socket_server("tlsv1.2://127.0.0.1:0", $errornum, $errorstr, $flags, $context);
+    phpt_notify_server_start($fp);
 
     $conn = stream_socket_accept($fp);
     fwrite($conn, 'warmup');
@@ -50,14 +46,12 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $proxyCode = <<<'CODE'
-    phpt_wait();
-
-    $upstream = stream_socket_client("tcp://127.0.0.1:10011", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT);
+    $upstream = stream_socket_client("tcp://{{ ADDR }}", $errornum, $errorstr, 3000, STREAM_CLIENT_CONNECT);
     stream_set_blocking($upstream, false);
 
     $flags = STREAM_SERVER_BIND|STREAM_SERVER_LISTEN;
-    $server = stream_socket_server("tcp://127.0.0.1:10012", $errornum, $errorstr, $flags);
-    phpt_notify();
+    $server = stream_socket_server("tcp://127.0.0.1:0", $errornum, $errorstr, $flags);
+    phpt_notify_server_start($server);
     $conn = stream_socket_accept($server);
     stream_set_blocking($conn, false);

php-8.2.23.tar.xz/ext/openssl/tests/gh13860.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/gh13860.phpt Changed

php-8.2.28.tar.xz/ext/openssl/tests/gh16357.phpt Added

php-8.2.28.tar.xz/ext/openssl/tests/gh16433.phpt Added

php-8.2.23.tar.xz/ext/openssl/tests/gh9310.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/gh9310.phpt Changed

@@ -29,7 +29,7 @@
 $serverCodeTemplate = <<<'CODE'
     ini_set('log_errors', 'On');
     ini_set('open_basedir',  __DIR__ . '/gh9310');
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -37,13 +37,13 @@
     );
 
     $sock = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($sock);
 
     $link = stream_socket_accept($sock);
 CODE;
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
 
     $clientCtx = stream_context_create('ssl' => 
@@ -51,7 +51,6 @@
         'verify_peer_name' => false
     );
 
-    phpt_wait();
     @stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx);
 CODE;
 
@@ -65,8 +64,8 @@
         
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server);
 CODE;
@@ -84,8 +83,8 @@
         
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server);
 CODE;
@@ -103,8 +102,8 @@
         
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     stream_socket_accept($server);
 CODE;
@@ -115,11 +114,9 @@
         'cafile' => __DIR__ . '/sni_server_ca.pem',
     ;
 
-    phpt_wait();
-
     $ctxArr'peer_name' = '%s';
     $ctx = stream_context_create('ssl' => $ctxArr);
-    @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
+    @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
 CODE;
 
 $serverCode = sprintf($serverCodeTemplate, $baseDirCertFile . "\0test", $baseDirPkFile);

php-8.2.28.tar.xz/ext/openssl/tests/openssl_csr_export_to_file_leak.phpt Added

php-8.2.23.tar.xz/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt Changed

@@ -12,14 +12,14 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'openssl_peer_fingerprint_basic-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s'
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -28,7 +28,7 @@
 
 $peerName = 'openssl_peer_fingerprint_basic';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer'       => true,
@@ -37,8 +37,6 @@
         'peer_name'         => '%s',
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'peer_fingerprint', '%s');
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx));
 
@@ -75,6 +73,6 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:%d (Unknown error) in %s on line %d
 bool(false)
 resource(%d) of type (stream)

php-8.2.28.tar.xz/ext/openssl/tests/openssl_pkey_export_to_file_leak.phpt Added

php-8.2.28.tar.xz/ext/openssl/tests/openssl_pkey_export_to_file_object_to_string.phpt Added

php-8.2.28.tar.xz/ext/openssl/tests/openssl_x509_export_to_file_leak.phpt Added

php-8.2.23.tar.xz/ext/openssl/tests/peer_verification.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/peer_verification.phpt Changed

php-8.2.28.tar.xz/ext/openssl/tests/php_openssl_pkey_from_zval_leak.phpt Added

php-8.2.23.tar.xz/ext/openssl/tests/san_ipv6_peer_matching.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/san_ipv6_peer_matching.phpt Changed

@@ -17,14 +17,14 @@
 $san = 'IP:2001:db8:85a3:8d3:1319:8a2e:370:7348';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://::1:64324";
+    $serverUri = "ssl://::1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -32,14 +32,12 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://::1:64324";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => false,
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'peer_name', '2001:db8:85a3:8d3:1319:8a2e:370:7348');
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
 
@@ -65,5 +63,5 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://::1:64324 (Unknown error) in %s on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://::1:%d (Unknown error) in %s on line %d
 bool(false)

php-8.2.23.tar.xz/ext/openssl/tests/san_peer_matching.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/san_peer_matching.phpt Changed

@@ -12,14 +12,14 @@
 $san = 'DNS:example.org, DNS:www.example.org, DNS:test.example.org';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -27,14 +27,12 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => false,
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'peer_name', 'example.org');
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
 
@@ -60,5 +58,5 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:%d (Unknown error) in %s on line %d
 bool(false)

php-8.2.23.tar.xz/ext/openssl/tests/session_meta_capture.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/session_meta_capture.phpt Changed

@@ -12,7 +12,7 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_meta_capture-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -20,7 +20,7 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -31,7 +31,7 @@
 
 $peerName = 'session_meta_capture';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -40,8 +40,6 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT);
     $stream = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
     var_dump(stream_get_meta_data($stream)'crypto''protocol');

php-8.2.23.tar.xz/ext/openssl/tests/session_meta_capture_tlsv13.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/session_meta_capture_tlsv13.phpt Changed

@@ -13,7 +13,7 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'session_meta_capture_tlsv13-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -21,7 +21,7 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
 CODE;
@@ -29,7 +29,7 @@
 
 $peerName = 'session_meta_capture_tlsv13';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -37,8 +37,6 @@
         'peer_name' => '%s'
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT);
     $stream = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
     var_dump(stream_get_meta_data($stream)'crypto''protocol');
@@ -53,5 +51,10 @@
 include 'ServerClientTestCase.inc';
 ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
 ?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_meta_capture_tlsv13.pem.tmp');
+@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'session_meta_capture_tlsv13-ca.pem.tmp');
+?>
 --EXPECT--
 string(7) "TLSv1.3"

php-8.2.23.tar.xz/ext/openssl/tests/sni_server.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/sni_server.phpt Changed

@@ -18,8 +18,8 @@
         
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i=0; $i < 3; $i++) {
         @stream_socket_accept($server, 3);
@@ -33,23 +33,21 @@
         'capture_peer_cert' => true
     ;
 
-    phpt_wait();
-
     $ctxArr'peer_name' = 'cs.php.net';
     $ctx = stream_context_create('ssl' => $ctxArr);
-    $client = stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
+    $client = stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
     $cert = stream_context_get_options($ctx)'ssl''peer_certificate';
     var_dump(openssl_x509_parse($cert)'subject''CN');
 
     $ctxArr'peer_name' = 'uk.php.net';
     $ctx = stream_context_create('ssl' => $ctxArr);
-    $client = @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
+    $client = @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
     $cert = stream_context_get_options($ctx)'ssl''peer_certificate';
     var_dump(openssl_x509_parse($cert)'subject''CN');
 
     $ctxArr'peer_name' = 'us.php.net';
     $ctx = stream_context_create('ssl' => $ctxArr);
-    $client = @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
+    $client = @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
     $cert = stream_context_get_options($ctx)'ssl''peer_certificate';
     var_dump(openssl_x509_parse($cert)'subject''CN');
 CODE;

php-8.2.23.tar.xz/ext/openssl/tests/sni_server_key_cert.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/sni_server_key_cert.phpt Changed

@@ -27,8 +27,8 @@
         
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i=0; $i < 3; $i++) {
         @stream_socket_accept($server, 3);
@@ -42,23 +42,21 @@
         'capture_peer_cert' => true
     ;
 
-    phpt_wait();
-
     $ctxArr'peer_name' = 'cs.php.net';
     $ctx = stream_context_create('ssl' => $ctxArr);
-    $client = stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
+    $client = stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
     $cert = stream_context_get_options($ctx)'ssl''peer_certificate';
     var_dump(openssl_x509_parse($cert)'subject''CN');
 
     $ctxArr'peer_name' = 'uk.php.net';
     $ctx = stream_context_create('ssl' => $ctxArr);
-    $client = @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
+    $client = @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
     $cert = stream_context_get_options($ctx)'ssl''peer_certificate';
     var_dump(openssl_x509_parse($cert)'subject''CN');
 
     $ctxArr'peer_name' = 'us.php.net';
     $ctx = stream_context_create('ssl' => $ctxArr);
-    $client = @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 1, $flags, $ctx);
+    $client = @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 1, $flags, $ctx);
     $cert = stream_context_get_options($ctx)'ssl''peer_certificate';
     var_dump(openssl_x509_parse($cert)'subject''CN');
 CODE;

php-8.2.23.tar.xz/ext/openssl/tests/stream_crypto_flags_001.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/stream_crypto_flags_001.phpt Changed

@@ -12,7 +12,7 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_crypto_flags_001-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -20,7 +20,7 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -30,7 +30,7 @@
 
 $peerName = 'stream_crypto_flags_001';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -39,8 +39,6 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT);
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));

php-8.2.23.tar.xz/ext/openssl/tests/stream_crypto_flags_002.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/stream_crypto_flags_002.phpt Changed

@@ -12,7 +12,7 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_crypto_flags_002-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -20,7 +20,7 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -31,7 +31,7 @@
 
 $peerName = 'stream_crypto_flags_002';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -40,8 +40,6 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT);
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx));

php-8.2.23.tar.xz/ext/openssl/tests/stream_crypto_flags_003.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/stream_crypto_flags_003.phpt Changed

@@ -13,7 +13,7 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_crypto_flags_003-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -24,7 +24,7 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -35,7 +35,7 @@
 
 $peerName = 'stream_crypto_flags_003';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -44,8 +44,6 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
     stream_context_set_option($clientCtx, 'ssl', 'crypto_method', STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
     var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));

php-8.2.23.tar.xz/ext/openssl/tests/stream_crypto_flags_004.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/stream_crypto_flags_004.phpt Changed

@@ -12,7 +12,7 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_crypto_flags_004-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -21,7 +21,7 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
     @stream_socket_accept($server, 1);
@@ -32,7 +32,7 @@
 
 $peerName = 'stream_crypto_flags_004';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -41,8 +41,6 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
     // Should succeed because the SSLv23 handshake here is compatible with the
     // TLSv1 hello method employed in the server
     var_dump(@stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));

php-8.2.23.tar.xz/ext/openssl/tests/stream_security_level.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/stream_security_level.phpt Changed

@@ -19,7 +19,7 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_security_level-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64322";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
@@ -29,14 +29,14 @@
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
 CODE;
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64322";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'security_level' => %d,
@@ -45,7 +45,6 @@
         'verify_peer_name' => false
     );
 
-    phpt_wait();
     $client = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
 
     var_dump($client);
@@ -71,5 +70,5 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s : eval()'d code on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64322 (Unknown error) in %s : eval()'d code on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:%d (Unknown error) in %s : eval()'d code on line %d
 bool(false)

php-8.2.23.tar.xz/ext/openssl/tests/stream_server_reneg_limit.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/stream_server_reneg_limit.phpt Changed

php-8.2.23.tar.xz/ext/openssl/tests/stream_verify_peer_name_001.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/stream_verify_peer_name_001.phpt Changed

@@ -11,14 +11,14 @@
 $certFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_verify_peer_name_001.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s'
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
 CODE;
@@ -26,14 +26,13 @@
 
 $peerName = 'stream_verify_peer_name_001';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => false,
         'peer_name' => '%s'
     );
 
-    phpt_wait();
     $client = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
 
     var_dump($client);

php-8.2.23.tar.xz/ext/openssl/tests/stream_verify_peer_name_002.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/stream_verify_peer_name_002.phpt Changed

@@ -12,14 +12,14 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_verify_peer_name_002-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s'
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
 CODE;
@@ -27,7 +27,7 @@
 
 $actualPeerName = 'stream_verify_peer_name_002';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
@@ -35,7 +35,6 @@
         'verify_peer_name' => false
     );
 
-    phpt_wait();
     $client = stream_socket_client($serverUri, $errno, $errstr, 2, $clientFlags, $clientCtx);
 
     var_dump($client);

php-8.2.23.tar.xz/ext/openssl/tests/stream_verify_peer_name_003.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/stream_verify_peer_name_003.phpt Changed

@@ -12,14 +12,14 @@
 $cacertFile = __DIR__ . DIRECTORY_SEPARATOR . 'stream_verify_peer_name_003-ca.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s'
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     @stream_socket_accept($server, 1);
 CODE;
@@ -27,14 +27,13 @@
 
 $actualPeerName = 'stream_verify_peer_name_003';
 $clientCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://{{ ADDR }}";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'verify_peer' => true,
         'cafile' => '%s'
     );
 
-    phpt_wait();
     $client = stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx);
 
     var_dump($client);
@@ -59,5 +58,5 @@
 
 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
 
-Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d
+Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:%d (Unknown error) in %s on line %d
 bool(false)

php-8.2.23.tar.xz/ext/openssl/tests/streams_crypto_method.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/streams_crypto_method.phpt Changed

@@ -11,14 +11,14 @@
 $certFile = __DIR__ . DIRECTORY_SEPARATOR . 'streams_crypto_method.pem.tmp';
 
 $serverCode = <<<'CODE'
-    $serverUri = "ssl://127.0.0.1:64321";
+    $serverUri = "ssl://127.0.0.1:0";
     $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
     $serverCtx = stream_context_create('ssl' => 
         'local_cert' => '%s',
     );
 
     $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
-    phpt_notify();
+    phpt_notify_server_start($server);
 
     $client = @stream_socket_accept($server);
     if ($client) {
@@ -39,7 +39,7 @@
 $serverCode = sprintf($serverCode, $certFile);
 
 $clientCode = <<<'CODE'
-    $serverUri = "https://127.0.0.1:64321/";
+    $serverUri = "https://{{ ADDR }}/";
     $clientFlags = STREAM_CLIENT_CONNECT;
     $clientCtx = stream_context_create('ssl' => 
         'crypto_method' => STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT,
@@ -47,7 +47,6 @@
         'verify_peer_name' => false
     );
 
-    phpt_wait();
     echo file_get_contents($serverUri, false, $clientCtx);
 CODE;

php-8.2.23.tar.xz/ext/openssl/tests/tls_min_v1.0_max_v1.1_wrapper.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/tls_min_v1.0_max_v1.1_wrapper.phpt Changed

@@ -19,8 +19,8 @@
         'security_level' => 0,
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i=0; $i < (phpt_has_sslv3() ? 6 : 5); $i++) {
         @stream_socket_accept($server, 3);
@@ -36,24 +36,22 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
-    $client = stream_socket_client("tlsv1.0://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = stream_socket_client("tlsv1.0://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("sslv3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.1://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.1://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.2://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("ssl://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("ssl://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 CODE;

php-8.2.23.tar.xz/ext/openssl/tests/tls_wrapper.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/tls_wrapper.phpt Changed

@@ -18,8 +18,8 @@
         'security_level' => 0,
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i = 0; $i < (phpt_has_sslv3() ? 6 : 5); $i++) {
         @stream_socket_accept($server, 3);
@@ -35,24 +35,22 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
-    $client = stream_socket_client("tlsv1.0://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = stream_socket_client("tlsv1.0://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("sslv3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.1://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.1://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.2://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("ssl://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("ssl://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 CODE;

php-8.2.23.tar.xz/ext/openssl/tests/tls_wrapper_with_tls_v1.3.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/tls_wrapper_with_tls_v1.3.phpt Changed

@@ -18,8 +18,8 @@
         'security_level' => 0,
     );
 
-    $server = stream_socket_server('tls://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tls://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i = 0; $i < (phpt_has_sslv3() ? 7 : 6); $i++) {
         @stream_socket_accept($server, 3);
@@ -35,27 +35,25 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
-    $client = stream_socket_client("tlsv1.0://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = stream_socket_client("tlsv1.0://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("sslv3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.1://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.1://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.2://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("ssl://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("ssl://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tls://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tls://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 CODE;

php-8.2.23.tar.xz/ext/openssl/tests/tlsv1.0_wrapper.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/tlsv1.0_wrapper.phpt Changed

@@ -17,8 +17,8 @@
         'security_level' => 0,
     );
 
-    $server = stream_socket_server('tlsv1.0://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tlsv1.0://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i = 0; $i < (phpt_has_sslv3() ? 3 : 2); $i++) {
         @stream_socket_accept($server, 3);
@@ -34,15 +34,13 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
-    $client = stream_socket_client("tlsv1.0://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = stream_socket_client("tlsv1.0://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("sslv3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.2://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 CODE;

php-8.2.23.tar.xz/ext/openssl/tests/tlsv1.1_wrapper.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/tlsv1.1_wrapper.phpt Changed

@@ -17,8 +17,8 @@
         'security_level' => 0,
     );
 
-    $server = stream_socket_server('tlsv1.1://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tlsv1.1://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i = 0; $i < (phpt_has_sslv3() ? 3 : 2); $i++) {
         @stream_socket_accept($server, 3);
@@ -34,15 +34,13 @@
         'security_level' => 0,
     );
 
-    phpt_wait();
-
-    $client = stream_socket_client("tlsv1.1://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = stream_socket_client("tlsv1.1://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("sslv3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.2://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 CODE;

php-8.2.23.tar.xz/ext/openssl/tests/tlsv1.2_wrapper.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/tlsv1.2_wrapper.phpt Changed

@@ -16,8 +16,8 @@
         'local_cert' => '%s',
     );
 
-    $server = stream_socket_server('tlsv1.2://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tlsv1.2://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i = 0; $i < (phpt_has_sslv3() ? 3 : 2); $i++) {
         @stream_socket_accept($server, 3);
@@ -32,15 +32,13 @@
         'verify_peer_name' => false,
     );
 
-    phpt_wait();
-
-    $client = stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = stream_socket_client("tlsv1.2://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("sslv3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("sslv3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.1://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.1://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 CODE;

php-8.2.23.tar.xz/ext/openssl/tests/tlsv1.3_wrapper.phpt -> php-8.2.28.tar.xz/ext/openssl/tests/tlsv1.3_wrapper.phpt Changed

@@ -17,8 +17,8 @@
         'local_cert' => '%s',
     );
 
-    $server = stream_socket_server('tlsv1.3://127.0.0.1:64321', $errno, $errstr, $flags, $ctx);
-    phpt_notify();
+    $server = stream_socket_server('tlsv1.3://127.0.0.1:0', $errno, $errstr, $flags, $ctx);
+    phpt_notify_server_start($server);
 
     for ($i=0; $i < 3; $i++) {
         @stream_socket_accept($server, 3);
@@ -33,15 +33,13 @@
         'verify_peer_name' => false,
     );
 
-    phpt_wait();
-
-    $client = stream_socket_client("tlsv1.3://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = stream_socket_client("tlsv1.3://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.0://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.0://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 
-    $client = @stream_socket_client("tlsv1.2://127.0.0.1:64321", $errno, $errstr, 3, $flags, $ctx);
+    $client = @stream_socket_client("tlsv1.2://{{ ADDR }}", $errno, $errstr, 3, $flags, $ctx);
     var_dump($client);
 CODE;

php-8.2.23.tar.xz/ext/pcre/php_pcre.c -> php-8.2.28.tar.xz/ext/pcre/php_pcre.c Changed

php-8.2.28.tar.xz/ext/pcre/tests/gh16184.phpt Added

php-8.2.28.tar.xz/ext/pcre/tests/gh16189.phpt Added

php-8.2.23.tar.xz/ext/pdo/pdo_sql_parser.c -> php-8.2.28.tar.xz/ext/pdo/pdo_sql_parser.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 3.1 */
+/* Generated by re2c 2.0.3 */
 /*
   +----------------------------------------------------------------------+
   | Copyright (c) The PHP Group                                          |
@@ -53,303 +53,303 @@
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case 0x00: goto yy1;
-		case '"': goto yy4;
-		case '\'': goto yy6;
-		case '(':
-		case ')':
-		case '*':
-		case '+':
-		case ',':
-		case '.': goto yy7;
-		case '-': goto yy8;
-		case '/': goto yy9;
-		case ':': goto yy10;
-		case '?': goto yy11;
-		default: goto yy2;
+	case 0x00:	goto yy2;
+	case '"':	goto yy6;
+	case '\'':	goto yy8;
+	case '(':
+	case ')':
+	case '*':
+	case '+':
+	case ',':
+	case '.':	goto yy9;
+	case '-':	goto yy10;
+	case '/':	goto yy11;
+	case ':':	goto yy12;
+	case '?':	goto yy13;
+	default:	goto yy3;
 	}
-yy1:
-	YYCURSOR = YYMARKER;
-	goto yy5;
 yy2:
+	YYCURSOR = YYMARKER;
+	goto yy7;
+yy3:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case 0x00:
-		case '"':
-		case '\'':
-		case '(':
-		case ')':
-		case '*':
-		case '+':
-		case ',':
-		case '-':
-		case '.':
-		case '/':
-		case ':':
-		case '?': goto yy3;
-		default: goto yy2;
+	case 0x00:
+	case '"':
+	case '\'':
+	case '(':
+	case ')':
+	case '*':
+	case '+':
+	case ',':
+	case '-':
+	case '.':
+	case '/':
+	case ':':
+	case '?':	goto yy5;
+	default:	goto yy3;
 	}
-yy3:
-	{ RET(PDO_PARSER_TEXT); }
-yy4:
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych >= 0x01) goto yy14;
 yy5:
-	{ SKIP_ONE(PDO_PARSER_TEXT); }
+	{ RET(PDO_PARSER_TEXT); }
 yy6:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x00) goto yy5;
-	goto yy18;
+	if (yych >= 0x01) goto yy16;
 yy7:
-	++YYCURSOR;
-	goto yy5;
+	{ SKIP_ONE(PDO_PARSER_TEXT); }
 yy8:
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= 0x00) goto yy7;
+	goto yy21;
+yy9:
+	++YYCURSOR;
+	goto yy7;
+yy10:
 	yych = *++YYCURSOR;
 	switch (yych) {
-		case '-': goto yy21;
-		default: goto yy5;
+	case '-':	goto yy25;
+	default:	goto yy7;
 	}
-yy9:
+yy11:
 	yych = *++YYCURSOR;
 	switch (yych) {
-		case '*': goto yy23;
-		default: goto yy5;
+	case '*':	goto yy28;
+	default:	goto yy7;
 	}
-yy10:
+yy12:
 	yych = *++YYCURSOR;
 	switch (yych) {
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		case '8':
-		case '9':
-		case 'A':
-		case 'B':
-		case 'C':
-		case 'D':
-		case 'E':
-		case 'F':
-		case 'G':
-		case 'H':
-		case 'I':
-		case 'J':
-		case 'K':
-		case 'L':
-		case 'M':
-		case 'N':
-		case 'O':
-		case 'P':
-		case 'Q':
-		case 'R':
-		case 'S':
-		case 'T':
-		case 'U':
-		case 'V':
-		case 'W':
-		case 'X':
-		case 'Y':
-		case 'Z':
-		case '_':
-		case 'a':
-		case 'b':
-		case 'c':
-		case 'd':
-		case 'e':
-		case 'f':
-		case 'g':
-		case 'h':
-		case 'i':
-		case 'j':
-		case 'k':
-		case 'l':
-		case 'm':
-		case 'n':
-		case 'o':
-		case 'p':
-		case 'q':
-		case 'r':
-		case 's':
-		case 't':
-		case 'u':
-		case 'v':
-		case 'w':
-		case 'x':
-		case 'y':
-		case 'z': goto yy24;
-		case ':': goto yy26;
-		default: goto yy5;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':
+	case '_':
+	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy30;
+	case ':':	goto yy33;
+	default:	goto yy7;
 	}
-yy11:
+yy13:
 	yych = *++YYCURSOR;
 	switch (yych) {
-		case '?': goto yy28;
-		default: goto yy12;
+	case '?':	goto yy36;
+	default:	goto yy14;
 	}
-yy12:
+yy14:
 	{ RET(PDO_PARSER_BIND_POS); }
-yy13:
+yy15:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy14:
+yy16:
 	switch (yych) {
-		case 0x00: goto yy1;
-		case '"': goto yy15;
-		case '\\': goto yy16;
-		default: goto yy13;
+	case 0x00:	goto yy2;
+	case '"':	goto yy17;
+	case '\\':	goto yy19;
+	default:	goto yy15;
 	}
-yy15:
+yy17:
 	++YYCURSOR;
 	{ RET(PDO_PARSER_TEXT); }
-yy16:
+yy19:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= 0x00) goto yy1;
-	goto yy13;
-yy17:
+	if (yych <= 0x00) goto yy2;
+	goto yy15;
+yy20:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy18:
+yy21:
 	switch (yych) {
-		case 0x00: goto yy1;
-		case '\'': goto yy19;
-		case '\\': goto yy20;
-		default: goto yy17;
+	case 0x00:	goto yy2;
+	case '\'':	goto yy22;
+	case '\\':	goto yy24;
+	default:	goto yy20;
 	}
-yy19:
+yy22:
 	++YYCURSOR;
 	{ RET(PDO_PARSER_TEXT); }
-yy20:
+yy24:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= 0x00) goto yy1;
-	goto yy17;
-yy21:
+	if (yych <= 0x00) goto yy2;
+	goto yy20;
+yy25:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case '\n':
-		case '\r': goto yy22;
-		default: goto yy21;
+	case '\n':
+	case '\r':	goto yy27;
+	default:	goto yy25;
 	}
-yy22:
+yy27:
 	{ RET(PDO_PARSER_TEXT); }
-yy23:
+yy28:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case '*': goto yy29;
-		default: goto yy23;
+	case '*':	goto yy38;
+	default:	goto yy28;
 	}
-yy24:
+yy30:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		case '8':
-		case '9':
-		case 'A':
-		case 'B':
-		case 'C':
-		case 'D':
-		case 'E':
-		case 'F':
-		case 'G':
-		case 'H':
-		case 'I':
-		case 'J':
-		case 'K':
-		case 'L':
-		case 'M':
-		case 'N':
-		case 'O':
-		case 'P':
-		case 'Q':
-		case 'R':
-		case 'S':
-		case 'T':
-		case 'U':
-		case 'V':
-		case 'W':
-		case 'X':
-		case 'Y':
-		case 'Z':
-		case '_':
-		case 'a':
-		case 'b':
-		case 'c':
-		case 'd':
-		case 'e':
-		case 'f':
-		case 'g':
-		case 'h':
-		case 'i':
-		case 'j':
-		case 'k':
-		case 'l':
-		case 'm':
-		case 'n':
-		case 'o':
-		case 'p':
-		case 'q':
-		case 'r':
-		case 's':
-		case 't':
-		case 'u':
-		case 'v':
-		case 'w':
-		case 'x':
-		case 'y':
-		case 'z': goto yy24;
-		default: goto yy25;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':
+	case '_':
+	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy30;
+	default:	goto yy32;
 	}
-yy25:
+yy32:
 	{ RET(PDO_PARSER_BIND); }
-yy26:
+yy33:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case ':': goto yy26;
-		default: goto yy27;
+	case ':':	goto yy33;
+	default:	goto yy35;
 	}
-yy27:
+yy35:
 	{ RET(PDO_PARSER_TEXT); }
-yy28:
+yy36:
 	++YYCURSOR;
 	{ RET(PDO_PARSER_ESCAPED_QUESTION); }
-yy29:
+yy38:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case '*': goto yy29;
-		case '/': goto yy30;
-		default: goto yy23;
+	case '*':	goto yy38;
+	case '/':	goto yy40;
+	default:	goto yy28;
 	}
-yy30:
+yy40:
 	++YYCURSOR;
-	goto yy22;
+	goto yy27;
 }
 
 }

php-8.2.23.tar.xz/ext/pdo/pdo_stmt.c -> php-8.2.28.tar.xz/ext/pdo/pdo_stmt.c Changed

@@ -2077,6 +2077,23 @@
 	return fbc;
 }
 
+static HashTable *dbstmt_get_gc(zend_object *object, zval **gc_data, int *gc_count)
+{
+	pdo_stmt_t *stmt = php_pdo_stmt_fetch_object(object);
+	*gc_data = &stmt->fetch.into;
+	*gc_count = 1;
+
+	/**
+	 * If there are no dynamic properties and the default property is 1 (that is, there is only one property
+	 * of string that does not participate in GC), there is no need to call zend_std_get_properties().
+	 */
+	if (object->properties == NULL && object->ce->default_properties_count <= 1) {
+		return NULL;
+	} else {
+		return zend_std_get_properties(object);
+	}
+}
+
 zend_object_handlers pdo_dbstmt_object_handlers;
 zend_object_handlers pdo_row_object_handlers;
 
@@ -2495,6 +2512,7 @@
 	pdo_dbstmt_object_handlers.get_method = dbstmt_method_get;
 	pdo_dbstmt_object_handlers.compare = zend_objects_not_comparable;
 	pdo_dbstmt_object_handlers.clone_obj = NULL;
+	pdo_dbstmt_object_handlers.get_gc = dbstmt_get_gc;
 
 	pdo_row_ce = register_class_PDORow();
 	pdo_row_ce->create_object = pdo_row_new;

php-8.2.28.tar.xz/ext/pdo/tests/gh16703.phpt Added

@@ -0,0 +1,48 @@
+--TEST--
+GH-16703: Memory leak of setFetchMode()
+--EXTENSIONS--
+pdo
+--SKIPIF--
+<?php
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.__DIR__ . '/../../pdo/tests/');
+class TestStmt extends PDOStatement
+{
+    public $name;
+}
+
+$db = new PDO(
+    getenv('PDOTEST_DSN'),
+    getenv('PDOTEST_USER') ?: null,
+    getenv('PDOTEST_PASS') ?: null,
+    
+        PDO::ATTR_CASE => PDO::CASE_LOWER,
+        PDO::ATTR_STATEMENT_CLASS => TestStmt::class,
+    ,
+);
+
+$db->exec('CREATE TABLE gh16703 (name varchar(255))');
+$db->exec("INSERT INTO gh16703 (name) VALUES ('test_name')");
+
+$stmt = $db->query('SELECT name FROM gh16703');
+$t = $stmt;
+$stmt->setFetchMode(PDO::FETCH_INTO, $stmt);
+$stmt->fetch();
+echo "done!\n";
+?>
+--CLEAN--
+<?php
+if (getenv('PDOTEST_DSN') === 'sqlite::memory:') return;
+
+require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
+$db = PDOTest::factory();
+$db->exec('DROP TABLE gh16703');
+?>
+--EXPECT--
+done!

php-8.2.23.tar.xz/ext/pdo_dblib/dblib_driver.c -> php-8.2.28.tar.xz/ext/pdo_dblib/dblib_driver.c Changed

php-8.2.28.tar.xz/ext/pdo_dblib/tests/GHSA-5hqh-c84r-qjcv.phpt Added

php-8.2.23.tar.xz/ext/pdo_firebird/firebird_driver.c -> php-8.2.28.tar.xz/ext/pdo_firebird/firebird_driver.c Changed

php-8.2.23.tar.xz/ext/pdo_oci/php_pdo_oci_int.h -> php-8.2.28.tar.xz/ext/pdo_oci/php_pdo_oci_int.h Changed

php-8.2.23.tar.xz/ext/pdo_odbc/odbc_stmt.c -> php-8.2.28.tar.xz/ext/pdo_odbc/odbc_stmt.c Changed

php-8.2.28.tar.xz/ext/pdo_odbc/tests/gh16450.phpt Added

@@ -0,0 +1,35 @@
+--TEST--
+GH-16450 (PDO_ODBC can inject garbage into field values)
+--EXTENSIONS--
+pdo_odbc
+--SKIPIF--
+<?php
+$dbpath = __DIR__ . "/test.mdb";
+try {
+    new PDO("odbc:Driver={Microsoft Access Driver (*.mdb, *.accdb)};Dbq=$dbpath;Uid=Admin;Pwd=;");
+} catch (PDOException $ex) {
+    die("skip Cannot connect to MS Access database");
+}
+?>
+--FILE--
+<?php
+$dbpath = __DIR__ . "/test.mdb";
+$pdo = new PDO("odbc:Driver={Microsoft Access Driver (*.mdb, *.accdb)};Dbq=$dbpath;Uid=Admin;Pwd=;");
+
+$pdo->exec("CREATE TABLE gh16450 (Id INT, MyLongText LONGCHAR)");
+$pdo->exec(sprintf("INSERT INTO gh16450 VALUES (1, '%s')", str_repeat("_", 2048)));
+$pdo->exec(sprintf("INSERT INTO gh16450 VALUES (1, '%s')", str_repeat("_", 2049)));
+
+$stmt = $pdo->query("SELECT MyLongText FROM gh16450");
+var_dump($stmt->fetchColumn(0));
+var_dump($stmt->fetchColumn(0));
+?>
+--CLEAN--
+<?php
+$dbpath = __DIR__ . "/test.mdb";
+$pdo = new PDO("odbc:Driver={Microsoft Access Driver (*.mdb, *.accdb)};Dbq=$dbpath;Uid=Admin;Pwd=;");
+$pdo->exec("DROP TABLE gh16450");
+?>
+--EXPECT--
+string(2048) "________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________"
+string(2049) "_________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________"

php-8.2.28.tar.xz/ext/pdo_odbc/tests/test.mdb Added

php-8.2.23.tar.xz/ext/pgsql/tests/80_bug14383.phpt -> php-8.2.28.tar.xz/ext/pgsql/tests/80_bug14383.phpt Changed

php-8.2.23.tar.xz/ext/phar/phar.c -> php-8.2.28.tar.xz/ext/phar/phar.c Changed

@@ -457,14 +457,14 @@
 
 #ifdef WORDS_BIGENDIAN
 # define PHAR_GET_32(buffer, var) \
-	var = ((((unsigned char*)(buffer))3) << 24) \
-		| ((((unsigned char*)(buffer))2) << 16) \
-		| ((((unsigned char*)(buffer))1) <<  8) \
-		| (((unsigned char*)(buffer))0); \
+	var = ((uint32_t)(((unsigned char*)(buffer))3) << 24) \
+		| ((uint32_t)(((unsigned char*)(buffer))2) << 16) \
+		| ((uint32_t)(((unsigned char*)(buffer))1) <<  8) \
+		| ((uint32_t)((unsigned char*)(buffer))0); \
 	(buffer) += 4
 # define PHAR_GET_16(buffer, var) \
-	var = ((((unsigned char*)(buffer))1) <<  8) \
-		| (((unsigned char*)(buffer))0); \
+	var = ((uint16_t)(((unsigned char*)(buffer))1) <<  8) \
+		| ((uint16_t)((unsigned char*)(buffer))0); \
 	(buffer) += 2
 #else
 # define PHAR_GET_32(buffer, var) \
@@ -1774,7 +1774,7 @@
 				return phar_parse_zipfile(fp, fname, fname_len, alias, alias_len, pphar, error);
 			}
 
-			if (got > 512) {
+			if (got >= 512) {
 				if (phar_is_tar(pos, fname)) {
 					php_stream_rewind(fp);
 					return phar_parse_tarfile(fp, fname, fname_len, alias, alias_len, pphar, is_data, compression, error);

php-8.2.23.tar.xz/ext/phar/phar_object.c -> php-8.2.28.tar.xz/ext/phar/phar_object.c Changed

php-8.2.23.tar.xz/ext/phar/phar_path_check.c -> php-8.2.28.tar.xz/ext/phar/phar_path_check.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 3.1 */
+/* Generated by re2c 2.0.3 */
 /*
   +----------------------------------------------------------------------+
   | phar php single-file executable PHP extension                        |
@@ -48,42 +48,42 @@
 	if (yych <= '') {
 		if (yych <= ')') {
 			if (yych <= '\f') {
-				if (yych >= 0x01) goto yy1;
+				if (yych >= 0x01) goto yy4;
 			} else {
-				if (yych <= '\r') goto yy3;
-				if (yych <= 0x19) goto yy1;
-				goto yy4;
+				if (yych <= '\r') goto yy6;
+				if (yych <= 0x19) goto yy4;
+				goto yy7;
 			}
 		} else {
 			if (yych <= '/') {
-				if (yych <= '*') goto yy6;
-				if (yych <= '.') goto yy4;
-				goto yy7;
+				if (yych <= '*') goto yy9;
+				if (yych <= '.') goto yy7;
+				goto yy11;
 			} else {
-				if (yych == '?') goto yy8;
-				goto yy4;
+				if (yych == '?') goto yy12;
+				goto yy7;
 			}
 		}
 	} else {
 		if (yych <= 0xEC) {
 			if (yych <= 0xC1) {
-				if (yych <= '\\') goto yy9;
-				if (yych <= 0x7F) goto yy4;
-				goto yy1;
+				if (yych <= '\\') goto yy14;
+				if (yych <= 0x7F) goto yy7;
+				goto yy4;
 			} else {
-				if (yych <= 0xDF) goto yy10;
-				if (yych <= 0xE0) goto yy11;
-				goto yy12;
+				if (yych <= 0xDF) goto yy16;
+				if (yych <= 0xE0) goto yy17;
+				goto yy18;
 			}
 		} else {
 			if (yych <= 0xF0) {
-				if (yych <= 0xED) goto yy13;
-				if (yych <= 0xEF) goto yy12;
-				goto yy14;
+				if (yych <= 0xED) goto yy19;
+				if (yych <= 0xEF) goto yy18;
+				goto yy20;
 			} else {
-				if (yych <= 0xF3) goto yy15;
-				if (yych <= 0xF4) goto yy16;
-				goto yy1;
+				if (yych <= 0xF3) goto yy21;
+				if (yych <= 0xF4) goto yy22;
+				goto yy4;
 			}
 		}
 	}
@@ -101,37 +101,37 @@
 			*error = NULL;
 			return pcr_is_ok;
 		}
-yy1:
+yy4:
 	++YYCURSOR;
-yy2:
+yy5:
 	{
 			*error ="illegal character";
 			return pcr_err_illegal_char;
 		}
-yy3:
+yy6:
 	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy1;
-	goto yy2;
-yy4:
+	if (yych == '\n') goto yy4;
+	goto yy5;
+yy7:
 	++YYCURSOR;
-yy5:
+yy8:
 	{
 			goto loop;
 		}
-yy6:
+yy9:
 	++YYCURSOR;
 	{
 			*error = "star";
 			return pcr_err_star;
 		}
-yy7:
+yy11:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '-') goto yy5;
-	if (yych <= '.') goto yy17;
-	if (yych <= '/') goto yy19;
-	goto yy5;
-yy8:
+	if (yych <= '-') goto yy8;
+	if (yych <= '.') goto yy23;
+	if (yych <= '/') goto yy25;
+	goto yy8;
+yy12:
 	++YYCURSOR;
 	{
 			if (**s == '/') {
@@ -141,93 +141,93 @@
 			*error = NULL;
 			return pcr_use_query;
 		}
-yy9:
+yy14:
 	++YYCURSOR;
 	{
 			*error = "back-slash";
 			return pcr_err_back_slash;
 		}
-yy10:
+yy16:
 	yych = *++YYCURSOR;
-	if (yych <= 0x7F) goto yy2;
-	if (yych <= 0xBF) goto yy4;
-	goto yy2;
-yy11:
+	if (yych <= 0x7F) goto yy5;
+	if (yych <= 0xBF) goto yy7;
+	goto yy5;
+yy17:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x9F) goto yy2;
-	if (yych <= 0xBF) goto yy20;
-	goto yy2;
-yy12:
+	if (yych <= 0x9F) goto yy5;
+	if (yych <= 0xBF) goto yy27;
+	goto yy5;
+yy18:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x7F) goto yy2;
-	if (yych <= 0xBF) goto yy20;
-	goto yy2;
-yy13:
+	if (yych <= 0x7F) goto yy5;
+	if (yych <= 0xBF) goto yy27;
+	goto yy5;
+yy19:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x7F) goto yy2;
-	if (yych <= 0x9F) goto yy20;
-	goto yy2;
-yy14:
+	if (yych <= 0x7F) goto yy5;
+	if (yych <= 0x9F) goto yy27;
+	goto yy5;
+yy20:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x8F) goto yy2;
-	if (yych <= 0xBF) goto yy21;
-	goto yy2;
-yy15:
+	if (yych <= 0x8F) goto yy5;
+	if (yych <= 0xBF) goto yy28;
+	goto yy5;
+yy21:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x7F) goto yy2;
-	if (yych <= 0xBF) goto yy21;
-	goto yy2;
-yy16:
+	if (yych <= 0x7F) goto yy5;
+	if (yych <= 0xBF) goto yy28;
+	goto yy5;
+yy22:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x7F) goto yy2;
-	if (yych <= 0x8F) goto yy21;
-	goto yy2;
-yy17:
+	if (yych <= 0x7F) goto yy5;
+	if (yych <= 0x8F) goto yy28;
+	goto yy5;
+yy23:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy22;
-	if (yych <= '-') goto yy18;
-	if (yych <= '.') goto yy23;
-	if (yych <= '/') goto yy22;
-yy18:
+	if (yych <= 0x00) goto yy29;
+	if (yych <= '-') goto yy24;
+	if (yych <= '.') goto yy31;
+	if (yych <= '/') goto yy29;
+yy24:
 	YYCURSOR = YYMARKER;
 	if (yyaccept == 0) {
-		goto yy5;
+		goto yy8;
 	} else {
-		goto yy2;
+		goto yy5;
 	}
-yy19:
+yy25:
 	++YYCURSOR;
 	{
 			*error = "double slash";
 			return pcr_err_double_slash;
 		}
-yy20:
+yy27:
 	yych = *++YYCURSOR;
-	if (yych <= 0x7F) goto yy18;
-	if (yych <= 0xBF) goto yy4;
-	goto yy18;
-yy21:
+	if (yych <= 0x7F) goto yy24;
+	if (yych <= 0xBF) goto yy7;
+	goto yy24;
+yy28:
 	yych = *++YYCURSOR;
-	if (yych <= 0x7F) goto yy18;
-	if (yych <= 0xBF) goto yy20;
-	goto yy18;
-yy22:
+	if (yych <= 0x7F) goto yy24;
+	if (yych <= 0xBF) goto yy27;
+	goto yy24;
+yy29:
 	++YYCURSOR;
 	{
 			*error = "current directory reference";
 			return pcr_err_curr_dir;
 		}
-yy23:
+yy31:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy24;
-	if (yych != '/') goto yy18;
-yy24:
+	if (yych <= 0x00) goto yy32;
+	if (yych != '/') goto yy24;
+yy32:
 	++YYCURSOR;
 	{
 			*error = "upper directory reference";

php-8.2.23.tar.xz/ext/phar/tar.c -> php-8.2.28.tar.xz/ext/phar/tar.c Changed

php-8.2.23.tar.xz/ext/phar/tests/033.phpt -> php-8.2.28.tar.xz/ext/phar/tests/033.phpt Changed

php-8.2.23.tar.xz/ext/phar/tests/033a.phpt -> php-8.2.28.tar.xz/ext/phar/tests/033a.phpt Changed

php-8.2.28.tar.xz/ext/phar/tests/gh16406.phpt Added

php-8.2.23.tar.xz/ext/phar/tests/phar_oo_002.phpt -> php-8.2.28.tar.xz/ext/phar/tests/phar_oo_002.phpt Changed

php-8.2.23.tar.xz/ext/phar/tests/phar_oo_iswriteable.phpt -> php-8.2.28.tar.xz/ext/phar/tests/phar_oo_iswriteable.phpt Changed

php-8.2.23.tar.xz/ext/phar/tests/stat.phpt -> php-8.2.28.tar.xz/ext/phar/tests/stat.phpt Changed

php-8.2.23.tar.xz/ext/phar/tests/tar/033.phpt -> php-8.2.28.tar.xz/ext/phar/tests/tar/033.phpt Changed

php-8.2.23.tar.xz/ext/phar/tests/tar/033a.phpt -> php-8.2.28.tar.xz/ext/phar/tests/tar/033a.phpt Changed

php-8.2.28.tar.xz/ext/phar/tests/tar/gh16695_1.phpt Added

@@ -0,0 +1,28 @@
+--TEST--
+GH-16695 (phar:// tar parser and zero-length file header blocks)
+--CREDITS--
+hakre
+--EXTENSIONS--
+phar
+--INI--
+phar.require_hash=0
+--FILE--
+<?php
+
+$reportTar = __DIR__.'/gh16695_1.tmp';
+
+$length = file_put_contents($reportTar, base64_decode('dGxzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMDA3MDAAMDAwMDAwMAAwMDAwMDAwADAwMDAwMDAwMDAwADAwMDAwMDAwMDAwADAwNzcxNgAgNQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB1c3RhcgAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMDAwMDAwADAwMDAwMDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA='));
+var_dump($length);
+$buffer = file_get_contents("phar://$reportTar/tls");
+var_dump($buffer);
+
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__.'/gh16695_1.tmp');
+?>
+--EXPECTF--
+int(512)
+
+Warning: file_get_contents(%stls): Failed to open stream: phar error: path "tls" is a directory in %s on line %d
+bool(false)

php-8.2.28.tar.xz/ext/phar/tests/tar/gh16695_2.phpt Added

@@ -0,0 +1,26 @@
+--TEST--
+GH-16695 (phar:// tar parser and zero-length file header blocks)
+--CREDITS--
+hakre
+--EXTENSIONS--
+phar
+--INI--
+phar.require_hash=0
+--FILE--
+<?php
+
+$reportTar = __DIR__.'/gh16695_2.tmp';
+
+$length = file_put_contents($reportTar, base64_decode('bWV0YS5qc29uAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMDA2NDQAMDAwMDAwMAAwMDAwMDAwADAwMDAwMDAwMTcyADAwMDAwMDAwMDAwADAxMTAyNgAgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB1c3RhcgAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMDAwMDAwADAwMDAwMDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB7Ik5hbWUiOiJkZWZhdWx0IiwiTWV0YWRhdGEiOnt9LCJFbmRwb2ludHMiOnsiZG9ja2VyIjp7Ikhvc3QiOiJ1bml4Oi8vL3J1bi91c2VyLzEwMDAvZG9ja2VyLnNvY2siLCJTa2lwVExTVmVyaWZ5IjpmYWxzZX19fQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=='));
+var_dump($length);
+$buffer = file_get_contents("phar://$reportTar/meta.json");
+var_dump($buffer);
+
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__.'/gh16695_2.tmp');
+?>
+--EXPECT--
+int(1024)
+string(122) "{"Name":"default","Metadata":{},"Endpoints":{"docker":{"Host":"unix:///run/user/1000/docker.sock","SkipTLSVerify":false}}}"

php-8.2.28.tar.xz/ext/phar/tests/tar/gh16695_3.phpt Added

php-8.2.23.tar.xz/ext/phar/tests/zip/033.phpt -> php-8.2.28.tar.xz/ext/phar/tests/zip/033.phpt Changed

php-8.2.23.tar.xz/ext/phar/tests/zip/033a.phpt -> php-8.2.28.tar.xz/ext/phar/tests/zip/033a.phpt Changed

php-8.2.23.tar.xz/ext/posix/tests/posix_getgrnam_basic.phpt -> php-8.2.28.tar.xz/ext/posix/tests/posix_getgrnam_basic.phpt Changed

php-8.2.23.tar.xz/ext/posix/tests/posix_getgroups_basic.phpt -> php-8.2.28.tar.xz/ext/posix/tests/posix_getgroups_basic.phpt Changed

php-8.2.23.tar.xz/ext/random/config.m4 -> php-8.2.28.tar.xz/ext/random/config.m4 Changed

php-8.2.23.tar.xz/ext/random/random.c -> php-8.2.28.tar.xz/ext/random/random.c Changed

@@ -48,7 +48,7 @@
 
 #if HAVE_SYS_PARAM_H
 # include <sys/param.h>
-# if (__FreeBSD__ && __FreeBSD_version > 1200000) || (__DragonFly__ && __DragonFly_version >= 500700) || defined(__sun)
+# if (__FreeBSD__ && __FreeBSD_version > 1200000) || (__DragonFly__ && __DragonFly_version >= 500700) || (defined(__sun) && defined(HAVE_GETRANDOM))
 #  include <sys/random.h>
 # endif
 #endif
@@ -511,7 +511,7 @@
 #else
 	size_t read_bytes = 0;
 	ssize_t n;
-# if (defined(__linux__) && defined(SYS_getrandom)) || (defined(__FreeBSD__) && __FreeBSD_version >= 1200000) || (defined(__DragonFly__) && __DragonFly_version >= 500700) || defined(__sun)
+# if (defined(__linux__) && defined(SYS_getrandom)) || (defined(__FreeBSD__) && __FreeBSD_version >= 1200000) || (defined(__DragonFly__) && __DragonFly_version >= 500700) || (defined(__sun) && defined(HAVE_GETRANDOM))
 	/* Linux getrandom(2) syscall or FreeBSD/DragonFlyBSD getrandom(2) function*/
 	/* Keep reading until we get enough entropy */
 	while (read_bytes < size) {

php-8.2.23.tar.xz/ext/reflection/php_reflection.c -> php-8.2.28.tar.xz/ext/reflection/php_reflection.c Changed

@@ -217,18 +217,26 @@
 }
 /* }}} */
 
+static void reflection_free_property_reference(property_reference *reference)
+{
+	zend_string_release_ex(reference->unmangled_name, 0);
+	efree(reference);
+}
+
+static void reflection_free_parameter_reference(parameter_reference *reference)
+{
+	_free_function(reference->fptr);
+	efree(reference);
+}
+
 static void reflection_free_objects_storage(zend_object *object) /* {{{ */
 {
 	reflection_object *intern = reflection_object_from_obj(object);
-	parameter_reference *reference;
-	property_reference *prop_reference;
 
 	if (intern->ptr) {
 		switch (intern->ref_type) {
 		case REF_TYPE_PARAMETER:
-			reference = (parameter_reference*)intern->ptr;
-			_free_function(reference->fptr);
-			efree(intern->ptr);
+			reflection_free_parameter_reference(intern->ptr);
 			break;
 		case REF_TYPE_TYPE:
 		{
@@ -243,9 +251,7 @@
 			_free_function(intern->ptr);
 			break;
 		case REF_TYPE_PROPERTY:
-			prop_reference = (property_reference*)intern->ptr;
-			zend_string_release_ex(prop_reference->unmangled_name, 0);
-			efree(intern->ptr);
+			reflection_free_property_reference(intern->ptr);
 			break;
 		case REF_TYPE_ATTRIBUTE: {
 			attribute_reference *attr_ref = intern->ptr;
@@ -477,7 +483,7 @@
 
 		count = 0;
 		if (properties && zend_hash_num_elements(properties)) {
-			ZEND_HASH_MAP_FOREACH_STR_KEY(properties, prop_name) {
+			ZEND_HASH_FOREACH_STR_KEY(properties, prop_name) {
 				if (prop_name && ZSTR_LEN(prop_name) && ZSTR_VAL(prop_name)0) { /* skip all private and protected properties */
 					if (!zend_hash_exists(&ce->properties_info, prop_name)) {
 						count++;
@@ -2546,6 +2552,10 @@
 		}
 	}
 
+	if (intern->ptr) {
+		reflection_free_parameter_reference(intern->ptr);
+	}
+
 	ref = (parameter_reference*) emalloc(sizeof(parameter_reference));
 	ref->arg_info = &arg_infoposition;
 	ref->offset = (uint32_t)position;
@@ -2555,11 +2565,15 @@
 	intern->ptr = ref;
 	intern->ref_type = REF_TYPE_PARAMETER;
 	intern->ce = ce;
+	zval_ptr_dtor(&intern->obj);
 	if (reference && is_closure) {
 		ZVAL_COPY_VALUE(&intern->obj, reference);
+	} else {
+		ZVAL_UNDEF(&intern->obj);
 	}
 
 	prop_name = reflection_prop_name(object);
+	zval_ptr_dtor(prop_name);
 	if (has_internal_arg_info(fptr)) {
 		ZVAL_STRING(prop_name, ((zend_internal_arg_info*)arg_info)position.name);
 	} else {
@@ -4015,10 +4029,12 @@
 	object = ZEND_THIS;
 	intern = Z_REFLECTION_P(object);
 
+	/* Note: class entry name is interned, no need to destroy them */
 	if (arg_obj) {
 		ZVAL_STR_COPY(reflection_prop_name(object), arg_obj->ce->name);
 		intern->ptr = arg_obj->ce;
 		if (is_object) {
+			zval_ptr_dtor(&intern->obj);
 			ZVAL_OBJ_COPY(&intern->obj, arg_obj);
 		}
 	} else {
@@ -5510,13 +5526,20 @@
 		}
 	}
 
-	ZVAL_STR_COPY(reflection_prop_name(object), name);
+	zval *prop_name = reflection_prop_name(object);
+	zval_ptr_dtor(prop_name);
+	ZVAL_STR_COPY(prop_name, name);
+	/* Note: class name are always interned, no need to destroy them */
 	if (dynam_prop == 0) {
 		ZVAL_STR_COPY(reflection_prop_class(object), property_info->ce->name);
 	} else {
 		ZVAL_STR_COPY(reflection_prop_class(object), ce->name);
 	}
 
+	if (intern->ptr) {
+		reflection_free_property_reference(intern->ptr);
+	}
+
 	reference = (property_reference*) emalloc(sizeof(property_reference));
 	reference->prop = dynam_prop ? NULL : property_info;
 	reference->unmangled_name = zend_string_copy(name);
@@ -5949,7 +5972,9 @@
 		RETURN_THROWS();
 	}
 	free_alloca(lcname, use_heap);
-	ZVAL_STRING(reflection_prop_name(object), module->name);
+	zval *prop_name = reflection_prop_name(object);
+	zval_ptr_dtor(prop_name);
+	ZVAL_STRING(prop_name, module->name);
 	intern->ptr = module;
 	intern->ref_type = REF_TYPE_OTHER;
 	intern->ce = NULL;

php-8.2.28.tar.xz/ext/reflection/tests/ReflectionExtension_double_construct.phpt Added

php-8.2.28.tar.xz/ext/reflection/tests/ReflectionObject_double_construct.phpt Added

php-8.2.28.tar.xz/ext/reflection/tests/ReflectionParameter_double_construct.phpt Added

php-8.2.28.tar.xz/ext/reflection/tests/ReflectionProperty_double_construct.phpt Added

php-8.2.28.tar.xz/ext/reflection/tests/gh16187.phpt Added

php-8.2.23.tar.xz/ext/session/session.c -> php-8.2.28.tar.xz/ext/session/session.c Changed

@@ -693,9 +693,18 @@
 {
 	SESSION_CHECK_ACTIVE_STATE;
 	SESSION_CHECK_OUTPUT_STATE;
-	if (atol(ZSTR_VAL(new_value)) < 0) {
+
+#ifdef ZEND_ENABLE_ZVAL_LONG64
+	const zend_long maxcookie = ZEND_LONG_MAX - INT_MAX - 1;
+#else
+	const zend_long maxcookie = ZEND_LONG_MAX / 2 - 1;
+#endif
+	zend_long v = (zend_long)atol(ZSTR_VAL(new_value));
+	if (v < 0) {
 		php_error_docref(NULL, E_WARNING, "CookieLifetime cannot be negative");
 		return FAILURE;
+	} else if (v > maxcookie) {
+		return SUCCESS;
 	}
 	return OnUpdateLongGEZero(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage);
 }
@@ -1668,10 +1677,6 @@
 	zend_result result;
 	int found = 0;
 
-	if (!PS(use_cookies)) {
-		return;
-	}
-
 	ZEND_PARSE_PARAMETERS_START(1, 5)
 		Z_PARAM_ARRAY_HT_OR_LONG(options_ht, lifetime_long)
 		Z_PARAM_OPTIONAL
@@ -1681,6 +1686,11 @@
 		Z_PARAM_BOOL_OR_NULL(httponly, httponly_null)
 	ZEND_PARSE_PARAMETERS_END();
 
+	if (!PS(use_cookies)) {
+		php_error_docref(NULL, E_WARNING, "Session cookies cannot be used when session.use_cookies is disabled");
+		RETURN_FALSE;
+	}
+
 	if (PS(session_status) == php_session_active) {
 		php_error_docref(NULL, E_WARNING, "Session cookie parameters cannot be changed when a session is active");
 		RETURN_FALSE;

php-8.2.28.tar.xz/ext/session/tests/gh16290.phpt Added

php-8.2.28.tar.xz/ext/session/tests/gh16385.phpt Added

php-8.2.23.tar.xz/ext/session/tests/session_get_cookie_params_basic.phpt -> php-8.2.28.tar.xz/ext/session/tests/session_get_cookie_params_basic.phpt Changed

php-8.2.23.tar.xz/ext/simplexml/simplexml.c -> php-8.2.28.tar.xz/ext/simplexml/simplexml.c Changed

php-8.2.23.tar.xz/ext/simplexml/tests/bug51615.phpt -> php-8.2.28.tar.xz/ext/simplexml/tests/bug51615.phpt Changed

php-8.2.28.tar.xz/ext/simplexml/tests/gh15837.phpt Added

php-8.2.28.tar.xz/ext/simplexml/tests/gh16808.phpt Added

php-8.2.23.tar.xz/ext/snmp/snmp.c -> php-8.2.28.tar.xz/ext/snmp/snmp.c Changed

@@ -626,6 +626,31 @@
 }
 /* }}} */
 
+static void php_snmp_zend_string_release_from_char_pointer(char *ptr) {
+	if (ptr) {
+		zend_string *pptr = (zend_string *)(ptr - XtOffsetOf(zend_string, val));
+		zend_string_release(pptr);
+	}
+}
+
+static void php_free_objid_query(struct objid_query *objid_query, HashTable* oid_ht, const HashTable *value_ht, int st) {
+	if (oid_ht) {
+		uint32_t count = zend_hash_num_elements(oid_ht);
+
+		for (uint32_t i = 0; i < count; i ++) {
+			snmpobjarg *arg = &objid_query->varsi;
+			if (!arg->oid) {
+				break;
+			}
+			if (value_ht) {
+				php_snmp_zend_string_release_from_char_pointer(arg->value);
+			}
+			php_snmp_zend_string_release_from_char_pointer(arg->oid);
+		}
+	}
+	efree(objid_query->vars);
+}
+
 /* {{{ php_snmp_parse_oid
 *
 * OID parser (and type, value for SNMP_SET command)
@@ -674,10 +699,15 @@
 			return false;
 		}
 		objid_query->vars = (snmpobjarg *)safe_emalloc(sizeof(snmpobjarg), zend_hash_num_elements(oid_ht), 0);
+		memset(objid_query->vars, 0, sizeof(snmpobjarg) * zend_hash_num_elements(oid_ht));
 		objid_query->array_output = (st & SNMP_CMD_SET) == 0;
 		ZEND_HASH_FOREACH_VAL(oid_ht, tmp_oid) {
-			convert_to_string(tmp_oid);
-			objid_query->varsobjid_query->count.oid = Z_STRVAL_P(tmp_oid);
+			zend_string *tmp = zval_try_get_string(tmp_oid);
+			if (!tmp) {
+				php_free_objid_query(objid_query, oid_ht, value_ht, st);
+				return false;
+			}
+			objid_query->varsobjid_query->count.oid = ZSTR_VAL(tmp);
 			if (st & SNMP_CMD_SET) {
 				if (type_str) {
 					pptr = ZSTR_VAL(type_str);
@@ -701,18 +731,24 @@
 						}
 					}
 					if (idx_type < type_ht->nNumUsed) {
-						convert_to_string(tmp_type);
-						if (Z_STRLEN_P(tmp_type) != 1) {
+						zend_string *type = zval_try_get_string(tmp_type);
+						if (!type) {
+							php_free_objid_query(objid_query, oid_ht, value_ht, st);
+							return false;
+						}
+						size_t len = ZSTR_LEN(type);
+						char ptype = *ZSTR_VAL(type);
+						zend_string_release(type);
+						if (len != 1) {
 							zend_value_error("Type must be a single character");
-							efree(objid_query->vars);
+							php_free_objid_query(objid_query, oid_ht, value_ht, st);
 							return false;
 						}
-						pptr = Z_STRVAL_P(tmp_type);
-						objid_query->varsobjid_query->count.type = *pptr;
+						objid_query->varsobjid_query->count.type = ptype;
 						idx_type++;
 					} else {
-						php_error_docref(NULL, E_WARNING, "'%s': no type set", Z_STRVAL_P(tmp_oid));
-						efree(objid_query->vars);
+						php_error_docref(NULL, E_WARNING, "'%s': no type set", ZSTR_VAL(tmp));
+						php_free_objid_query(objid_query, oid_ht, value_ht, st);
 						return false;
 					}
 				}
@@ -738,12 +774,16 @@
 						}
 					}
 					if (idx_value < value_ht->nNumUsed) {
-						convert_to_string(tmp_value);
-						objid_query->varsobjid_query->count.value = Z_STRVAL_P(tmp_value);
+						zend_string *tmp = zval_try_get_string(tmp_value);
+						if (!tmp) {
+							php_free_objid_query(objid_query, oid_ht, value_ht, st);
+							return false;
+						}
+						objid_query->varsobjid_query->count.value = ZSTR_VAL(tmp);
 						idx_value++;
 					} else {
-						php_error_docref(NULL, E_WARNING, "'%s': no value set", Z_STRVAL_P(tmp_oid));
-						efree(objid_query->vars);
+						php_error_docref(NULL, E_WARNING, "'%s': no value set", ZSTR_VAL(tmp));
+						php_free_objid_query(objid_query, oid_ht, value_ht, st);
 						return false;
 					}
 				}
@@ -756,14 +796,14 @@
 	if (st & SNMP_CMD_WALK) {
 		if (objid_query->count > 1) {
 			php_snmp_error(object, PHP_SNMP_ERRNO_OID_PARSING_ERROR, "Multi OID walks are not supported!");
-			efree(objid_query->vars);
+			php_free_objid_query(objid_query, oid_ht, value_ht, st);
 			return false;
 		}
 		objid_query->vars0.name_length = MAX_NAME_LEN;
 		if (strlen(objid_query->vars0.oid)) { /* on a walk, an empty string means top of tree - no error */
 			if (!snmp_parse_oid(objid_query->vars0.oid, objid_query->vars0.name, &(objid_query->vars0.name_length))) {
 				php_snmp_error(object, PHP_SNMP_ERRNO_OID_PARSING_ERROR, "Invalid object identifier: %s", objid_query->vars0.oid);
-				efree(objid_query->vars);
+				php_free_objid_query(objid_query, oid_ht, value_ht, st);
 				return false;
 			}
 		} else {
@@ -775,7 +815,7 @@
 			objid_query->varsobjid_query->offset.name_length = MAX_OID_LEN;
 			if (!snmp_parse_oid(objid_query->varsobjid_query->offset.oid, objid_query->varsobjid_query->offset.name, &(objid_query->varsobjid_query->offset.name_length))) {
 				php_snmp_error(object, PHP_SNMP_ERRNO_OID_PARSING_ERROR, "Invalid object identifier: %s", objid_query->varsobjid_query->offset.oid);
-				efree(objid_query->vars);
+				php_free_objid_query(objid_query, oid_ht, value_ht, st);
 				return false;
 			}
 		}
@@ -1252,12 +1292,12 @@
 
 	if (session_less_mode) {
 		if (!netsnmp_session_init(&session, version, a1, a2, timeout, retries)) {
-			efree(objid_query.vars);
+			php_free_objid_query(&objid_query, oid_ht, value_ht, st);
 			netsnmp_session_free(&session);
 			RETURN_FALSE;
 		}
 		if (version == SNMP_VERSION_3 && !netsnmp_session_set_security(session, a3, a4, a5, a6, a7, NULL, NULL)) {
-			efree(objid_query.vars);
+			php_free_objid_query(&objid_query, oid_ht, value_ht, st);
 			netsnmp_session_free(&session);
 			/* Warning message sent already, just bail out */
 			RETURN_FALSE;
@@ -1268,7 +1308,7 @@
 		session = snmp_object->session;
 		if (!session) {
 			zend_throw_error(NULL, "Invalid or uninitialized SNMP object");
-			efree(objid_query.vars);
+			php_free_objid_query(&objid_query, oid_ht, value_ht, st);
 			RETURN_THROWS();
 		}
 
@@ -1294,7 +1334,7 @@
 
 	php_snmp_internal(INTERNAL_FUNCTION_PARAM_PASSTHRU, st, session, &objid_query);
 
-	efree(objid_query.vars);
+	php_free_objid_query(&objid_query, oid_ht, value_ht, st);
 
 	if (session_less_mode) {
 		netsnmp_session_free(&session);

php-8.2.28.tar.xz/ext/snmp/tests/gh16959.phpt Added

@@ -0,0 +1,70 @@
+--TEST--
+snmpget() modifies object_id array source
+--EXTENSIONS--
+snmp
+--SKIPIF--
+<?php
+require_once(__DIR__.'/skipif.inc');
+if (getenv('SKIP_ASAN')) die('skip Causes timeout on asan');
+?>
+--FILE--
+<?php
+require_once(__DIR__.'/snmp_include.inc');
+
+$bad_object_ids = array (
+077 => 077, -066 => -066, -0345 => -0345, 0 => 0
+);
+var_dump($bad_object_ids);
+var_dump(snmpget($hostname, "", $bad_object_ids) === false);
+// The array should remain unmodified
+var_dump($bad_object_ids);
+try {
+	snmpget($hostname, "", 0 => new stdClass());
+} catch (Throwable $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+
+try {
+	snmp2_set($hostname, $communityWrite, $bad_object_ids, array(new stdClass()), array(null));
+} catch (Throwable $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+try {
+	snmp2_set($hostname, $communityWrite, $bad_object_ids, array("toolongtype"), array(null));
+} catch (Throwable $e) {
+	echo $e->getMessage() . PHP_EOL;
+}
+try {
+	snmp2_set($hostname, $communityWrite, $bad_object_ids, array(str_repeat("onetoomuch", random_int(1, 1))), array(null));
+} catch (Throwable $e) {
+	echo $e->getMessage();
+}
+?>
+--EXPECTF--
+array(4) {
+  63=>
+  int(63)
+  -54=>
+  int(-54)
+  -229=>
+  int(-229)
+  0=>
+  int(0)
+}
+
+Warning: snmpget(): Invalid object identifier: -54 in %s on line %d
+bool(true)
+array(4) {
+  63=>
+  int(63)
+  -54=>
+  int(-54)
+  -229=>
+  int(-229)
+  0=>
+  int(0)
+}
+Object of class stdClass could not be converted to string
+Object of class stdClass could not be converted to string
+Type must be a single character
+Type must be a single character

php-8.2.23.tar.xz/ext/snmp/tests/snmp-object-errno-errstr.phpt -> php-8.2.28.tar.xz/ext/snmp/tests/snmp-object-errno-errstr.phpt Changed

php-8.2.23.tar.xz/ext/snmp/tests/snmp-object-error.phpt -> php-8.2.28.tar.xz/ext/snmp/tests/snmp-object-error.phpt Changed

php-8.2.23.tar.xz/ext/snmp/tests/snmp2_get.phpt -> php-8.2.28.tar.xz/ext/snmp/tests/snmp2_get.phpt Changed

php-8.2.23.tar.xz/ext/snmp/tests/snmp2_set-nomib.phpt -> php-8.2.28.tar.xz/ext/snmp/tests/snmp2_set-nomib.phpt Changed

php-8.2.23.tar.xz/ext/snmp/tests/snmp2_walk.phpt -> php-8.2.28.tar.xz/ext/snmp/tests/snmp2_walk.phpt Changed

php-8.2.23.tar.xz/ext/snmp/tests/snmp3-error.phpt -> php-8.2.28.tar.xz/ext/snmp/tests/snmp3-error.phpt Changed

php-8.2.23.tar.xz/ext/snmp/tests/snmp_getvalue.phpt -> php-8.2.28.tar.xz/ext/snmp/tests/snmp_getvalue.phpt Changed

php-8.2.23.tar.xz/ext/snmp/tests/snmpget.phpt -> php-8.2.28.tar.xz/ext/snmp/tests/snmpget.phpt Changed

php-8.2.23.tar.xz/ext/snmp/tests/snmpset-nomib.phpt -> php-8.2.28.tar.xz/ext/snmp/tests/snmpset-nomib.phpt Changed

php-8.2.23.tar.xz/ext/snmp/tests/snmpwalk.phpt -> php-8.2.28.tar.xz/ext/snmp/tests/snmpwalk.phpt Changed

php-8.2.23.tar.xz/ext/soap/php_encoding.c -> php-8.2.28.tar.xz/ext/soap/php_encoding.c Changed

@@ -1408,7 +1408,9 @@
 					return ret;
 				}
 
-				object_init_ex(ret, ce);
+				if (object_init_ex(ret, ce) != SUCCESS) {
+					return ret;
+				}
 				master_to_zval_int(&base, enc, data);
 				set_zval_property(ret, "_", &base);
 			} else {
@@ -1417,7 +1419,9 @@
 				if (soap_check_xml_ref(ret, data)) {
 					return ret;
 				}
-				object_init_ex(ret, ce);
+				if (object_init_ex(ret, ce) != SUCCESS) {
+					return ret;
+				}
 				soap_add_xml_ref(ret, data);
 			}
 		} else if (sdlType->kind == XSD_TYPEKIND_EXTENSION &&
@@ -1462,7 +1466,9 @@
 					return ret;
 				}
 
-				object_init_ex(ret, ce);
+				if (object_init_ex(ret, ce) != SUCCESS) {
+					return ret;
+				}
 				soap_add_xml_ref(ret, data);
 				master_to_zval_int(&base, sdlType->encode, data);
 				set_zval_property(ret, "_", &base);
@@ -1473,7 +1479,9 @@
 			if (soap_check_xml_ref(ret, data)) {
 				return ret;
 			}
-			object_init_ex(ret, ce);
+			if (object_init_ex(ret, ce) != SUCCESS) {
+				return ret;
+			}
 			soap_add_xml_ref(ret, data);
 		}
 		if (sdlType->model) {
@@ -1533,7 +1541,9 @@
 			return ret;
 		}
 
-		object_init_ex(ret, ce);
+		if (object_init_ex(ret, ce) != SUCCESS) {
+			return ret;
+		}
 		soap_add_xml_ref(ret, data);
 		trav = data->children;
 
@@ -2200,8 +2210,8 @@
 
 		iter = ce->get_iterator(ce, data, 0);
 
-		if (EG(exception)) {
-			goto iterator_done;
+		if (!iter) {
+			goto iterator_failed_to_get;
 		}
 
 		if (iter->funcs->rewind) {
@@ -2241,6 +2251,7 @@
 		}
 iterator_done:
 		OBJ_RELEASE(&iter->std);
+iterator_failed_to_get:
 		if (EG(exception)) {
 			zval_ptr_dtor(&array_copy);
 			ZVAL_UNDEF(&array_copy);
@@ -2388,7 +2399,14 @@
 		if (style == SOAP_ENCODED) {
 			if (soap_version == SOAP_1_1) {
 				smart_str_0(&array_type);
-				if (strcmp(ZSTR_VAL(array_type.s),"xsd:anyType") == 0) {
+#if defined(__GNUC__) && __GNUC__ >= 11
+				ZEND_DIAGNOSTIC_IGNORED_START("-Wstringop-overread")
+#endif
+				bool is_xsd_any_type = strcmp(ZSTR_VAL(array_type.s),"xsd:anyType") == 0;
+#if defined(__GNUC__) && __GNUC__ >= 11
+				ZEND_DIAGNOSTIC_IGNORED_END
+#endif
+				if (is_xsd_any_type) {
 					smart_str_free(&array_type);
 					smart_str_appendl(&array_type,"xsd:ur-type",sizeof("xsd:ur-type")-1);
 				}

php-8.2.23.tar.xz/ext/soap/php_http.c -> php-8.2.28.tar.xz/ext/soap/php_http.c Changed

@@ -81,6 +81,68 @@
 	return 0;
 }
 
+static void http_context_add_header(const char *s,
+									bool has_authorization,
+									bool has_proxy_authorization,
+									bool has_cookies,
+									smart_str *soap_headers)
+{
+	const char *p;
+	int name_len;
+
+	while (*s) {
+		/* skip leading newlines and spaces */
+		while (*s == ' ' || *s == '\t' || *s == '\r' || *s == '\n') {
+			s++;
+		}
+		/* extract header name */
+		p = s;
+		name_len = -1;
+		while (*p) {
+			if (*p == ':') {
+				if (name_len < 0) name_len = p - s;
+				break;
+			} else if (*p == ' ' || *p == '\t') {
+				if (name_len < 0) name_len = p - s;
+			} else if (*p == '\r' || *p == '\n') {
+				break;
+			}
+			p++;
+		}
+		if (*p == ':') {
+			/* extract header value */
+			while (*p && *p != '\r' && *p != '\n') {
+				p++;
+			}
+			/* skip some predefined headers */
+			if ((name_len != sizeof("host")-1 ||
+				 strncasecmp(s, "host", sizeof("host")-1) != 0) &&
+				(name_len != sizeof("connection")-1 ||
+				 strncasecmp(s, "connection", sizeof("connection")-1) != 0) &&
+				(name_len != sizeof("user-agent")-1 ||
+				 strncasecmp(s, "user-agent", sizeof("user-agent")-1) != 0) &&
+				(name_len != sizeof("content-length")-1 ||
+				 strncasecmp(s, "content-length", sizeof("content-length")-1) != 0) &&
+				(name_len != sizeof("content-type")-1 ||
+				 strncasecmp(s, "content-type", sizeof("content-type")-1) != 0) &&
+				(!has_cookies ||
+				 name_len != sizeof("cookie")-1 ||
+				 strncasecmp(s, "cookie", sizeof("cookie")-1) != 0) &&
+				(!has_authorization ||
+				 name_len != sizeof("authorization")-1 ||
+				 strncasecmp(s, "authorization", sizeof("authorization")-1) != 0) &&
+				(!has_proxy_authorization ||
+				 name_len != sizeof("proxy-authorization")-1 ||
+				 strncasecmp(s, "proxy-authorization", sizeof("proxy-authorization")-1) != 0)) {
+				/* add header */
+				smart_str_appendl(soap_headers, s, p-s);
+				smart_str_append_const(soap_headers, "\r\n");
+			}
+		}
+		s = (*p) ? (p + 1) : p;
+	}
+}
+
 /* Additional HTTP headers */
 void http_context_headers(php_stream_context* context,
                           bool has_authorization,
@@ -89,64 +151,16 @@
                           smart_str* soap_headers)
 {
 	zval *tmp;
-
-	if (context &&
-		(tmp = php_stream_context_get_option(context, "http", "header")) != NULL &&
-		Z_TYPE_P(tmp) == IS_STRING && Z_STRLEN_P(tmp)) {
-		char *s = Z_STRVAL_P(tmp);
-		char *p;
-		int name_len;
-
-		while (*s) {
-			/* skip leading newlines and spaces */
-			while (*s == ' ' || *s == '\t' || *s == '\r' || *s == '\n') {
-				s++;
-			}
-			/* extract header name */
-			p = s;
-			name_len = -1;
-			while (*p) {
-				if (*p == ':') {
-					if (name_len < 0) name_len = p - s;
-					break;
-				} else if (*p == ' ' || *p == '\t') {
-					if (name_len < 0) name_len = p - s;
-				} else if (*p == '\r' || *p == '\n') {
-					break;
-				}
-				p++;
-			}
-			if (*p == ':') {
-				/* extract header value */
-				while (*p && *p != '\r' && *p != '\n') {
-					p++;
+	if (context && (tmp = php_stream_context_get_option(context, "http", "header")) != NULL) {
+		if (Z_TYPE_P(tmp) == IS_STRING && Z_STRLEN_P(tmp)) {
+			http_context_add_header(Z_STRVAL_P(tmp), has_authorization, has_proxy_authorization, has_cookies, soap_headers);
+		} else if (Z_TYPE_P(tmp) == IS_ARRAY) {
+			zval *value;
+			ZEND_HASH_FOREACH_VAL(Z_ARR_P(tmp), value) {
+				if (Z_TYPE_P(value) == IS_STRING && Z_STRLEN_P(value)) {
+					http_context_add_header(Z_STRVAL_P(value), has_authorization, has_proxy_authorization, has_cookies, soap_headers);
 				}
-				/* skip some predefined headers */
-				if ((name_len != sizeof("host")-1 ||
-				     strncasecmp(s, "host", sizeof("host")-1) != 0) &&
-				    (name_len != sizeof("connection")-1 ||
-				     strncasecmp(s, "connection", sizeof("connection")-1) != 0) &&
-				    (name_len != sizeof("user-agent")-1 ||
-				     strncasecmp(s, "user-agent", sizeof("user-agent")-1) != 0) &&
-				    (name_len != sizeof("content-length")-1 ||
-				     strncasecmp(s, "content-length", sizeof("content-length")-1) != 0) &&
-				    (name_len != sizeof("content-type")-1 ||
-				     strncasecmp(s, "content-type", sizeof("content-type")-1) != 0) &&
-				    (!has_cookies ||
-				     name_len != sizeof("cookie")-1 ||
-				     strncasecmp(s, "cookie", sizeof("cookie")-1) != 0) &&
-				    (!has_authorization ||
-				     name_len != sizeof("authorization")-1 ||
-				     strncasecmp(s, "authorization", sizeof("authorization")-1) != 0) &&
-				    (!has_proxy_authorization ||
-				     name_len != sizeof("proxy-authorization")-1 ||
-				     strncasecmp(s, "proxy-authorization", sizeof("proxy-authorization")-1) != 0)) {
-				    /* add header */
-					smart_str_appendl(soap_headers, s, p-s);
-					smart_str_append_const(soap_headers, "\r\n");
-				}
-			}
-			s = (*p) ? (p + 1) : p;
+			} ZEND_HASH_FOREACH_END();
 		}
 	}
 }
@@ -447,6 +461,7 @@
 		}
 		add_soap_fault(this_ptr, "HTTP", "Unable to parse URL", NULL, NULL);
 		smart_str_free(&soap_headers_z);
+		efree(http_msg);
 		return FALSE;
 	}
 
@@ -460,6 +475,7 @@
 		}
 		add_soap_fault(this_ptr, "HTTP", "Unknown protocol. Only http and https are allowed.", NULL, NULL);
 		smart_str_free(&soap_headers_z);
+		efree(http_msg);
 		return FALSE;
 	}
 
@@ -473,6 +489,7 @@
 		add_soap_fault(this_ptr, "HTTP", "SSL support is not available in this build", NULL, NULL);
 		PG(allow_url_fopen) = old_allow_url_fopen;
 		smart_str_free(&soap_headers_z);
+		efree(http_msg);
 		return FALSE;
 	}
 
@@ -527,6 +544,7 @@
 			add_soap_fault(this_ptr, "HTTP", "Could not connect to host", NULL, NULL);
 			PG(allow_url_fopen) = old_allow_url_fopen;
 			smart_str_free(&soap_headers_z);
+			efree(http_msg);
 			return FALSE;
 		}
 	}
@@ -670,6 +688,7 @@
 					convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
 					smart_str_free(&soap_headers_z);
 					smart_str_free(&soap_headers);
+					efree(http_msg);
 					return FALSE;
 				}
 
@@ -887,12 +906,14 @@
 			convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
 			add_soap_fault(this_ptr, "HTTP", "Failed Sending HTTP SOAP request", NULL, NULL);
 			smart_str_free(&soap_headers_z);
+			efree(http_msg);
 			return FALSE;
 		}
 		smart_str_free(&soap_headers);
 	} else {
 		add_soap_fault(this_ptr, "HTTP", "Failed to create stream??", NULL, NULL);
 		smart_str_free(&soap_headers_z);
+		efree(http_msg);
 		return FALSE;
 	}
 
@@ -901,6 +922,7 @@
 		convert_to_null(Z_CLIENT_HTTPSOCKET_P(this_ptr));
 		convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
 		smart_str_free(&soap_headers_z);
+		efree(http_msg);
 		return TRUE;
 	}
 
@@ -915,6 +937,7 @@
 			convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
 			add_soap_fault(this_ptr, "HTTP", "Error Fetching http headers", NULL, NULL);
 			smart_str_free(&soap_headers_z);
+			efree(http_msg);
 			return FALSE;
 		}
 
@@ -1143,6 +1166,7 @@
 				if (--redirect_max < 1) {
 					add_soap_fault(this_ptr, "HTTP", "Redirection limit reached, aborting", NULL, NULL);
 					smart_str_free(&soap_headers_z);
+					efree(http_msg);
 					return FALSE;
 				}

php-8.2.23.tar.xz/ext/soap/php_schema.c -> php-8.2.28.tar.xz/ext/soap/php_schema.c Changed

@@ -92,6 +92,13 @@
 	return enc;
 }
 
+/* Necessary for some error paths to avoid leaking persistent memory. */
+static void requestify_string(xmlChar **str) {
+	xmlChar *copy = (xmlChar *) estrdup((const char *) *str);
+	xmlFree(*str);
+	*str = copy;
+}
+
 static void schema_load_file(sdlCtx *ctx, xmlAttrPtr ns, xmlChar *location, xmlAttrPtr tns, int import) {
 	if (location != NULL &&
 	    !zend_hash_str_exists(&ctx->docs, (char*)location, xmlStrlen(location))) {
@@ -104,22 +111,35 @@
 		sdl_restore_uri_credentials(ctx);
 
 		if (doc == NULL) {
+			requestify_string(&location);
 			soap_error1(E_ERROR, "Parsing Schema: can't import schema from '%s'", location);
 		}
 		schema = get_node(doc->children, "schema");
 		if (schema == NULL) {
+			requestify_string(&location);
 			xmlFreeDoc(doc);
 			soap_error1(E_ERROR, "Parsing Schema: can't import schema from '%s'", location);
 		}
 		new_tns = get_attribute(schema->properties, "targetNamespace");
 		if (import) {
 			if (ns != NULL && (new_tns == NULL || xmlStrcmp(ns->children->content, new_tns->children->content) != 0)) {
-				xmlFreeDoc(doc);
-				soap_error2(E_ERROR, "Parsing Schema: can't import schema from '%s', unexpected 'targetNamespace'='%s'", location, ns->children->content);
+				requestify_string(&location);
+				if (new_tns == NULL) {
+					xmlFreeDoc(doc);
+					soap_error2(E_ERROR, "Parsing Schema: can't import schema from '%s', missing 'targetNamespace', expected '%s'", location, ns->children->content);
+				} else {
+					/* Have to make a copy to avoid a UAF after freeing `doc` */
+					const char *target_ns_copy = estrdup((const char *) new_tns->children->content);
+					xmlFreeDoc(doc);
+					soap_error3(E_ERROR, "Parsing Schema: can't import schema from '%s', unexpected 'targetNamespace'='%s', expected '%s'", location, target_ns_copy, ns->children->content);
+				}
 			}
 			if (ns == NULL && new_tns != NULL) {
+				requestify_string(&location);
+				/* Have to make a copy to avoid a UAF after freeing `doc` */
+				const char *target_ns_copy = estrdup((const char *) new_tns->children->content);
 				xmlFreeDoc(doc);
-				soap_error2(E_ERROR, "Parsing Schema: can't import schema from '%s', unexpected 'targetNamespace'='%s'", location, new_tns->children->content);
+				soap_error2(E_ERROR, "Parsing Schema: can't import schema from '%s', unexpected 'targetNamespace'='%s', expected no 'targetNamespace'", location, target_ns_copy);
 			}
 		} else {
 			new_tns = get_attribute(schema->properties, "targetNamespace");
@@ -128,6 +148,7 @@
 					xmlSetProp(schema, BAD_CAST("targetNamespace"), tns->children->content);
 				}
 			} else if (tns != NULL && xmlStrcmp(tns->children->content, new_tns->children->content) != 0) {
+				requestify_string(&location);
 				xmlFreeDoc(doc);
 				soap_error1(E_ERROR, "Parsing Schema: can't include schema from '%s', different 'targetNamespace'", location);
 			}

php-8.2.23.tar.xz/ext/soap/php_sdl.c -> php-8.2.28.tar.xz/ext/soap/php_sdl.c Changed

php-8.2.23.tar.xz/ext/soap/soap.c -> php-8.2.28.tar.xz/ext/soap/soap.c Changed

@@ -412,6 +412,7 @@
 	memcpy(&soap_server_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	soap_server_object_handlers.offset = XtOffsetOf(soap_server_object, std);
 	soap_server_object_handlers.free_obj = soap_server_object_free;
+	soap_server_object_handlers.clone_obj = NULL;
 
 	/* Register SoapFault class */
 	soap_fault_class_entry = register_class_SoapFault(zend_ce_exception);
@@ -837,6 +838,9 @@
 
 		if ((tmp = zend_hash_str_find(ht, "classmap", sizeof("classmap")-1)) != NULL &&
 			Z_TYPE_P(tmp) == IS_ARRAY) {
+			if (HT_IS_PACKED(Z_ARRVAL_P(tmp))) {
+				php_error_docref(NULL, E_ERROR, "'classmap' option must be an associative array");
+			}
 			service->class_map = zend_array_dup(Z_ARRVAL_P(tmp));
 		}
 
@@ -2003,6 +2007,9 @@
 		}
 		if ((tmp = zend_hash_str_find(ht, "classmap", sizeof("classmap")-1)) != NULL &&
 			Z_TYPE_P(tmp) == IS_ARRAY) {
+			if (HT_IS_PACKED(Z_ARRVAL_P(tmp))) {
+				php_error_docref(NULL, E_ERROR, "'classmap' option must be an associative array");
+			}
 			ZVAL_COPY(Z_CLIENT_CLASSMAP_P(this_ptr), tmp);
 		}

php-8.2.23.tar.xz/ext/soap/tests/bug68996.phpt -> php-8.2.28.tar.xz/ext/soap/tests/bug68996.phpt Changed

@@ -18,6 +18,18 @@
 }
 $s->addFunction("foo");
 
+function handleFormatted($s, $input) {
+  ob_start();
+  $s->handle($input);
+  $response = ob_get_clean();
+
+  // libxml2 2.13 has different formatting behaviour: it outputs <faultcode/> instead of <faultcode></faultcode>
+  // this normalizes the output to <faultcode/>
+  $response = str_replace('<faultcode></faultcode>', '<faultcode/>', $response);
+  $response = str_replace('<env:Value></env:Value>', '<env:Value/>', $response);
+  echo $response;
+}
+
 // soap 1.1
 $HTTP_RAW_POST_DATA = <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
@@ -27,7 +39,7 @@
   </SOAP-ENV:Body>
 </SOAP-ENV:Envelope>
 EOF;
-$s->handle($HTTP_RAW_POST_DATA);
+handleFormatted($s, $HTTP_RAW_POST_DATA);
 
 // soap 1.2
 $HTTP_RAW_POST_DATA = <<<EOF
@@ -38,10 +50,10 @@
   </env:Body>
 </env:Envelope>
 EOF;
-$s->handle($HTTP_RAW_POST_DATA);
+handleFormatted($s, $HTTP_RAW_POST_DATA);
 ?>
 --EXPECT--
 <?xml version="1.0" encoding="UTF-8"?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode></faultcode><faultstring>some msg</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode/><faultstring>some msg</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
 <?xml version="1.0" encoding="UTF-8"?>
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value></env:Value></env:Code><env:Reason><env:Text>some msg</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>
+<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope"><env:Body><env:Fault><env:Code><env:Value/></env:Code><env:Reason><env:Text>some msg</env:Text></env:Reason></env:Fault></env:Body></env:Envelope>

php-8.2.23.tar.xz/ext/soap/tests/bug71610.phpt -> php-8.2.28.tar.xz/ext/soap/tests/bug71610.phpt Changed

php-8.2.23.tar.xz/ext/soap/tests/bugs/bug27722.phpt -> php-8.2.28.tar.xz/ext/soap/tests/bugs/bug27722.phpt Changed

php-8.2.23.tar.xz/ext/soap/tests/bugs/bug27742.phpt -> php-8.2.28.tar.xz/ext/soap/tests/bugs/bug27742.phpt Changed

php-8.2.23.tar.xz/ext/soap/tests/bugs/bug55639.phpt -> php-8.2.28.tar.xz/ext/soap/tests/bugs/bug55639.phpt Changed

php-8.2.28.tar.xz/ext/soap/tests/bugs/bug62900.phpt Added

@@ -0,0 +1,95 @@
+--TEST--
+Bug #62900 (Wrong namespace on xsd import error message)
+--EXTENSIONS--
+soap
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+<?php
+
+$wsdl_with_ns = <<<XML
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test-uri">
+	<types>
+		<xs:schema targetNamespace="http://test-uri" elementFormDefault="qualified">
+			<import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="bug62900.xsd" />
+		</xs:schema>
+	</types>
+</definitions>
+XML;
+
+$wsdl_without_ns = <<<XML
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://test-uri">
+	<types>
+		<xs:schema elementFormDefault="qualified">
+			<import schemaLocation="bug62900.xsd" />
+		</xs:schema>
+	</types>
+</definitions>
+XML;
+
+$xsd_with_wrong_ns = <<<XML
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd">
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespacex" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en"/>
+XML;
+
+$xsd_without_ns = <<<XML
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en"/>
+XML;
+
+$combinations = 
+    $wsdl_with_ns, $xsd_with_wrong_ns,
+    $wsdl_with_ns, $xsd_without_ns,
+    $wsdl_without_ns, $xsd_with_wrong_ns,
+    $wsdl_without_ns, $xsd_without_ns,
+;
+
+chdir(__DIR__);
+
+$args = "-d", "display_startup_errors=0", "-d", "extension_dir=" . ini_get("extension_dir"), "-d", "extension=" . (substr(PHP_OS, 0, 3) == "WIN" ? "php_" : "") . "soap." . PHP_SHLIB_SUFFIX;
+if (php_ini_loaded_file()) {
+    // Necessary such that it works from a development directory in which case extension_dir might not be the real extension dir
+    $args = "-c";
+    $args = php_ini_loaded_file();
+}
+
+foreach ($combinations as list($wsdl, $xsd)) {
+    file_put_contents(__DIR__."/bug62900.wsdl", $wsdl);
+    file_put_contents(__DIR__."/bug62900.xsd", $xsd);
+
+    $proc = proc_open(PHP_BINARY, ...$args, __DIR__.'/bug62900_run', 1 => "pipe", "w", 2 => "pipe", "w", $pipes);
+    echo stream_get_contents($pipes1);
+    fclose($pipes1);
+    proc_close($proc);
+}
+
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__."/bug62900.wsdl");
+@unlink(__DIR__."/bug62900.xsd");
+?>
+--EXPECTF--
+Fatal error: Uncaught SoapFault exception: WSDL SOAP-ERROR: Parsing Schema: can't import schema from '%sbug62900.xsd', unexpected 'targetNamespace'='http://www.w3.org/XML/1998/namespacex', expected 'http://www.w3.org/XML/1998/namespace' in %s:%d
+Stack trace:
+#0 %s(%d): SoapClient->__construct(%s)
+#1 {main}
+  thrown in %s on line %d
+
+Fatal error: Uncaught SoapFault exception: WSDL SOAP-ERROR: Parsing Schema: can't import schema from '%sbug62900.xsd', missing 'targetNamespace', expected 'http://www.w3.org/XML/1998/namespace' in %s:%d
+Stack trace:
+#0 %s(%d): SoapClient->__construct(%s)
+#1 {main}
+  thrown in %s on line %d
+
+Fatal error: Uncaught SoapFault exception: WSDL SOAP-ERROR: Parsing Schema: can't import schema from '%sbug62900.xsd', unexpected 'targetNamespace'='http://www.w3.org/XML/1998/namespacex', expected no 'targetNamespace' in %s:%d
+Stack trace:
+#0 %s(%d): SoapClient->__construct(%s)
+#1 {main}
+  thrown in %s on line %d
+
+Fatal error: Uncaught SoapFault exception: WSDL SOAP-ERROR: Parsing WSDL: Couldn't bind to service in %s:%d
+Stack trace:
+#0 %s(%d): SoapClient->__construct(%s)
+#1 {main}
+  thrown in %s on line %d

php-8.2.28.tar.xz/ext/soap/tests/bugs/bug62900_run Added

php-8.2.28.tar.xz/ext/soap/tests/bugs/bug73182.phpt Added

@@ -0,0 +1,62 @@
+--TEST--
+Bug #73182 (PHP SOAPClient does not support stream context HTTP headers in array form)
+--EXTENSIONS--
+soap
+--SKIPIF--
+<?php
+    if (!file_exists(__DIR__ . "/../../../../sapi/cli/tests/php_cli_server.inc")) {
+        echo "skip sapi/cli/tests/php_cli_server.inc required but not found";
+    }
+?>
+--FILE--
+<?php
+
+include __DIR__ . "/../../../../sapi/cli/tests/php_cli_server.inc";
+
+$args = "-d", "extension_dir=" . ini_get("extension_dir"), "-d", "extension=" . (substr(PHP_OS, 0, 3) == "WIN" ? "php_" : "") . "soap." . PHP_SHLIB_SUFFIX;
+if (php_ini_loaded_file()) {
+  // Necessary such that it works from a development directory in which case extension_dir might not be the real extension dir
+  $args = "-c";
+  $args = php_ini_loaded_file();
+}
+$code = <<<'PHP'
+/* Receive */
+$content = trim(file_get_contents("php://input")) . PHP_EOL;
+PHP;
+
+php_cli_server_start($code, null, $args);
+
+$client = new soapclient(NULL, 
+  'location' => 'http://' . PHP_CLI_SERVER_ADDRESS,
+  'uri' => 'misc-uri',
+  'trace' => true,
+  'stream_context' => stream_context_create(
+    'http' => 
+      'header' => 
+        // These 2 must be ignored because the soap http client sets them up
+        'Connection: close',
+        'User-Agent: bar',
+        // The following 2 must be included
+        'X-custom: foo',
+        'Content-Description: Foo',
+        '  X-custom2: trim me  ',
+      ,
+    ,
+  ),
+);
+
+$client->__soapCall("foo", );
+echo $client->__getLastRequestHeaders();
+
+?>
+--EXPECTF--
+POST / HTTP/1.1
+Host: localhost:%d
+Connection: Keep-Alive
+User-Agent: PHP-SOAP/%s
+Content-Type: text/xml; charset=utf-8
+SOAPAction: "misc-uri#foo"
+Content-Length: %d
+X-custom: foo
+Content-Description: Foo
+X-custom2: trim me

php-8.2.28.tar.xz/ext/soap/tests/bugs/gh16237.phpt Added

php-8.2.28.tar.xz/ext/soap/tests/bugs/gh16256.phpt Added

php-8.2.28.tar.xz/ext/soap/tests/bugs/gh16259.phpt Added

php-8.2.28.tar.xz/ext/soap/tests/bugs/gh16429.phpt Added

php-8.2.23.tar.xz/ext/soap/tests/server011.phpt -> php-8.2.28.tar.xz/ext/soap/tests/server011.phpt Changed

php-8.2.23.tar.xz/ext/soap/tests/server012.phpt -> php-8.2.28.tar.xz/ext/soap/tests/server012.phpt Changed

php-8.2.23.tar.xz/ext/sockets/sockets.c -> php-8.2.28.tar.xz/ext/sockets/sockets.c Changed

php-8.2.28.tar.xz/ext/sockets/tests/gh16267.phpt Added

php-8.2.28.tar.xz/ext/sockets/tests/socket_recv_overflow.phpt Added

php-8.2.23.tar.xz/ext/spl/spl_array.c -> php-8.2.28.tar.xz/ext/spl/spl_array.c Changed

@@ -555,13 +555,15 @@
 			if (Z_TYPE_P(data) == IS_INDIRECT) {
 				data = Z_INDIRECT_P(data);
 				if (Z_TYPE_P(data) != IS_UNDEF) {
-					zval_ptr_dtor(data);
+					zval garbage;
+					ZVAL_COPY_VALUE(&garbage, data);
 					ZVAL_UNDEF(data);
 					HT_FLAGS(ht) |= HASH_FLAG_HAS_EMPTY_IND;
 					zend_hash_move_forward_ex(ht, spl_array_get_pos_ptr(ht, intern));
 					if (spl_array_is_object(intern)) {
 						spl_array_skip_protected(intern, ht);
 					}
+					zval_ptr_dtor(&garbage);
 				}
 			} else {
 				zend_hash_del(ht, key.key);
@@ -1052,8 +1054,10 @@
 static void spl_array_set_array(zval *object, spl_array_object *intern, zval *array, zend_long ar_flags, bool just_array) {
 	/* Handled by ZPP prior to this, or for __unserialize() before passing to here */
 	ZEND_ASSERT(Z_TYPE_P(array) == IS_ARRAY || Z_TYPE_P(array) == IS_OBJECT);
+	zval garbage;
+	ZVAL_UNDEF(&garbage);
 	if (Z_TYPE_P(array) == IS_ARRAY) {
-		zval_ptr_dtor(&intern->array);
+		ZVAL_COPY_VALUE(&garbage, &intern->array);
 		if (Z_REFCOUNT_P(array) == 1) {
 			ZVAL_COPY(&intern->array, array);
 		} else {
@@ -1071,7 +1075,7 @@
 		}
 	} else {
 		if (Z_OBJ_HT_P(array) == &spl_handler_ArrayObject || Z_OBJ_HT_P(array) == &spl_handler_ArrayIterator) {
-			zval_ptr_dtor(&intern->array);
+			ZVAL_COPY_VALUE(&garbage, &intern->array);
 			if (just_array)	{
 				spl_array_object *other = Z_SPLARRAY_P(array);
 				ar_flags = other->ar_flags & ~SPL_ARRAY_INT_MASK;
@@ -1089,9 +1093,10 @@
 				zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0,
 					"Overloaded object of type %s is not compatible with %s",
 					ZSTR_VAL(Z_OBJCE_P(array)->name), ZSTR_VAL(intern->std.ce->name));
+				ZEND_ASSERT(Z_TYPE(garbage) == IS_UNDEF);
 				return;
 			}
-			zval_ptr_dtor(&intern->array);
+			ZVAL_COPY_VALUE(&garbage, &intern->array);
 			ZVAL_COPY(&intern->array, array);
 		}
 	}
@@ -1102,6 +1107,8 @@
 		zend_hash_iterator_del(intern->ht_iter);
 		intern->ht_iter = (uint32_t)-1;
 	}
+
+	zval_ptr_dtor(&garbage);
 }
 /* }}} */

php-8.2.23.tar.xz/ext/spl/spl_directory.c -> php-8.2.28.tar.xz/ext/spl/spl_directory.c Changed

@@ -668,7 +668,7 @@
 	if (intern->type == SPL_FS_DIR) {
 #ifdef HAVE_GLOB
 		pnstr = spl_gen_private_prop_name(spl_ce_DirectoryIterator, "glob", sizeof("glob")-1);
-		if (php_stream_is(intern->u.dir.dirp ,&php_glob_stream_ops)) {
+		if (intern->u.dir.dirp && php_stream_is(intern->u.dir.dirp ,&php_glob_stream_ops)) {
 			ZVAL_STR_COPY(&tmp, intern->path);
 		} else {
 			ZVAL_FALSE(&tmp);
@@ -2042,22 +2042,27 @@
 PHP_METHOD(SplFileObject, __construct)
 {
 	spl_filesystem_object *intern = spl_filesystem_from_obj(Z_OBJ_P(ZEND_THIS));
+	zend_string *file_name = NULL;
 	zend_string *open_mode = ZSTR_CHAR('r');
+	zval *stream_context = NULL;
 	bool use_include_path = 0;
 	size_t path_len;
 	zend_error_handling error_handling;
 
-	intern->u.file.open_mode = ZSTR_CHAR('r');
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "P|Sbr!", &file_name, &open_mode, &use_include_path, &stream_context) == FAILURE) {
+		RETURN_THROWS();
+	}
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "P|Sbr!",
-			&intern->file_name, &open_mode,
-			&use_include_path, &intern->u.file.zcontext) == FAILURE) {
-		intern->u.file.open_mode = NULL;
-		intern->file_name = NULL;
+	/* Prevent reinitialization of Object */
+	if (UNEXPECTED(intern->u.file.stream)) {
+		zend_throw_error(NULL, "Cannot call constructor twice");
 		RETURN_THROWS();
 	}
 
 	intern->u.file.open_mode = zend_string_copy(open_mode);
+	/* file_name and zcontext are copied by spl_filesystem_file_open() */
+	intern->file_name = file_name;
+	intern->u.file.zcontext = stream_context;
 
 	/* spl_filesystem_file_open() can generate E_WARNINGs which we want to promote to exceptions */
 	zend_replace_error_handling(EH_THROW, spl_ce_RuntimeException, &error_handling);
@@ -2096,6 +2101,12 @@
 		RETURN_THROWS();
 	}
 
+	/* Prevent reinitialization of Object */
+	if (UNEXPECTED(intern->u.file.stream)) {
+		zend_throw_error(NULL, "Cannot call constructor twice");
+		RETURN_THROWS();
+	}
+
 	if (max_memory < 0) {
 		file_name = zend_string_init("php://memory", sizeof("php://memory")-1, 0);
 	} else if (ZEND_NUM_ARGS()) {

php-8.2.23.tar.xz/ext/spl/spl_dllist.c -> php-8.2.28.tar.xz/ext/spl/spl_dllist.c Changed

@@ -44,10 +44,13 @@
 	efree(elem); \
 }
 
-#define SPL_LLIST_CHECK_DELREF(elem) if ((elem) && !--SPL_LLIST_RC(elem)) { \
+#define SPL_LLIST_CHECK_DELREF_EX(elem, on_free) if ((elem) && !--SPL_LLIST_RC(elem)) { \
 	efree(elem); \
+	on_free \
 }
 
+#define SPL_LLIST_CHECK_DELREF(elem) SPL_LLIST_CHECK_DELREF_EX(elem, ;)
+
 #define SPL_LLIST_ADDREF(elem) SPL_LLIST_RC(elem)++
 #define SPL_LLIST_CHECK_ADDREF(elem) if (elem) SPL_LLIST_RC(elem)++
 
@@ -737,8 +740,10 @@
 		if (element != NULL) {
 			/* the element is replaced, delref the old one as in
 			 * SplDoublyLinkedList::pop() */
-			zval_ptr_dtor(&element->data);
+			zval garbage;
+			ZVAL_COPY_VALUE(&garbage, &element->data);
 			ZVAL_COPY(&element->data, value);
+			zval_ptr_dtor(&garbage);
 		} else {
 			zval_ptr_dtor(value);
 			zend_argument_error(spl_ce_OutOfRangeException, 1, "is an invalid offset");
@@ -1022,8 +1027,12 @@
 		smart_str_appendc(&buf, ':');
 		next = current->next;
 
+		SPL_LLIST_CHECK_ADDREF(next);
+
 		php_var_serialize(&buf, &current->data, &var_hash);
 
+		SPL_LLIST_CHECK_DELREF_EX(next, break;);
+
 		current = next;
 	}

php-8.2.23.tar.xz/ext/spl/spl_fixedarray.c -> php-8.2.28.tar.xz/ext/spl/spl_fixedarray.c Changed

php-8.2.23.tar.xz/ext/spl/spl_heap.c -> php-8.2.28.tar.xz/ext/spl/spl_heap.c Changed

@@ -32,6 +32,7 @@
 #define PTR_HEAP_BLOCK_SIZE 64
 
 #define SPL_HEAP_CORRUPTED       0x00000001
+#define SPL_HEAP_WRITE_LOCKED    0x00000002
 
 zend_object_handlers spl_handler_SplHeap;
 zend_object_handlers spl_handler_SplPriorityQueue;
@@ -278,12 +279,16 @@
 		heap->max_size *= 2;
 	}
 
+	heap->flags |= SPL_HEAP_WRITE_LOCKED;
+
 	/* sifting up */
 	for (i = heap->count; i > 0 && heap->cmp(spl_heap_elem(heap, (i-1)/2), elem, cmp_userdata) < 0; i = (i-1)/2) {
 		spl_heap_elem_copy(heap, spl_heap_elem(heap, i), spl_heap_elem(heap, (i-1)/2));
 	}
 	heap->count++;
 
+	heap->flags &= ~SPL_HEAP_WRITE_LOCKED;
+
 	if (EG(exception)) {
 		/* exception thrown during comparison */
 		heap->flags |= SPL_HEAP_CORRUPTED;
@@ -311,6 +316,8 @@
 		return FAILURE;
 	}
 
+	heap->flags |= SPL_HEAP_WRITE_LOCKED;
+
 	if (elem) {
 		spl_heap_elem_copy(heap, elem, spl_heap_elem(heap, 0));
 	} else {
@@ -334,6 +341,8 @@
 		}
 	}
 
+	heap->flags &= ~SPL_HEAP_WRITE_LOCKED;
+
 	if (EG(exception)) {
 		/* exception thrown during comparison */
 		heap->flags |= SPL_HEAP_CORRUPTED;
@@ -374,10 +383,14 @@
 static void spl_ptr_heap_destroy(spl_ptr_heap *heap) { /* {{{ */
 	int i;
 
+	heap->flags |= SPL_HEAP_WRITE_LOCKED;
+
 	for (i = 0; i < heap->count; ++i) {
 		heap->dtor(spl_heap_elem(heap, i));
 	}
 
+	heap->flags &= ~SPL_HEAP_WRITE_LOCKED;
+
 	efree(heap->elements);
 	efree(heap);
 }
@@ -597,6 +610,21 @@
 }
 /* }}} */
 
+static zend_result spl_heap_consistency_validations(const spl_heap_object *intern, bool write)
+{
+	if (intern->heap->flags & SPL_HEAP_CORRUPTED) {
+		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+		return FAILURE;
+	}
+
+	if (write && (intern->heap->flags & SPL_HEAP_WRITE_LOCKED)) {
+		zend_throw_exception(spl_ce_RuntimeException, "Heap cannot be changed when it is already being modified.", 0);
+		return FAILURE;
+	}
+
+	return SUCCESS;
+}
+
 /* {{{ Push $value on the heap */
 PHP_METHOD(SplHeap, insert)
 {
@@ -609,8 +637,7 @@
 
 	intern = Z_SPLHEAP_P(ZEND_THIS);
 
-	if (intern->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(intern, true) != SUCCESS)) {
 		RETURN_THROWS();
 	}
 
@@ -632,8 +659,7 @@
 
 	intern = Z_SPLHEAP_P(ZEND_THIS);
 
-	if (intern->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(intern, true) != SUCCESS)) {
 		RETURN_THROWS();
 	}
 
@@ -658,8 +684,7 @@
 
 	intern = Z_SPLHEAP_P(ZEND_THIS);
 
-	if (intern->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(intern, true) != SUCCESS)) {
 		RETURN_THROWS();
 	}
 
@@ -699,8 +724,7 @@
 
 	intern = Z_SPLHEAP_P(ZEND_THIS);
 
-	if (intern->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(intern, true) != SUCCESS)) {
 		RETURN_THROWS();
 	}
 
@@ -726,8 +750,7 @@
 
 	intern = Z_SPLHEAP_P(ZEND_THIS);
 
-	if (intern->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(intern, false) != SUCCESS)) {
 		RETURN_THROWS();
 	}
 
@@ -837,8 +860,7 @@
 
 	intern = Z_SPLHEAP_P(ZEND_THIS);
 
-	if (intern->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(intern, false) != SUCCESS)) {
 		RETURN_THROWS();
 	}
 
@@ -902,8 +924,7 @@
 {
 	spl_heap_object *object = Z_SPLHEAP_P(&iter->data);
 
-	if (object->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(object, false) != SUCCESS)) {
 		return NULL;
 	}
 
@@ -920,8 +941,7 @@
 	zend_user_iterator *user_it = (zend_user_iterator *) iter;
 	spl_heap_object *object = Z_SPLHEAP_P(&iter->data);
 
-	if (object->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(object, false) != SUCCESS)) {
 		return NULL;
 	}
 
@@ -949,8 +969,7 @@
 {
 	spl_heap_object *object = Z_SPLHEAP_P(&iter->data);
 
-	if (object->heap->flags & SPL_HEAP_CORRUPTED) {
-		zend_throw_exception(spl_ce_RuntimeException, "Heap is corrupted, heap properties are no longer ensured.", 0);
+	if (UNEXPECTED(spl_heap_consistency_validations(object, false) != SUCCESS)) {
 		return;
 	}

php-8.2.23.tar.xz/ext/spl/spl_iterators.c -> php-8.2.28.tar.xz/ext/spl/spl_iterators.c Changed

@@ -538,6 +538,20 @@
 	return SUCCESS;
 }
 
+static void spl_RecursiveIteratorIterator_free_iterators(spl_recursive_it_object *object)
+{
+	if (object->iterators) {
+		while (object->level >= 0) {
+			zend_object_iterator *sub_iter = object->iteratorsobject->level.iterator;
+			zend_iterator_dtor(sub_iter);
+			zval_ptr_dtor(&object->iteratorsobject->level.zobject);
+			object->level--;
+		}
+		efree(object->iterators);
+		object->iterators = NULL;
+	}
+}
+
 static void spl_recursive_it_it_construct(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry *ce_base, zend_class_entry *ce_inner, recursive_it_it_type rit_type)
 {
 	zval *object = ZEND_THIS;
@@ -604,6 +618,7 @@
 	}
 
 	intern = Z_SPLRECURSIVE_IT_P(object);
+	spl_RecursiveIteratorIterator_free_iterators(intern);
 	intern->iterators = emalloc(sizeof(spl_sub_iterator));
 	intern->level = 0;
 	intern->mode = mode;
@@ -650,6 +665,7 @@
 	intern->iterators0.getchildren = NULL;
 
 	if (EG(exception)) {
+		// TODO: use spl_RecursiveIteratorIterator_free_iterators
 		zend_object_iterator *sub_iter;
 
 		while (intern->level >= 0) {
@@ -958,16 +974,7 @@
 {
 	spl_recursive_it_object *object = spl_recursive_it_from_obj(_object);
 
-	if (object->iterators) {
-		while (object->level >= 0) {
-			zend_object_iterator *sub_iter = object->iteratorsobject->level.iterator;
-			zend_iterator_dtor(sub_iter);
-			zval_ptr_dtor(&object->iteratorsobject->level.zobject);
-			object->level--;
-		}
-		efree(object->iterators);
-		object->iterators = NULL;
-	}
+	spl_RecursiveIteratorIterator_free_iterators(object);
 
 	zend_object_std_dtor(&object->std);
 	for (size_t i = 0; i < 6; i++) {

php-8.2.23.tar.xz/ext/spl/spl_observer.c -> php-8.2.28.tar.xz/ext/spl/spl_observer.c Changed

php-8.2.28.tar.xz/ext/spl/tests/gh14687.phpt Added

@@ -0,0 +1,49 @@
+--TEST--
+GH-14687 segfault on debugging SplObjectStorage instance after __destruct.
+--CREDITS--
+YuanchengJiang
+--EXTENSIONS--
+phar
+--INI--
+phar.require_hash=0
+phar.readonly=0
+--FILE--
+<?php
+$fname = __DIR__ . '/gh14687.phar.zip';
+$phar = new Phar($fname);
+class HasDestructor {
+  public function __destruct() {
+    var_dump($GLOBALS's');
+  }
+}
+$s = new SplObjectStorage();
+$s$phar = new HasDestructor();
+register_shutdown_function(function() {
+	global $s;
+});
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . '/gh14687.phar.zip');
+?>
+--EXPECT--
+object(SplObjectStorage)#2 (1) {
+  "storage":"SplObjectStorage":private=>
+  array(1) {
+    0=>
+    array(2) {
+      "obj"=>
+      object(Phar)#1 (3) {
+        "pathName":"SplFileInfo":private=>
+        string(0) ""
+        "glob":"DirectoryIterator":private=>
+        bool(false)
+        "subPathName":"RecursiveDirectoryIterator":private=>
+        string(0) ""
+      }
+      "inf"=>
+      object(HasDestructor)#3 (0) {
+      }
+    }
+  }
+}

php-8.2.28.tar.xz/ext/spl/tests/gh16337.phpt Added

@@ -0,0 +1,49 @@
+--TEST--
+GH-16337 (Use-after-free in SplHeap)
+--FILE--
+<?php
+
+class C {
+    function __toString() {
+        global $heap;
+        try {
+            $heap->extract();
+        } catch (Throwable $e) {
+            echo $e->getMessage(), "\n";
+        }
+        try {
+            $heap->insert(1);
+        } catch (Throwable $e) {
+            echo $e->getMessage(), "\n";
+        }
+        echo $heap->top(), "\n";
+        return "0";
+    }
+}
+
+$heap = new SplMinHeap;
+for ($i = 0; $i < 100; $i++) {
+    $heap->insert((string) $i);
+}
+$heap->insert(new C);
+
+?>
+--EXPECT--
+Heap cannot be changed when it is already being modified.
+Heap cannot be changed when it is already being modified.
+0
+Heap cannot be changed when it is already being modified.
+Heap cannot be changed when it is already being modified.
+0
+Heap cannot be changed when it is already being modified.
+Heap cannot be changed when it is already being modified.
+0
+Heap cannot be changed when it is already being modified.
+Heap cannot be changed when it is already being modified.
+0
+Heap cannot be changed when it is already being modified.
+Heap cannot be changed when it is already being modified.
+0
+Heap cannot be changed when it is already being modified.
+Heap cannot be changed when it is already being modified.
+0

php-8.2.28.tar.xz/ext/spl/tests/gh16464.phpt Added

php-8.2.28.tar.xz/ext/spl/tests/gh16477-2.phpt Added

php-8.2.28.tar.xz/ext/spl/tests/gh16477.phpt Added

php-8.2.28.tar.xz/ext/spl/tests/gh16478.phpt Added

php-8.2.28.tar.xz/ext/spl/tests/gh16479.phpt Added

php-8.2.28.tar.xz/ext/spl/tests/gh16588.phpt Added

php-8.2.28.tar.xz/ext/spl/tests/gh16589.phpt Added

php-8.2.28.tar.xz/ext/spl/tests/gh16604_1.phpt Added

php-8.2.28.tar.xz/ext/spl/tests/gh16604_2.phpt Added

php-8.2.28.tar.xz/ext/spl/tests/gh16646.phpt Added

php-8.2.28.tar.xz/ext/spl/tests/gh16646_2.phpt Added

php-8.2.23.tar.xz/ext/standard/array.c -> php-8.2.28.tar.xz/ext/standard/array.c Changed

@@ -705,9 +705,9 @@
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (fold_case) {
-		zend_hash_sort(Z_ARRVAL_P(array), php_array_natural_case_compare, 0);
+		zend_array_sort(Z_ARRVAL_P(array), php_array_natural_case_compare, 0);
 	} else {
-		zend_hash_sort(Z_ARRVAL_P(array), php_array_natural_compare, 0);
+		zend_array_sort(Z_ARRVAL_P(array), php_array_natural_compare, 0);
 	}
 
 	RETURN_TRUE;
@@ -743,7 +743,7 @@
 
 	cmp = php_get_data_compare_func(sort_type, 0);
 
-	zend_hash_sort(Z_ARRVAL_P(array), cmp, 0);
+	zend_array_sort(Z_ARRVAL_P(array), cmp, 0);
 
 	RETURN_TRUE;
 }
@@ -764,7 +764,7 @@
 
 	cmp = php_get_data_compare_func(sort_type, 1);
 
-	zend_hash_sort(Z_ARRVAL_P(array), cmp, 0);
+	zend_array_sort(Z_ARRVAL_P(array), cmp, 0);
 
 	RETURN_TRUE;
 }
@@ -785,7 +785,7 @@
 
 	cmp = php_get_data_compare_func(sort_type, 0);
 
-	zend_hash_sort(Z_ARRVAL_P(array), cmp, 1);
+	zend_array_sort(Z_ARRVAL_P(array), cmp, 1);
 
 	RETURN_TRUE;
 }
@@ -806,7 +806,7 @@
 
 	cmp = php_get_data_compare_func(sort_type, 1);
 
-	zend_hash_sort(Z_ARRVAL_P(array), cmp, 1);
+	zend_array_sort(Z_ARRVAL_P(array), cmp, 1);
 
 	RETURN_TRUE;
 }
@@ -904,7 +904,7 @@
 	/* Copy array, so the in-place modifications will not be visible to the callback function */
 	arr = zend_array_dup(arr);
 
-	zend_hash_sort(arr, compare_func, renumber);
+	zend_array_sort(arr, compare_func, renumber);
 
 	zval garbage;
 	ZVAL_COPY_VALUE(&garbage, array);
@@ -1029,11 +1029,50 @@
 	return zobj->handlers->get_properties(zobj);
 }
 
+static zval *php_array_iter_seek_current(HashTable *array, bool forward_direction)
+{
+	zval *entry;
+
+	while (true) {
+		if ((entry = zend_hash_get_current_data(array)) == NULL) {
+			return NULL;
+		}
+
+		ZVAL_DEINDIRECT(entry);
+
+		/* Possible with an uninitialized typed property */
+		if (UNEXPECTED(Z_TYPE_P(entry) == IS_UNDEF)) {
+			zend_result result;
+			if (forward_direction) {
+				result = zend_hash_move_forward(array);
+			} else {
+				result = zend_hash_move_backwards(array);
+			}
+			if (result != SUCCESS) {
+				return NULL;
+			}
+		} else {
+			break;
+		}
+	}
+
+	return entry;
+}
+
+static void php_array_iter_return_current(zval *return_value, HashTable *array, bool forward_direction)
+{
+	zval *entry = php_array_iter_seek_current(array, forward_direction);
+	if (EXPECTED(entry)) {
+		RETURN_COPY_DEREF(entry);
+	} else {
+		RETURN_FALSE;
+	}
+}
+
 /* {{{ Advances array argument's internal pointer to the last element and return it */
 PHP_FUNCTION(end)
 {
 	zval *array_zv;
-	zval *entry;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY_OR_OBJECT_EX(array_zv, 0, 1)
@@ -1047,15 +1086,7 @@
 	zend_hash_internal_pointer_end(array);
 
 	if (USED_RET()) {
-		if ((entry = zend_hash_get_current_data(array)) == NULL) {
-			RETURN_FALSE;
-		}
-
-		if (Z_TYPE_P(entry) == IS_INDIRECT) {
-			entry = Z_INDIRECT_P(entry);
-		}
-
-		RETURN_COPY_DEREF(entry);
+		php_array_iter_return_current(return_value, array, false);
 	}
 }
 /* }}} */
@@ -1064,7 +1095,6 @@
 PHP_FUNCTION(prev)
 {
 	zval *array_zv;
-	zval *entry;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY_OR_OBJECT_EX(array_zv, 0, 1)
@@ -1078,15 +1108,7 @@
 	zend_hash_move_backwards(array);
 
 	if (USED_RET()) {
-		if ((entry = zend_hash_get_current_data(array)) == NULL) {
-			RETURN_FALSE;
-		}
-
-		if (Z_TYPE_P(entry) == IS_INDIRECT) {
-			entry = Z_INDIRECT_P(entry);
-		}
-
-		RETURN_COPY_DEREF(entry);
+		php_array_iter_return_current(return_value, array, false);
 	}
 }
 /* }}} */
@@ -1095,7 +1117,6 @@
 PHP_FUNCTION(next)
 {
 	zval *array_zv;
-	zval *entry;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY_OR_OBJECT_EX(array_zv, 0, 1)
@@ -1109,15 +1130,7 @@
 	zend_hash_move_forward(array);
 
 	if (USED_RET()) {
-		if ((entry = zend_hash_get_current_data(array)) == NULL) {
-			RETURN_FALSE;
-		}
-
-		if (Z_TYPE_P(entry) == IS_INDIRECT) {
-			entry = Z_INDIRECT_P(entry);
-		}
-
-		RETURN_COPY_DEREF(entry);
+		php_array_iter_return_current(return_value, array, true);
 	}
 }
 /* }}} */
@@ -1126,7 +1139,6 @@
 PHP_FUNCTION(reset)
 {
 	zval *array_zv;
-	zval *entry;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY_OR_OBJECT_EX(array_zv, 0, 1)
@@ -1140,15 +1152,7 @@
 	zend_hash_internal_pointer_reset(array);
 
 	if (USED_RET()) {
-		if ((entry = zend_hash_get_current_data(array)) == NULL) {
-			RETURN_FALSE;
-		}
-
-		if (Z_TYPE_P(entry) == IS_INDIRECT) {
-			entry = Z_INDIRECT_P(entry);
-		}
-
-		RETURN_COPY_DEREF(entry);
+		php_array_iter_return_current(return_value, array, true);
 	}
 }
 /* }}} */
@@ -1157,22 +1161,13 @@
 PHP_FUNCTION(current)
 {
 	zval *array_zv;
-	zval *entry;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY_OR_OBJECT(array_zv)
 	ZEND_PARSE_PARAMETERS_END();
 
 	HashTable *array = get_ht_for_iap(array_zv, /* separate */ false);
-	if ((entry = zend_hash_get_current_data(array)) == NULL) {
-		RETURN_FALSE;
-	}
-
-	if (Z_TYPE_P(entry) == IS_INDIRECT) {
-		entry = Z_INDIRECT_P(entry);
-	}
-
-	RETURN_COPY_DEREF(entry);
+	php_array_iter_return_current(return_value, array, true);
 }
 /* }}} */
 
@@ -1186,7 +1181,10 @@
 	ZEND_PARSE_PARAMETERS_END();
 
 	HashTable *array = get_ht_for_iap(array_zv, /* separate */ false);
-	zend_hash_get_current_key_zval(array, return_value);
+	zval *entry = php_array_iter_seek_current(array, true);
+	if (EXPECTED(entry)) {
+		zend_hash_get_current_key_zval(array, return_value);
+	}
 }
 /* }}} */
 
@@ -3700,7 +3698,6 @@
 				}
 
 				ZEND_ASSERT(!Z_ISREF_P(dest_entry) || Z_REFCOUNT_P(dest_entry) > 1);
-				SEPARATE_ZVAL(dest_entry);
 				dest_zval = dest_entry;
 
 				if (Z_TYPE_P(dest_zval) == IS_NULL) {
@@ -3709,6 +3706,8 @@
 				} else {
 					convert_to_array(dest_zval);
 				}
+				SEPARATE_ZVAL(dest_zval);
+
 				ZVAL_UNDEF(&tmp);
 				if (Z_TYPE_P(src_zval) == IS_OBJECT) {
 					ZVAL_COPY(&tmp, src_zval);
@@ -4266,10 +4265,10 @@
 	HashTable *input;
 	zval *colval, *data, rv;
 	zend_string *column_str = NULL;
-	zend_long column_long;
+	zend_long column_long = 0;
 	bool column_is_null = 0;
 	zend_string *index_str = NULL;
-	zend_long index_long;
+	zend_long index_long = 0;
 	bool index_is_null = 1;
 
 	ZEND_PARSE_PARAMETERS_START(2, 3)

php-8.2.23.tar.xz/ext/standard/assert.c -> php-8.2.28.tar.xz/ext/standard/assert.c Changed

php-8.2.23.tar.xz/ext/standard/basic_functions.c -> php-8.2.28.tar.xz/ext/standard/basic_functions.c Changed

php-8.2.23.tar.xz/ext/standard/file.c -> php-8.2.28.tar.xz/ext/standard/file.c Changed

php-8.2.23.tar.xz/ext/standard/filters.c -> php-8.2.28.tar.xz/ext/standard/filters.c Changed

php-8.2.23.tar.xz/ext/standard/http_fopen_wrapper.c -> php-8.2.28.tar.xz/ext/standard/http_fopen_wrapper.c Changed

@@ -67,15 +67,16 @@
 
 #include "php_fopen_wrappers.h"
 
-#define HTTP_HEADER_BLOCK_SIZE		1024
-#define PHP_URL_REDIRECT_MAX		20
-#define HTTP_HEADER_USER_AGENT		1
-#define HTTP_HEADER_HOST			2
-#define HTTP_HEADER_AUTH			4
-#define HTTP_HEADER_FROM			8
-#define HTTP_HEADER_CONTENT_LENGTH	16
-#define HTTP_HEADER_TYPE			32
-#define HTTP_HEADER_CONNECTION		64
+#define HTTP_HEADER_BLOCK_SIZE			1024
+#define HTTP_HEADER_MAX_LOCATION_SIZE	8182 /* 8192 - 10 (size of "Location: ") */
+#define PHP_URL_REDIRECT_MAX			20
+#define HTTP_HEADER_USER_AGENT			1
+#define HTTP_HEADER_HOST				2
+#define HTTP_HEADER_AUTH				4
+#define HTTP_HEADER_FROM				8
+#define HTTP_HEADER_CONTENT_LENGTH		16
+#define HTTP_HEADER_TYPE				32
+#define HTTP_HEADER_CONNECTION			64
 
 #define HTTP_WRAPPER_HEADER_INIT    1
 #define HTTP_WRAPPER_REDIRECTED     2
@@ -107,7 +108,7 @@
 static bool check_has_header(const char *headers, const char *header) {
 	const char *s = headers;
 	while ((s = strstr(s, header))) {
-		if (s == headers || *(s-1) == '\n') {
+		if (s == headers || (*(s-1) == '\n' && *(s-2) == '\r')) {
 			return 1;
 		}
 		s++;
@@ -115,6 +116,214 @@
 	return 0;
 }
 
+typedef struct _php_stream_http_response_header_info {
+	php_stream_filter *transfer_encoding;
+	size_t file_size;
+	bool error;
+	bool follow_location;
+	char *location;
+	size_t location_len;
+} php_stream_http_response_header_info;
+
+static void php_stream_http_response_header_info_init(
+		php_stream_http_response_header_info *header_info)
+{
+	memset(header_info, 0, sizeof(php_stream_http_response_header_info));
+	header_info->follow_location = 1;
+}
+
+/* Trim white spaces from response header line and update its length */
+static bool php_stream_http_response_header_trim(char *http_header_line,
+		size_t *http_header_line_length)
+{
+	char *http_header_line_end = http_header_line + *http_header_line_length - 1;
+	while (http_header_line_end >= http_header_line && 
+			(*http_header_line_end == '\n' || *http_header_line_end == '\r')) {
+		http_header_line_end--;
+	}
+
+	/* The primary definition of an HTTP header in RFC 7230 states:
+	* > Each header field consists of a case-insensitive field name followed
+	* > by a colon (":"), optional leading whitespace, the field value, and
+	* > optional trailing whitespace. */
+
+	/* Strip trailing whitespace */
+	bool space_trim = (*http_header_line_end == ' ' || *http_header_line_end == '\t');
+	if (space_trim) {
+		do {
+			http_header_line_end--;
+		} while (http_header_line_end >= http_header_line &&
+				(*http_header_line_end == ' ' || *http_header_line_end == '\t'));
+	}
+	http_header_line_end++;
+	*http_header_line_end = '\0';
+	*http_header_line_length = http_header_line_end - http_header_line;
+
+	return space_trim;
+}
+
+/* Process folding headers of the current line and if there are none, parse last full response
+ * header line. It returns NULL if the last header is finished, otherwise it returns updated
+ * last header line.  */
+static zend_string *php_stream_http_response_headers_parse(php_stream_wrapper *wrapper,
+		php_stream *stream, php_stream_context *context, int options,
+		zend_string *last_header_line_str, char *header_line, size_t *header_line_length,
+		int response_code, zval *response_header,
+		php_stream_http_response_header_info *header_info)
+{
+	char *last_header_line = ZSTR_VAL(last_header_line_str);
+	size_t last_header_line_length = ZSTR_LEN(last_header_line_str);
+	char *last_header_line_end = ZSTR_VAL(last_header_line_str) + ZSTR_LEN(last_header_line_str) - 1;
+
+	/* Process non empty header line. */
+	if (header_line && (*header_line != '\n' && *header_line != '\r')) {
+		/* Removing trailing white spaces. */
+		if (php_stream_http_response_header_trim(header_line, header_line_length) &&
+				*header_line_length == 0) {
+			/* Only spaces so treat as an empty folding header. */
+			return last_header_line_str;
+		}
+
+		/* Process folding headers if starting with a space or a tab. */
+		if (header_line && (*header_line == ' ' || *header_line == '\t')) {
+			char *http_folded_header_line = header_line;
+			size_t http_folded_header_line_length = *header_line_length;
+			/* Remove the leading white spaces. */
+			while (*http_folded_header_line == ' ' || *http_folded_header_line == '\t') {
+				http_folded_header_line++;
+				http_folded_header_line_length--;
+			}
+			/* It has to have some characters because it would get returned after the call
+			 * php_stream_http_response_header_trim above. */
+			ZEND_ASSERT(http_folded_header_line_length > 0);
+			/* Concatenate last header line, space and current header line. */
+			zend_string *extended_header_str = zend_string_concat3(
+					last_header_line, last_header_line_length,
+					" ", 1,
+					http_folded_header_line, http_folded_header_line_length);
+			zend_string_efree(last_header_line_str);
+			last_header_line_str = extended_header_str;
+			/* Return new header line. */
+			return last_header_line_str;
+		}
+	}
+
+	/* Find header separator position. */
+	char *last_header_value = memchr(last_header_line, ':', last_header_line_length);
+	if (last_header_value) {
+		/* Verify there is no space in header name */
+		char *last_header_name = last_header_line + 1;
+		while (last_header_name < last_header_value) {
+			if (*last_header_name == ' ' || *last_header_name == '\t') {
+				header_info->error = true;
+				php_stream_wrapper_log_error(wrapper, options,
+					"HTTP invalid response format (space in header name)!");
+				zend_string_efree(last_header_line_str);
+				return NULL;
+			}
+			++last_header_name;
+		}
+
+		last_header_value++; /* Skip ':'. */
+
+		/* Strip leading whitespace. */
+		while (last_header_value < last_header_line_end
+				&& (*last_header_value == ' ' || *last_header_value == '\t')) {
+			last_header_value++;
+		}
+	} else {
+		/* There is no colon which means invalid response so error. */
+		header_info->error = true;
+		php_stream_wrapper_log_error(wrapper, options,
+				"HTTP invalid response format (no colon in header line)!");
+		zend_string_efree(last_header_line_str);
+		return NULL;
+	}
+
+	bool store_header = true;
+	zval *tmpzval = NULL;
+
+	if (!strncasecmp(last_header_line, "Location:", sizeof("Location:")-1)) {
+		/* Check if the location should be followed. */
+		if (context && (tmpzval = php_stream_context_get_option(context, "http", "follow_location")) != NULL) {
+			header_info->follow_location = zval_is_true(tmpzval);
+		} else if (!((response_code >= 300 && response_code < 304)
+				|| 307 == response_code || 308 == response_code)) {
+			/* The redirection should not be automatic if follow_location is not set and
+			 * response_code not in (300, 301, 302, 303 and 307)
+			 * see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3.1
+			 * RFC 7238 defines 308: http://tools.ietf.org/html/rfc7238 */
+			header_info->follow_location = 0;
+		}
+		size_t last_header_value_len = strlen(last_header_value);
+		if (last_header_value_len > HTTP_HEADER_MAX_LOCATION_SIZE) {
+			header_info->error = true;
+			php_stream_wrapper_log_error(wrapper, options,
+					"HTTP Location header size is over the limit of %d bytes",
+					HTTP_HEADER_MAX_LOCATION_SIZE);
+			zend_string_efree(last_header_line_str);
+			return NULL;
+		}
+		if (header_info->location_len == 0) {
+			header_info->location = emalloc(last_header_value_len + 1);
+		} else if (header_info->location_len <= last_header_value_len) {
+			header_info->location = erealloc(header_info->location, last_header_value_len + 1);
+		}
+		header_info->location_len = last_header_value_len;
+		memcpy(header_info->location, last_header_value, last_header_value_len + 1);
+	} else if (!strncasecmp(last_header_line, "Content-Type:", sizeof("Content-Type:")-1)) {
+		php_stream_notify_info(context, PHP_STREAM_NOTIFY_MIME_TYPE_IS, last_header_value, 0);
+	} else if (!strncasecmp(last_header_line, "Content-Length:", sizeof("Content-Length:")-1)) {
+		/* https://www.rfc-editor.org/rfc/rfc9110.html#name-content-length */
+		const char *ptr = last_header_value;
+		/* must contain only digits, no + or - symbols */
+		if (*ptr >= '0' && *ptr <= '9') {
+			char *endptr = NULL;
+			size_t parsed = ZEND_STRTOUL(ptr, &endptr, 10);
+			/* check whether there was no garbage in the header value and the conversion was successful */
+			if (endptr && !*endptr) {
+				/* truncate for 32-bit such that no negative file sizes occur */
+				header_info->file_size = MIN(parsed, ZEND_LONG_MAX);
+				php_stream_notify_file_size(context, header_info->file_size, last_header_line, 0);
+			}
+		}
+	} else if (
+		!strncasecmp(last_header_line, "Transfer-Encoding:", sizeof("Transfer-Encoding:")-1)
+		&& !strncasecmp(last_header_value, "Chunked", sizeof("Chunked")-1)
+	) {
+		/* Create filter to decode response body. */
+		if (!(options & STREAM_ONLY_GET_HEADERS)) {
+			zend_long decode = 1;
+
+			if (context && (tmpzval = php_stream_context_get_option(context, "http", "auto_decode")) != NULL) {
+				decode = zend_is_true(tmpzval);
+			}
+			if (decode) {
+				if (header_info->transfer_encoding != NULL) {
+					/* Prevent a memory leak in case there are more transfer-encoding headers. */
+					php_stream_filter_free(header_info->transfer_encoding);
+				}
+				header_info->transfer_encoding = php_stream_filter_create(
+						"dechunk", NULL, php_stream_is_persistent(stream));
+				if (header_info->transfer_encoding != NULL) {
+					/* Do not store transfer-encoding header. */
+					store_header = false;
+				}
+			}
+		}
+	}
+
+	if (store_header) {
+		zval http_header;
+		ZVAL_NEW_STR(&http_header, last_header_line_str);
+		zend_hash_next_index_insert(Z_ARRVAL_P(response_header), &http_header);
+	} else {
+		zend_string_efree(last_header_line_str);
+	}
+
+	return NULL;
+}
+
 static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,
 		const char *path, const char *mode, int options, zend_string **opened_path,
 		php_stream_context *context, int redirect_max, int flags,
@@ -127,11 +336,12 @@
 	zend_string *tmp = NULL;
 	char *ua_str = NULL;
 	zval *ua_zval = NULL, *tmpzval = NULL, ssl_proxy_peer_name;
-	char locationHTTP_HEADER_BLOCK_SIZE;
 	int reqok = 0;
 	char *http_header_line = NULL;
+	zend_string *last_header_line_str = NULL;
+	php_stream_http_response_header_info header_info;
 	char tmp_line128;
-	size_t chunk_size = 0, file_size = 0;
+	size_t chunk_size = 0;
 	int eol_detect = 0;
 	zend_string *transport_string;
 	zend_string *errstr = NULL;
@@ -142,8 +352,6 @@
 	int header_init = ((flags & HTTP_WRAPPER_HEADER_INIT) != 0);
 	int redirected = ((flags & HTTP_WRAPPER_REDIRECTED) != 0);
 	int redirect_keep_method = ((flags & HTTP_WRAPPER_KEEP_METHOD) != 0);
-	bool follow_location = 1;
-	php_stream_filter *transfer_encoding = NULL;
 	int response_code;
 	smart_str req_buf = {0};
 	bool custom_request_method;
@@ -183,6 +391,11 @@
 			return NULL;
 		}
 
+		/* Should we send the entire path in the request line, default to no. */
+		if (context && (tmpzval = php_stream_context_get_option(context, "http", "request_fulluri")) != NULL) {
+			request_fulluri = zend_is_true(tmpzval);
+		}
+
 		use_ssl = resource->scheme && (ZSTR_LEN(resource->scheme) > 4) && ZSTR_VAL(resource->scheme)4 == 's';
 		/* choose default ports */
 		if (use_ssl && resource->port == 0)
@@ -201,6 +414,13 @@
 		}
 	}
 
+	if (request_fulluri && (strchr(path, '\n') != NULL || strchr(path, '\r') != NULL)) {
+		php_stream_wrapper_log_error(wrapper, options, "HTTP wrapper full URI path does not allow CR or LF characters");
+		php_url_free(resource);
+		zend_string_release(transport_string);
+		return NULL;
+	}
+
 	if (context && (tmpzval = php_stream_context_get_option(context, wrapper->wops->label, "timeout")) != NULL) {
 		double d = zval_get_double(tmpzval);
 #ifndef PHP_WIN32
@@ -341,6 +561,8 @@
 		}
 	}
 
+	php_stream_http_response_header_info_init(&header_info);
+
 	if (stream == NULL)
 		goto out;
 
@@ -381,12 +603,6 @@
 		smart_str_appends(&req_buf, "GET ");
 	}
 
-	/* Should we send the entire path in the request line, default to no. */
-	if (!request_fulluri && context &&
-		(tmpzval = php_stream_context_get_option(context, "http", "request_fulluri")) != NULL) {
-		request_fulluri = zend_is_true(tmpzval);
-	}
-
 	if (request_fulluri) {
 		/* Ask for everything */
 		smart_str_appends(&req_buf, path);
@@ -647,8 +863,6 @@
 	/* send it */
 	php_stream_write(stream, ZSTR_VAL(req_buf.s), ZSTR_LEN(req_buf.s));
 
-	location0 = '\0';
-
 	if (Z_ISUNDEF_P(response_header)) {
 		array_init(response_header);
 	}
@@ -731,140 +945,103 @@
 	}
 
 	/* read past HTTP headers */
-
 	while (!php_stream_eof(stream)) {
 		size_t http_header_line_length;
 
 		if (http_header_line != NULL) {
 			efree(http_header_line);
 		}
-		if ((http_header_line = php_stream_get_line(stream, NULL, 0, &http_header_line_length)) && *http_header_line != '\n' && *http_header_line != '\r') {
-			char *e = http_header_line + http_header_line_length - 1;
-			char *http_header_value;
-
-			while (e >= http_header_line && (*e == '\n' || *e == '\r')) {
-				e--;
-			}
-
-			/* The primary definition of an HTTP header in RFC 7230 states:
-			 * > Each header field consists of a case-insensitive field name followed
-			 * > by a colon (":"), optional leading whitespace, the field value, and
-			 * > optional trailing whitespace. */
-
-			/* Strip trailing whitespace */
-			while (e >= http_header_line && (*e == ' ' || *e == '\t')) {
-				e--;
-			}
-
-			/* Terminate header line */
-			e++;
-			*e = '\0';
-			http_header_line_length = e - http_header_line;
-
-			http_header_value = memchr(http_header_line, ':', http_header_line_length);
-			if (http_header_value) {
-				http_header_value++; /* Skip ':' */
-
-				/* Strip leading whitespace */
-				while (http_header_value < e
-						&& (*http_header_value == ' ' || *http_header_value == '\t')) {
-					http_header_value++;
+		if ((http_header_line = php_stream_get_line(stream, NULL, 0, &http_header_line_length))) {
+			bool last_line;
+			if (*http_header_line == '\r') {
+				if (http_header_line1 != '\n') {
+					php_stream_close(stream);
+					stream = NULL;
+					php_stream_wrapper_log_error(wrapper, options,
+							"HTTP invalid header name (cannot start with CR character)!");
+					goto out;
 				}
+				last_line = true;
+			} else if (*http_header_line == '\n') {
+				last_line = true;
 			} else {
-				/* There is no colon. Set the value to the end of the header line, which is
-				 * effectively an empty string. */
-				http_header_value = e;
+				last_line = false;
 			}
-
-			if (!strncasecmp(http_header_line, "Location:", sizeof("Location:")-1)) {
-				if (context && (tmpzval = php_stream_context_get_option(context, "http", "follow_location")) != NULL) {
-					follow_location = zval_is_true(tmpzval);
-				} else if (!((response_code >= 300 && response_code < 304)
-						|| 307 == response_code || 308 == response_code)) {
-					/* we shouldn't redirect automatically
-					if follow_location isn't set and response_code not in (300, 301, 302, 303 and 307)
-					see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3.1
-					RFC 7238 defines 308: http://tools.ietf.org/html/rfc7238 */
-					follow_location = 0;
-				}
-				strlcpy(location, http_header_value, sizeof(location));
-			} else if (!strncasecmp(http_header_line, "Content-Type:", sizeof("Content-Type:")-1)) {
-				php_stream_notify_info(context, PHP_STREAM_NOTIFY_MIME_TYPE_IS, http_header_value, 0);
-			} else if (!strncasecmp(http_header_line, "Content-Length:", sizeof("Content-Length:")-1)) {
-				/* https://www.rfc-editor.org/rfc/rfc9110.html#name-content-length */
-				const char *ptr = http_header_value;
-				/* must contain only digits, no + or - symbols */
-				if (*ptr >= '0' && *ptr <= '9') {
-					char *endptr = NULL;
-					size_t parsed = ZEND_STRTOUL(ptr, &endptr, 10);
-					/* check whether there was no garbage in the header value and the conversion was successful */
-					if (endptr && !*endptr) {
-						/* truncate for 32-bit such that no negative file sizes occur */
-						file_size = MIN(parsed, ZEND_LONG_MAX);
-						php_stream_notify_file_size(context, file_size, http_header_line, 0);
+			
+			if (last_header_line_str != NULL) {
+				/* Parse last header line. */
+				last_header_line_str = php_stream_http_response_headers_parse(wrapper, stream,
+						context, options, last_header_line_str, http_header_line,
+						&http_header_line_length, response_code, response_header, &header_info);
+				if (EXPECTED(last_header_line_str == NULL)) {
+					if (UNEXPECTED(header_info.error)) {
+						php_stream_close(stream);
+						stream = NULL;
+						goto out;
 					}
+				} else {
+					/* Folding header present so continue. */
+					continue;
 				}
-			} else if (
-				!strncasecmp(http_header_line, "Transfer-Encoding:", sizeof("Transfer-Encoding:")-1)
-				&& !strncasecmp(http_header_value, "Chunked", sizeof("Chunked")-1)
-			) {
-
-				/* create filter to decode response body */
-				if (!(options & STREAM_ONLY_GET_HEADERS)) {
-					zend_long decode = 1;
-
-					if (context && (tmpzval = php_stream_context_get_option(context, "http", "auto_decode")) != NULL) {
-						decode = zend_is_true(tmpzval);
-					}
-					if (decode) {
-						transfer_encoding = php_stream_filter_create("dechunk", NULL, php_stream_is_persistent(stream));
-						if (transfer_encoding) {
-							/* don't store transfer-encodeing header */
-							continue;
-						}
-					}
+			} else if (!last_line) {
+				/* The first line cannot start with spaces. */
+				if (*http_header_line == ' ' || *http_header_line == '\t') {
+					php_stream_close(stream);
+					stream = NULL;
+					php_stream_wrapper_log_error(wrapper, options,
+							"HTTP invalid response format (folding header at the start)!");
+					goto out;
 				}
+				/* Trim the first line if it is not the last line. */
+				php_stream_http_response_header_trim(http_header_line, &http_header_line_length);
 			}
-
-			{
-				zval http_header;
-				ZVAL_STRINGL(&http_header, http_header_line, http_header_line_length);
-				zend_hash_next_index_insert(Z_ARRVAL_P(response_header), &http_header);
+			if (last_line) {
+				/* For the last line the last header line must be NULL. */
+				ZEND_ASSERT(last_header_line_str == NULL);
+				break;
 			}
+			/* Save current line as the last line so it gets parsed in the next round. */
+			last_header_line_str = zend_string_init(http_header_line, http_header_line_length, 0);
 		} else {
 			break;
 		}
 	}
 
-	if (!reqok || (location0 != '\0' && follow_location)) {
-		if (!follow_location || (((options & STREAM_ONLY_GET_HEADERS) || ignore_errors) && redirect_max <= 1)) {
+	/* If the stream was closed early, we still want to process the last line to keep BC. */
+	if (last_header_line_str != NULL) {
+		php_stream_http_response_headers_parse(wrapper, stream, context, options,
+				last_header_line_str, NULL, NULL, response_code, response_header, &header_info);
+	}
+
+	if (!reqok || (header_info.location != NULL && header_info.follow_location)) {
+		if (!header_info.follow_location || (((options & STREAM_ONLY_GET_HEADERS) || ignore_errors) && redirect_max <= 1)) {
 			goto out;
 		}
 
-		if (location0 != '\0')
-			php_stream_notify_info(context, PHP_STREAM_NOTIFY_REDIRECTED, location, 0);
+		if (header_info.location != NULL)
+			php_stream_notify_info(context, PHP_STREAM_NOTIFY_REDIRECTED, header_info.location, 0);
 
 		php_stream_close(stream);
 		stream = NULL;
 
-		if (transfer_encoding) {
-			php_stream_filter_free(transfer_encoding);
-			transfer_encoding = NULL;
+		if (header_info.transfer_encoding) {
+			php_stream_filter_free(header_info.transfer_encoding);
+			header_info.transfer_encoding = NULL;
 		}
 
-		if (location0 != '\0') {
+		if (header_info.location != NULL) {
 
-			char new_pathHTTP_HEADER_BLOCK_SIZE;
-			char loc_pathHTTP_HEADER_BLOCK_SIZE;
+			char *new_path = NULL;
 
-			*new_path='\0';
-			if (strlen(location)<8 || (strncasecmp(location, "http://", sizeof("http://")-1) &&
-							strncasecmp(location, "https://", sizeof("https://")-1) &&
-							strncasecmp(location, "ftp://", sizeof("ftp://")-1) &&
-							strncasecmp(location, "ftps://", sizeof("ftps://")-1)))
+			if (strlen(header_info.location) < 8 ||
+					(strncasecmp(header_info.location, "http://", sizeof("http://")-1) &&
+							strncasecmp(header_info.location, "https://", sizeof("https://")-1) &&
+							strncasecmp(header_info.location, "ftp://", sizeof("ftp://")-1) &&
+							strncasecmp(header_info.location, "ftps://", sizeof("ftps://")-1)))
 			{
-				if (*location != '/') {
-					if (*(location+1) != '\0' && resource->path) {
+				char *loc_path = NULL;
+				if (*header_info.location != '/') {
+					if (*(header_info.location+1) != '\0' && resource->path) {
 						char *s = strrchr(ZSTR_VAL(resource->path), '/');
 						if (!s) {
 							s = ZSTR_VAL(resource->path);
@@ -880,29 +1057,35 @@
 						if (resource->path &&
 							ZSTR_VAL(resource->path)0 == '/' &&
 							ZSTR_VAL(resource->path)1 == '\0') {
-							snprintf(loc_path, sizeof(loc_path) - 1, "%s%s", ZSTR_VAL(resource->path), location);
+							spprintf(&loc_path, 0, "%s%s", ZSTR_VAL(resource->path), header_info.location);
 						} else {
-							snprintf(loc_path, sizeof(loc_path) - 1, "%s/%s", ZSTR_VAL(resource->path), location);
+							spprintf(&loc_path, 0, "%s/%s", ZSTR_VAL(resource->path), header_info.location);
 						}
 					} else {
-						snprintf(loc_path, sizeof(loc_path) - 1, "/%s", location);
+						spprintf(&loc_path, 0, "/%s", header_info.location);
 					}
 				} else {
-					strlcpy(loc_path, location, sizeof(loc_path));
+					loc_path = header_info.location;
+					header_info.location = NULL;
 				}
 				if ((use_ssl && resource->port != 443) || (!use_ssl && resource->port != 80)) {
-					snprintf(new_path, sizeof(new_path) - 1, "%s://%s:%d%s", ZSTR_VAL(resource->scheme), ZSTR_VAL(resource->host), resource->port, loc_path);
+					spprintf(&new_path, 0, "%s://%s:%d%s", ZSTR_VAL(resource->scheme),
+							ZSTR_VAL(resource->host), resource->port, loc_path);
 				} else {
-					snprintf(new_path, sizeof(new_path) - 1, "%s://%s%s", ZSTR_VAL(resource->scheme), ZSTR_VAL(resource->host), loc_path);
+					spprintf(&new_path, 0, "%s://%s%s", ZSTR_VAL(resource->scheme),
+							ZSTR_VAL(resource->host), loc_path);
 				}
+				efree(loc_path);
 			} else {
-				strlcpy(new_path, location, sizeof(new_path));
+				new_path = header_info.location;
+				header_info.location = NULL;
 			}
 
 			php_url_free(resource);
 			/* check for invalid redirection URLs */
 			if ((resource = php_url_parse(new_path)) == NULL) {
 				php_stream_wrapper_log_error(wrapper, options, "Invalid redirect URL! %s", new_path);
+				efree(new_path);
 				goto out;
 			}
 
@@ -914,6 +1097,7 @@
 		while (s < e) { \
 			if (iscntrl(*s)) { \
 				php_stream_wrapper_log_error(wrapper, options, "Invalid redirect URL! %s", new_path); \
+				efree(new_path); \
 				goto out; \
 			} \
 			s++; \
@@ -936,6 +1120,7 @@
 			stream = php_stream_url_wrap_http_ex(
 				wrapper, new_path, mode, options, opened_path, context,
 				--redirect_max, new_flags, response_header STREAMS_CC);
+			efree(new_path);
 		} else {
 			php_stream_wrapper_log_error(wrapper, options, "HTTP request failed! %s", tmp_line);
 		}
@@ -948,6 +1133,10 @@
 		efree(http_header_line);
 	}
 
+	if (header_info.location != NULL) {
+		efree(header_info.location);
+	}
+
 	if (resource) {
 		php_url_free(resource);
 	}
@@ -956,7 +1145,7 @@
 		if (header_init) {
 			ZVAL_COPY(&stream->wrapperdata, response_header);
 		}
-		php_stream_notify_progress_init(context, 0, file_size);
+		php_stream_notify_progress_init(context, 0, header_info.file_size);
 
 		/* Restore original chunk size now that we're done with headers */
 		if (options & STREAM_WILL_CAST)
@@ -972,8 +1161,8 @@
 		/* restore mode */
 		strlcpy(stream->mode, mode, sizeof(stream->mode));
 
-		if (transfer_encoding) {
-			php_stream_filter_append(&stream->readfilters, transfer_encoding);
+		if (header_info.transfer_encoding) {
+			php_stream_filter_append(&stream->readfilters, header_info.transfer_encoding);
 		}
 
 		/* It's possible that the server already sent in more data than just the headers.

php-8.2.23.tar.xz/ext/standard/pack.c -> php-8.2.28.tar.xz/ext/standard/pack.c Changed

php-8.2.23.tar.xz/ext/standard/password.c -> php-8.2.28.tar.xz/ext/standard/password.c Changed

php-8.2.23.tar.xz/ext/standard/scanf.c -> php-8.2.28.tar.xz/ext/standard/scanf.c Changed

php-8.2.28.tar.xz/ext/standard/tests/array/gh16053.phpt Added

php-8.2.28.tar.xz/ext/standard/tests/array/gh16905.phpt Added

@@ -0,0 +1,92 @@
+--TEST--
+GH-16905 (Internal iterator functions can't handle UNDEF properties)
+--FILE--
+<?php
+
+class TestSomeUndef {
+	public int $a;
+	public int $b;
+	public int $c;
+	public int $d;
+}
+
+class TestAllUndef {
+	public int $a;
+}
+
+$x = new TestSomeUndef;
+$x->b = 1;
+$x->c = 2;
+
+var_dump(reset($x));
+var_dump(current($x));
+var_dump(end($x));
+
+var_dump(reset($x));
+var_dump(next($x));
+
+var_dump(end($x));
+var_dump(prev($x));
+
+var_dump(key($x));
+var_dump(current($x));
+
+$x = new TestAllUndef;
+var_dump(key($x));
+var_dump(current($x));
+
+$x->a = 1;
+var_dump(key($x));
+var_dump(current($x));
+reset($x);
+var_dump(key($x));
+var_dump(current($x));
+
+?>
+--EXPECTF--
+Deprecated: reset(): Calling reset() on an object is deprecated in %s on line %d
+int(1)
+
+Deprecated: current(): Calling current() on an object is deprecated in %s on line %d
+int(1)
+
+Deprecated: end(): Calling end() on an object is deprecated in %s on line %d
+int(2)
+
+Deprecated: reset(): Calling reset() on an object is deprecated in %s on line %d
+int(1)
+
+Deprecated: next(): Calling next() on an object is deprecated in %s on line %d
+int(2)
+
+Deprecated: end(): Calling end() on an object is deprecated in %s on line %d
+int(2)
+
+Deprecated: prev(): Calling prev() on an object is deprecated in %s on line %d
+int(1)
+
+Deprecated: key(): Calling key() on an object is deprecated in %s on line %d
+string(1) "b"
+
+Deprecated: current(): Calling current() on an object is deprecated in %s on line %d
+int(1)
+
+Deprecated: key(): Calling key() on an object is deprecated in %s on line %d
+NULL
+
+Deprecated: current(): Calling current() on an object is deprecated in %s on line %d
+bool(false)
+
+Deprecated: key(): Calling key() on an object is deprecated in %s on line %d
+NULL
+
+Deprecated: current(): Calling current() on an object is deprecated in %s on line %d
+bool(false)
+
+Deprecated: reset(): Calling reset() on an object is deprecated in %s on line %d
+
+Deprecated: key(): Calling key() on an object is deprecated in %s on line %d
+string(1) "a"
+
+Deprecated: current(): Calling current() on an object is deprecated in %s on line %d
+int(1)

php-8.2.23.tar.xz/ext/standard/tests/file/copy_variation5-win32.phpt -> php-8.2.28.tar.xz/ext/standard/tests/file/copy_variation5-win32.phpt Changed

@@ -22,9 +22,9 @@
 $dest_files = array(
 
   /* Checking case sensitiveness */
-  "COPY.tmp",
-  "COPY.TMP",
-  "CopY.TMP"
+  "COPY5.tmp",
+  "COPY5.TMP",
+  "CopY5.TMP"
 );
 
 echo "Size of the source file before copy operation => ";
@@ -80,25 +80,25 @@
 -- Iteration 1 --
 Copy operation => bool(true)
 Existence of destination file => bool(true)
-Destination file name => %s/COPY.tmp
+Destination file name => %s/COPY5.tmp
 Size of source file => int(1500)
 Size of destination file => int(1500)
 
 -- Iteration 2 --
 Copy operation => bool(true)
 Existence of destination file => bool(true)
-Destination file name => %s/COPY.TMP
+Destination file name => %s/COPY5.TMP
 Size of source file => int(1500)
 Size of destination file => int(1500)
 
 -- Iteration 3 --
 Copy operation => bool(true)
 Existence of destination file => bool(true)
-Destination file name => %s/CopY.TMP
+Destination file name => %s/CopY5.TMP
 Size of source file => int(1500)
 Size of destination file => int(1500)
 
-Warning: unlink(%s/COPY.TMP): No such file or directory in %s on line %d
+Warning: unlink(%s/COPY5.TMP): No such file or directory in %s on line %d
 
-Warning: unlink(%s/CopY.TMP): No such file or directory in %s on line %d
+Warning: unlink(%s/CopY5.TMP): No such file or directory in %s on line %d
 *** Done ***

php-8.2.23.tar.xz/ext/standard/tests/file/fgetcsv_error_conditions.phpt -> php-8.2.28.tar.xz/ext/standard/tests/file/fgetcsv_error_conditions.phpt Changed

php-8.2.23.tar.xz/ext/standard/tests/file/file_get_contents_basic.phpt -> php-8.2.28.tar.xz/ext/standard/tests/file/file_get_contents_basic.phpt Changed

php-8.2.23.tar.xz/ext/standard/tests/file/file_get_contents_error.phpt -> php-8.2.28.tar.xz/ext/standard/tests/file/file_get_contents_error.phpt Changed

php-8.2.23.tar.xz/ext/standard/tests/file/file_put_contents_variation7.phpt -> php-8.2.28.tar.xz/ext/standard/tests/file/file_put_contents_variation7.phpt Changed

php-8.2.28.tar.xz/ext/standard/tests/file/gh15653.phpt Added

php-8.2.23.tar.xz/ext/standard/tests/file/parse_ini_file_variation6.phpt -> php-8.2.28.tar.xz/ext/standard/tests/file/parse_ini_file_variation6.phpt Changed

php-8.2.23.tar.xz/ext/standard/tests/file/rename_variation12-win32.phpt -> php-8.2.28.tar.xz/ext/standard/tests/file/rename_variation12-win32.phpt Changed

@@ -11,8 +11,8 @@
 /* Creating unique files in various dirs by passing relative paths to $dir arg */
 
 echo "*** Testing rename() with absolute and relative paths ***\n";
-$mainDir = "renameVar11";
-$subDir = "renameVar11Sub";
+$mainDir = "renameVar12";
+$subDir = "renameVar12Sub";
 $absMainDir = __DIR__."/".$mainDir;
 mkdir($absMainDir);
 $absSubDir = $absMainDir."/".$subDir;
@@ -83,12 +83,12 @@
 
 -- Iteration 5 --
 
-Warning: rename(%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/renameMe.tmp,%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/IwasRenamed.tmp): The system cannot find the path specified (code: 3) in %s on line %d
+Warning: rename(%s/renameVar12/renameVar12Sub/..///renameVar12Sub//..//../renameVar12Sub/renameMe.tmp,%s/renameVar12/renameVar12Sub/..///renameVar12Sub//..//../renameVar12Sub/IwasRenamed.tmp): The system cannot find the path specified (code: 3) in %s on line %d
 bool(false)
 
 -- Iteration 6 --
 
-Warning: rename(%s/renameVar11/renameVar11Sub/BADDIR/renameMe.tmp,%s/renameVar11/renameVar11Sub/BADDIR/IwasRenamed.tmp): The system cannot find the path specified (code: 3) in %s on line %d
+Warning: rename(%s/renameVar12/renameVar12Sub/BADDIR/renameMe.tmp,%s/renameVar12/renameVar12Sub/BADDIR/IwasRenamed.tmp): The system cannot find the path specified (code: 3) in %s on line %d
 bool(false)
 
 -- Iteration 7 --

php-8.2.23.tar.xz/ext/standard/tests/file/rename_variation12.phpt -> php-8.2.28.tar.xz/ext/standard/tests/file/rename_variation12.phpt Changed

@@ -11,8 +11,8 @@
 /* Creating unique files in various dirs by passing relative paths to $dir arg */
 
 echo "*** Testing rename() with absolute and relative paths ***\n";
-$mainDir = "renameVar11";
-$subDir = "renameVar11Sub";
+$mainDir = "renameVar12";
+$subDir = "renameVar12Sub";
 $absMainDir = __DIR__."/".$mainDir;
 mkdir($absMainDir);
 $absSubDir = $absMainDir."/".$subDir;
@@ -83,12 +83,12 @@
 
 -- Iteration 5 --
 
-Warning: rename(%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/renameMe.tmp,%s/renameVar11/renameVar11Sub/..///renameVar11Sub//..//../renameVar11Sub/IwasRenamed.tmp): %s in %s on line %d
+Warning: rename(%s/renameVar12/renameVar12Sub/..///renameVar12Sub//..//../renameVar12Sub/renameMe.tmp,%s/renameVar12/renameVar12Sub/..///renameVar12Sub//..//../renameVar12Sub/IwasRenamed.tmp): %s in %s on line %d
 bool(false)
 
 -- Iteration 6 --
 
-Warning: rename(%s/renameVar11/renameVar11Sub/BADDIR/renameMe.tmp,%s/renameVar11/renameVar11Sub/BADDIR/IwasRenamed.tmp): %s in %s on line %d
+Warning: rename(%s/renameVar12/renameVar12Sub/BADDIR/renameMe.tmp,%s/renameVar12/renameVar12Sub/BADDIR/IwasRenamed.tmp): %s in %s on line %d
 bool(false)
 
 -- Iteration 7 --

php-8.2.28.tar.xz/ext/standard/tests/filters/ghsa-r977-prxv-hc43.phpt Added

@@ -0,0 +1,12 @@
+--TEST--
+GHSA-r977-prxv-hc43: Single byte overread with convert.quoted-printable-decode filter
+--FILE--
+<?php
+
+$input_data = str_repeat('A', 8189)."X=\r";
+$filter_url = "php://filter/convert.quoted-printable-decode/resource=data:," . urlencode($input_data);
+var_dump(file_get_contents($filter_url));
+
+?>
+--EXPECT--
+string(8190) "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAX"

php-8.2.28.tar.xz/ext/standard/tests/general_functions/gh17211.phpt Added

php-8.2.23.tar.xz/ext/standard/tests/general_functions/phpinfo.phpt -> php-8.2.28.tar.xz/ext/standard/tests/general_functions/phpinfo.phpt Changed

@@ -16,21 +16,21 @@
 PHP Version => %s
 
 System => %s
-Build Date => %s%a
+Build Date => %r(.+?)%r
 Configure Command => %s
 Server API => Command Line Interface
 Virtual Directory Support => %s
 Configuration File (php.ini) Path => %s
-Loaded Configuration File => %a
-Scan this dir for additional .ini files => %a
-Additional .ini files parsed => %a
+Loaded Configuration File => %r(.+?)%r
+Scan this dir for additional .ini files => %r(.+?)%r
+Additional .ini files parsed => %r(.+?)%r
 PHP API => %d
 PHP Extension => %d
 Zend Extension => %d
 Zend Extension Build => API%s
 PHP Extension Build => API%s
 Debug Build => %s
-Thread Safety => %s%A
+Thread Safety => %r(.+?)%r
 Zend Signal Handling => %s
 Zend Memory Manager => %s
 Zend Multibyte Support => %s
@@ -42,22 +42,22 @@
 Registered Stream Socket Transports => %s
 Registered Stream Filters => %s
 
-%a
+%r(.+?)%r
  _______________________________________________________________________
 
 
 Configuration
-%A
+%r(.*?)%r
 Core
-%A
+%r(.*?)%r
 Additional Modules
-%A
+%r(.*?)%r
 Environment
-%A
+%r(.*?)%r
 PHP Variables
-%A
+%r(.*?)%r
 PHP License
-%A
+%r(.*?)%r
 bool(true)
 --
 phpinfo()
@@ -66,5 +66,5 @@
 phpinfo()
 
 PHP License
-%a
+%r(.+?)%r
 bool(true)

php-8.2.23.tar.xz/ext/standard/tests/http/bug47021.phpt -> php-8.2.28.tar.xz/ext/standard/tests/http/bug47021.phpt Changed

php-8.2.23.tar.xz/ext/standard/tests/http/bug75535.phpt -> php-8.2.28.tar.xz/ext/standard/tests/http/bug75535.phpt Changed

php-8.2.28.tar.xz/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-001.phpt Added

@@ -0,0 +1,58 @@
+--TEST--
+GHSA-52jp-hrpf-2jff: HTTP stream wrapper truncate redirect location to 1024 bytes (success)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+$ctxt = stream_context_create(
+     "socket" => 
+         "tcp_nodelay" => true
+     
+ );
+
+ $server = stream_socket_server(
+     "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+ phpt_notify_server_start($server);
+
+ $conn = stream_socket_accept($server);
+
+ phpt_notify(message:"server-accepted");
+
+ $loc = str_repeat("y", 8000);
+ fwrite($conn, "HTTP/1.0 301 Ok\r\nContent-Type: text/html;\r\nLocation: $loc\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+ function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+ switch($notification_code) {
+     case STREAM_NOTIFY_MIME_TYPE_IS:
+         echo "Found the mime-type: ", $message, PHP_EOL;
+         break;
+     case STREAM_NOTIFY_REDIRECTED:
+         echo "Redirected: ";
+         var_dump($message);
+     }
+ }
+
+ $ctx = stream_context_create();
+ stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+ var_dump(trim(file_get_contents("http://{{ ADDR }}", false, $ctx)));
+ var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+Found the mime-type: text/html;
+Redirected: string(8000) "%s"
+
+Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: %s
+string(0) ""
+array(3) {
+  0=>
+  string(15) "HTTP/1.0 301 Ok"
+  1=>
+  string(24) "Content-Type: text/html;"
+  2=>
+  string(8010) "Location: %s"
+}

php-8.2.28.tar.xz/ext/standard/tests/http/ghsa-52jp-hrpf-2jff-002.phpt Added

@@ -0,0 +1,55 @@
+--TEST--
+GHSA-52jp-hrpf-2jff: HTTP stream wrapper truncate redirect location to 1024 bytes (over limit)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+$ctxt = stream_context_create(
+     "socket" => 
+         "tcp_nodelay" => true
+     
+ );
+
+ $server = stream_socket_server(
+     "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+ phpt_notify_server_start($server);
+
+ $conn = stream_socket_accept($server);
+
+ phpt_notify(message:"server-accepted");
+
+ $loc = str_repeat("y", 9000);
+ fwrite($conn, "HTTP/1.0 301 Ok\r\nContent-Type: text/html;\r\nLocation: $loc\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+ function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+ switch($notification_code) {
+     case STREAM_NOTIFY_MIME_TYPE_IS:
+         echo "Found the mime-type: ", $message, PHP_EOL;
+         break;
+     case STREAM_NOTIFY_REDIRECTED:
+         echo "Redirected: ";
+         var_dump($message);
+     }
+ }
+
+ $ctx = stream_context_create();
+ stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+ var_dump(trim(file_get_contents("http://{{ ADDR }}", false, $ctx)));
+ var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+Found the mime-type: text/html;
+
+Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: HTTP Location header size is over the limit of 8182 bytes in %s
+string(0) ""
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 301 Ok"
+  1=>
+  string(24) "Content-Type: text/html;"
+}

php-8.2.28.tar.xz/ext/standard/tests/http/ghsa-c5f2-jwm7-mmq2.phpt Added

php-8.2.28.tar.xz/ext/standard/tests/http/ghsa-hgf5-96fm-v528-001.phpt Added

@@ -0,0 +1,65 @@
+--TEST--
+GHSA-hgf5-96fm-v528: Stream HTTP wrapper header check might omit basic auth header (incorrect inside pos)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    $result = fread($conn, 1024);
+    $encoded_result = base64_encode($result);
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html; charset=utf-8\r\n\r\n$encoded_result\r\n");
+
+CODE;
+
+$clientCode = <<<'CODE'
+    $opts = 
+        "http" => 
+            "method" => "GET",
+            "header" => "Cookie: foo=bar\nauthorization:x\r\n"
+        
+    ;
+    $ctx = stream_context_create($opts);
+    var_dump(explode("\r\n", base64_decode(file_get_contents("http://user:pwd@{{ ADDR }}", false, $ctx))));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+array(7) {
+  0=>
+  string(14) "GET / HTTP/1.1"
+  1=>
+  string(33) "Authorization: Basic dXNlcjpwd2Q="
+  2=>
+  string(21) "Host: 127.0.0.1:%d"
+  3=>
+  string(17) "Connection: close"
+  4=>
+  string(31) "Cookie: foo=bar
+authorization:x"
+  5=>
+  string(0) ""
+  6=>
+  string(0) ""
+}
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(38) "Content-Type: text/html; charset=utf-8"
+}

php-8.2.28.tar.xz/ext/standard/tests/http/ghsa-hgf5-96fm-v528-002.phpt Added

@@ -0,0 +1,62 @@
+--TEST--
+GHSA-hgf5-96fm-v528: Header parser of http stream wrapper does not handle folded headers (correct start pos)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    $result = fread($conn, 1024);
+    $encoded_result = base64_encode($result);
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html; charset=utf-8\r\n\r\n$encoded_result\r\n");
+
+CODE;
+
+$clientCode = <<<'CODE'
+    $opts = 
+        "http" => 
+            "method" => "GET",
+            "header" => "Authorization: Bearer x\r\n"
+        
+    ;
+    $ctx = stream_context_create($opts);
+    var_dump(explode("\r\n", base64_decode(file_get_contents("http://user:pwd@{{ ADDR }}", false, $ctx))));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+array(6) {
+  0=>
+  string(14) "GET / HTTP/1.1"
+  1=>
+  string(21) "Host: 127.0.0.1:%d"
+  2=>
+  string(17) "Connection: close"
+  3=>
+  string(23) "Authorization: Bearer x"
+  4=>
+  string(0) ""
+  5=>
+  string(0) ""
+}
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(38) "Content-Type: text/html; charset=utf-8"
+}

php-8.2.28.tar.xz/ext/standard/tests/http/ghsa-hgf5-96fm-v528-003.phpt Added

@@ -0,0 +1,64 @@
+--TEST--
+GHSA-hgf5-96fm-v528: Header parser of http stream wrapper does not handle folded headers (correct middle pos)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    $result = fread($conn, 1024);
+    $encoded_result = base64_encode($result);
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html; charset=utf-8\r\n\r\n$encoded_result\r\n");
+
+CODE;
+
+$clientCode = <<<'CODE'
+    $opts = 
+        "http" => 
+            "method" => "GET",
+            "header" => "Cookie: x=y\r\nAuthorization: Bearer x\r\n"
+        
+    ;
+    $ctx = stream_context_create($opts);
+    var_dump(explode("\r\n", base64_decode(file_get_contents("http://user:pwd@{{ ADDR }}", false, $ctx))));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+array(7) {
+  0=>
+  string(14) "GET / HTTP/1.1"
+  1=>
+  string(21) "Host: 127.0.0.1:%d"
+  2=>
+  string(17) "Connection: close"
+  3=>
+  string(11) "Cookie: x=y"
+  4=>
+  string(23) "Authorization: Bearer x"
+  5=>
+  string(0) ""
+  6=>
+  string(0) ""
+}
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(38) "Content-Type: text/html; charset=utf-8"
+}

php-8.2.28.tar.xz/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-001.phpt Added

@@ -0,0 +1,51 @@
+--TEST--
+GHSA-pcmh-g36c-qc44: Header parser of http stream wrapper does not verify header name and colon (colon)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html\r\nWrong-Header\r\nGood-Header: test\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+    function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+    switch($notification_code) {
+        case STREAM_NOTIFY_MIME_TYPE_IS:
+            echo "Found the mime-type: ", $message, PHP_EOL;
+            break;
+        }
+    }
+
+    $ctx = stream_context_create();
+    stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+    var_dump(file_get_contents("http://{{ ADDR }}", false, $ctx));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+Found the mime-type: text/html
+
+Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: HTTP invalid response format (no colon in header line)! in %s
+bool(false)
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(23) "Content-Type: text/html"
+}

php-8.2.28.tar.xz/ext/standard/tests/http/ghsa-pcmh-g36c-qc44-002.phpt Added

@@ -0,0 +1,51 @@
+--TEST--
+GHSA-pcmh-g36c-qc44: Header parser of http stream wrapper does not verify header name and colon (name)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html\r\nWrong-Header : test\r\nGood-Header: test\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+    function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+    switch($notification_code) {
+        case STREAM_NOTIFY_MIME_TYPE_IS:
+            echo "Found the mime-type: ", $message, PHP_EOL;
+            break;
+        }
+    }
+
+    $ctx = stream_context_create();
+    stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+    var_dump(file_get_contents("http://{{ ADDR }}", false, $ctx));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+Found the mime-type: text/html
+
+Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: HTTP invalid response format (space in header name)! in %s
+bool(false)
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(23) "Content-Type: text/html"
+}

php-8.2.28.tar.xz/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-001.phpt Added

@@ -0,0 +1,49 @@
+--TEST--
+GHSA-v8xr-gpvj-cx9g: Header parser of http stream wrapper does not handle folded headers (single)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html;\r\n    charset=utf-8\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+    function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+    switch($notification_code) {
+        case STREAM_NOTIFY_MIME_TYPE_IS:
+            echo "Found the mime-type: ", $message, PHP_EOL;
+            break;
+        }
+    }
+
+    $ctx = stream_context_create();
+    stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+    var_dump(trim(file_get_contents("http://{{ ADDR }}", false, $ctx)));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+Found the mime-type: text/html; charset=utf-8
+string(4) "body"
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(38) "Content-Type: text/html; charset=utf-8"
+}

php-8.2.28.tar.xz/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-002.phpt Added

@@ -0,0 +1,51 @@
+--TEST--
+GHSA-v8xr-gpvj-cx9g: Header parser of http stream wrapper does not handle folded headers (multiple)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html;\r\nCustom-Header: somevalue;\r\n  param1=value1; \r\n    param2=value2\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+    function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+    switch($notification_code) {
+        case STREAM_NOTIFY_MIME_TYPE_IS:
+            echo "Found the mime-type: ", $message, PHP_EOL;
+            break;
+        }
+    }
+
+    $ctx = stream_context_create();
+    stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+    var_dump(trim(file_get_contents("http://{{ ADDR }}", false, $ctx)));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+Found the mime-type: text/html;
+string(4) "body"
+array(3) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(24) "Content-Type: text/html;"
+  2=>
+  string(54) "Custom-Header: somevalue; param1=value1; param2=value2"
+}

php-8.2.28.tar.xz/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-003.phpt Added

@@ -0,0 +1,49 @@
+--TEST--
+GHSA-v8xr-gpvj-cx9g: Header parser of http stream wrapper does not handle folded headers (empty)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\nContent-Type: text/html;\r\n    \r\n charset=utf-8\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+    function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+    switch($notification_code) {
+        case STREAM_NOTIFY_MIME_TYPE_IS:
+            echo "Found the mime-type: ", $message, PHP_EOL;
+            break;
+        }
+    }
+
+    $ctx = stream_context_create();
+    stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+    var_dump(trim(file_get_contents("http://{{ ADDR }}", false, $ctx)));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+Found the mime-type: text/html; charset=utf-8
+string(4) "body"
+array(2) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+  1=>
+  string(38) "Content-Type: text/html; charset=utf-8"
+}

php-8.2.28.tar.xz/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-004.phpt Added

@@ -0,0 +1,48 @@
+--TEST--
+GHSA-v8xr-gpvj-cx9g: Header parser of http stream wrapper does not handle folded headers (first line)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\n   Content-Type: text/html;\r\n    \r\n charset=utf-8\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+    function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+    switch($notification_code) {
+        case STREAM_NOTIFY_MIME_TYPE_IS:
+            echo "Found the mime-type: ", $message, PHP_EOL;
+            break;
+        }
+    }
+
+    $ctx = stream_context_create();
+    stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+    var_dump(file_get_contents("http://{{ ADDR }}", false, $ctx));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+
+Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: HTTP invalid response format (folding header at the start)! in %s
+bool(false)
+array(1) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+}

php-8.2.28.tar.xz/ext/standard/tests/http/ghsa-v8xr-gpvj-cx9g-005.phpt Added

@@ -0,0 +1,48 @@
+--TEST--
+GHSA-v8xr-gpvj-cx9g: Header parser of http stream wrapper does not handle folded headers (CR before header name)
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+   $ctxt = stream_context_create(
+        "socket" => 
+            "tcp_nodelay" => true
+        
+    );
+
+    $server = stream_socket_server(
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
+
+    $conn = stream_socket_accept($server);
+
+    phpt_notify(message:"server-accepted");
+
+    fwrite($conn, "HTTP/1.0 200 Ok\r\n\rIgnored: ignored\r\n\r\nbody\r\n");
+CODE;
+
+$clientCode = <<<'CODE'
+    function stream_notification_callback($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
+    switch($notification_code) {
+        case STREAM_NOTIFY_MIME_TYPE_IS:
+            echo "Found the mime-type: ", $message, PHP_EOL;
+            break;
+        }
+    }
+
+    $ctx = stream_context_create();
+    stream_context_set_params($ctx, array("notification" => "stream_notification_callback"));
+    var_dump(file_get_contents("http://{{ ADDR }}", false, $ctx));
+    var_dump($http_response_header);
+CODE;
+
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--EXPECTF--
+
+Warning: file_get_contents(http://127.0.0.1:%d): Failed to open stream: HTTP invalid header name (cannot start with CR character)! in %s
+bool(false)
+array(1) {
+  0=>
+  string(15) "HTTP/1.0 200 Ok"
+}

php-8.2.23.tar.xz/ext/standard/tests/network/bug20134.phpt -> php-8.2.28.tar.xz/ext/standard/tests/network/bug20134.phpt Changed

php-8.2.28.tar.xz/ext/standard/tests/streams/gh15908.phpt Added

php-8.2.28.tar.xz/ext/standard/tests/streams/gh15937.phpt Added

php-8.2.28.tar.xz/ext/standard/tests/streams/gh15980.phpt Added

php-8.2.23.tar.xz/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt -> php-8.2.28.tar.xz/ext/standard/tests/streams/stream_context_tcp_nodelay_server.phpt Changed

@@ -2,6 +2,10 @@
 stream context tcp_nodelay server
 --EXTENSIONS--
 sockets
+--SKIPIF--
+<?php
+if (!function_exists("proc_open")) die("skip no proc_open");
+?>
 --FILE--
 <?php
 $serverCode = <<<'CODE'
@@ -12,36 +16,25 @@
     );
 
     $server = stream_socket_server(
-        "tcp://127.0.0.1:9099", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
-
-    $client = stream_socket_accept($server);
+        "tcp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $ctxt);
+    phpt_notify_server_start($server);
 
-    var_dump(socket_get_option(
-                socket_import_stream($server),
-                    SOL_TCP, TCP_NODELAY) > 0);
+    $conn = stream_socket_accept($server);
 
-    var_dump(socket_get_option(
-                socket_import_stream($client),
-                    SOL_TCP, TCP_NODELAY) > 0);
+    $si = socket_get_option(socket_import_stream($server), SOL_TCP, TCP_NODELAY) > 0 ? "nodelay": "delay";
+    $ci = socket_get_option(socket_import_stream($conn), SOL_TCP, TCP_NODELAY) > 0 ? "nodelay": "delay";
 
-    fclose($client);
-    fclose($server);
+    phpt_notify(message:"server-$si:conn-$ci");
 CODE;
 
 $clientCode = <<<'CODE'
-    $test = stream_socket_client(
-        "tcp://127.0.0.1:9099", $errno, $errstr, 10);
-
-    sleep(1);
-
-    fclose($test);
+    $test = stream_socket_client("tcp://{{ ADDR }}", $errno, $errstr, 10);
+    echo phpt_wait();
 CODE;
 
-include sprintf(
-    "%s/../../../openssl/tests/ServerClientTestCase.inc",
-    __DIR__);
-ServerClientTestCase::getInstance()->run($serverCode, $clientCode);
+include sprintf("%s/../../../openssl/tests/ServerClientTestCase.inc", __DIR__);
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
 ?>
---EXPECT--
-bool(false)
-bool(true)
+--EXPECTF--
+server-delay:conn-nodelay
+

php-8.2.28.tar.xz/ext/standard/tests/strings/gh15552.phpt Added

php-8.2.28.tar.xz/ext/standard/tests/strings/gh15613.phpt Added

php-8.2.23.tar.xz/ext/standard/url_scanner_ex.c -> php-8.2.28.tar.xz/ext/standard/url_scanner_ex.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 3.1 */
+/* Generated by re2c 2.0.3 */
 /*
   +----------------------------------------------------------------------+
   | Copyright (c) The PHP Group                                          |
@@ -555,18 +555,18 @@
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy1;
+		goto yy2;
 	}
-	goto yy2;
-yy1:
+	goto yy5;
+yy2:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy1;
+		goto yy2;
 	}
 	{ passthru(STD_ARGS); goto state_plain; }
-yy2:
+yy5:
 	++YYCURSOR;
 	{ passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
 }
@@ -614,16 +614,16 @@
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy4;
+		goto yy11;
 	}
 	++YYCURSOR;
 	{ passthru(STD_ARGS); goto state_plain_begin; }
-yy4:
+yy11:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy4;
+		goto yy11;
 	}
 	{ handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE == STATE_PLAIN) goto state_plain; else goto state_next_arg; }
 }
@@ -674,38 +674,38 @@
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy8;
+		goto yy18;
 	}
 	if (yych <= '>') {
-		if (yych == '/') goto yy9;
-		if (yych >= '>') goto yy10;
+		if (yych == '/') goto yy21;
+		if (yych >= '>') goto yy22;
 	} else {
 		if (yych <= 'Z') {
-			if (yych >= 'A') goto yy11;
+			if (yych >= 'A') goto yy24;
 		} else {
-			if (yych <= '`') goto yy6;
-			if (yych <= 'z') goto yy11;
+			if (yych <= '`') goto yy16;
+			if (yych <= 'z') goto yy24;
 		}
 	}
-yy6:
+yy16:
 	++YYCURSOR;
-yy7:
+yy17:
 	{ passthru(STD_ARGS); goto state_plain_begin; }
-yy8:
+yy18:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy8;
+		goto yy18;
 	}
 	{ passthru(STD_ARGS); goto state_next_arg; }
-yy9:
+yy21:
 	yych = *++YYCURSOR;
-	if (yych != '>') goto yy7;
-yy10:
+	if (yych != '>') goto yy17;
+yy22:
 	++YYCURSOR;
 	{ passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; }
-yy11:
+yy24:
 	++YYCURSOR;
 	{ --YYCURSOR; STATE = STATE_ARG; goto state_arg; }
 }
@@ -752,19 +752,19 @@
 	};
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '@') goto yy13;
-	if (yych <= 'Z') goto yy14;
-	if (yych <= '`') goto yy13;
-	if (yych <= 'z') goto yy14;
-yy13:
+	if (yych <= '@') goto yy28;
+	if (yych <= 'Z') goto yy30;
+	if (yych <= '`') goto yy28;
+	if (yych <= 'z') goto yy30;
+yy28:
 	++YYCURSOR;
 	{ passthru(STD_ARGS); STATE = STATE_NEXT_ARG; goto state_next_arg; }
-yy14:
+yy30:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy14;
+		goto yy30;
 	}
 	{ passthru(STD_ARGS); handle_arg(STD_ARGS); STATE = STATE_BEFORE_VAL; goto state_before_val; }
 }
@@ -811,31 +811,31 @@
 	};
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yych == ' ') goto yy17;
-	if (yych == '=') goto yy18;
+	if (yych == ' ') goto yy37;
+	if (yych == '=') goto yy38;
 	++YYCURSOR;
-yy16:
+yy36:
 	{ --YYCURSOR; goto state_next_arg_begin; }
-yy17:
+yy37:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ' ') goto yy19;
-	if (yych != '=') goto yy16;
-yy18:
+	if (yych == ' ') goto yy41;
+	if (yych != '=') goto yy36;
+yy38:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy18;
+		goto yy38;
 	}
 	{ passthru(STD_ARGS); STATE = STATE_VAL; goto state_val; }
-yy19:
+yy41:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych == ' ') goto yy19;
-	if (yych == '=') goto yy18;
+	if (yych == ' ') goto yy41;
+	if (yych == '=') goto yy38;
 	YYCURSOR = YYMARKER;
-	goto yy16;
+	goto yy36;
 }
 
 
@@ -882,56 +882,56 @@
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 32) {
-		goto yy21;
+		goto yy46;
 	}
-	if (yych <= ' ') goto yy22;
-	if (yych <= '"') goto yy24;
-	if (yych <= '\'') goto yy25;
-	goto yy22;
-yy21:
+	if (yych <= ' ') goto yy49;
+	if (yych <= '"') goto yy51;
+	if (yych <= '\'') goto yy52;
+	goto yy49;
+yy46:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 32) {
-		goto yy21;
+		goto yy46;
 	}
 	{ handle_val(STD_ARGS, 0, ' '); goto state_next_arg_begin; }
-yy22:
+yy49:
 	++YYCURSOR;
-yy23:
+yy50:
 	{ passthru(STD_ARGS); goto state_next_arg_begin; }
-yy24:
+yy51:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '>') goto yy23;
-	goto yy27;
-yy25:
+	if (yych == '>') goto yy50;
+	goto yy54;
+yy52:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '>') goto yy23;
-	goto yy31;
-yy26:
+	if (yych == '>') goto yy50;
+	goto yy59;
+yy53:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy27:
+yy54:
 	if (yybm0+yych & 64) {
-		goto yy26;
+		goto yy53;
 	}
-	if (yych <= '"') goto yy29;
-yy28:
+	if (yych <= '"') goto yy56;
+yy55:
 	YYCURSOR = YYMARKER;
-	goto yy23;
-yy29:
+	goto yy50;
+yy56:
 	++YYCURSOR;
 	{ handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; }
-yy30:
+yy58:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy31:
+yy59:
 	if (yybm0+yych & 128) {
-		goto yy30;
+		goto yy58;
 	}
-	if (yych >= '(') goto yy28;
+	if (yych >= '(') goto yy55;
 	++YYCURSOR;
 	{ handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; }
 }

php-8.2.23.tar.xz/ext/standard/var_unserializer.c -> php-8.2.28.tar.xz/ext/standard/var_unserializer.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 3.1 */
+/* Generated by re2c 2.0.3 */
 /*
   +----------------------------------------------------------------------+
   | Copyright (c) The PHP Group                                          |
@@ -929,297 +929,297 @@
 	if ((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case 'C':
-		case 'O': goto yy3;
-		case 'E': goto yy4;
-		case 'N': goto yy5;
-		case 'R': goto yy6;
-		case 'S': goto yy7;
-		case 'a': goto yy8;
-		case 'b': goto yy9;
-		case 'd': goto yy10;
-		case 'i': goto yy11;
-		case 'r': goto yy12;
-		case 's': goto yy13;
-		case '}': goto yy14;
-		default: goto yy1;
-	}
-yy1:
-	++YYCURSOR;
+	case 'C':
+	case 'O':	goto yy4;
+	case 'E':	goto yy5;
+	case 'N':	goto yy6;
+	case 'R':	goto yy7;
+	case 'S':	goto yy8;
+	case 'a':	goto yy9;
+	case 'b':	goto yy10;
+	case 'd':	goto yy11;
+	case 'i':	goto yy12;
+	case 'r':	goto yy13;
+	case 's':	goto yy14;
+	case '}':	goto yy15;
+	default:	goto yy2;
+	}
 yy2:
-	{ return 0; }
+	++YYCURSOR;
 yy3:
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy15;
-	goto yy2;
+	{ return 0; }
 yy4:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych == ':') goto yy17;
-	goto yy2;
+	goto yy3;
 yy5:
-	yych = *++YYCURSOR;
-	if (yych == ';') goto yy18;
-	goto yy2;
-yy6:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych == ':') goto yy19;
-	goto yy2;
+	goto yy3;
+yy6:
+	yych = *++YYCURSOR;
+	if (yych == ';') goto yy20;
+	goto yy3;
 yy7:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy20;
-	goto yy2;
+	if (yych == ':') goto yy22;
+	goto yy3;
 yy8:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy21;
-	goto yy2;
+	if (yych == ':') goto yy23;
+	goto yy3;
 yy9:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy22;
-	goto yy2;
+	if (yych == ':') goto yy24;
+	goto yy3;
 yy10:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy23;
-	goto yy2;
+	if (yych == ':') goto yy25;
+	goto yy3;
 yy11:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy24;
-	goto yy2;
+	if (yych == ':') goto yy26;
+	goto yy3;
 yy12:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy25;
-	goto yy2;
+	if (yych == ':') goto yy27;
+	goto yy3;
 yy13:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy26;
-	goto yy2;
+	if (yych == ':') goto yy28;
+	goto yy3;
 yy14:
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == ':') goto yy29;
+	goto yy3;
+yy15:
 	++YYCURSOR;
 	{
 	/* this is the case where we have less data than planned */
 	php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data");
 	return 0; /* not sure if it should be 0 or 1 here? */
 }
-yy15:
+yy17:
 	yych = *++YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy27;
+		goto yy30;
 	}
-yy16:
+yy18:
 	YYCURSOR = YYMARKER;
-	goto yy2;
-yy17:
+	goto yy3;
+yy19:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy28;
-	goto yy16;
-yy18:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy32;
+	goto yy18;
+yy20:
 	++YYCURSOR;
 	{
 	*p = YYCURSOR;
 	ZVAL_NULL(rval);
 	return 1;
 }
-yy19:
+yy22:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy29;
-	goto yy16;
-yy20:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy34;
+	goto yy18;
+yy23:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy30;
-	goto yy16;
-yy21:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy36;
+	goto yy18;
+yy24:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy31;
-	goto yy16;
-yy22:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy38;
+	goto yy18;
+yy25:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '0') goto yy32;
-	if (yych <= '1') goto yy33;
-	goto yy16;
-yy23:
+	if (yych <= '/') goto yy18;
+	if (yych <= '0') goto yy40;
+	if (yych <= '1') goto yy41;
+	goto yy18;
+yy26:
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
 		if (yych <= ',') {
-			if (yych == '+') goto yy34;
-			goto yy16;
+			if (yych == '+') goto yy42;
+			goto yy18;
 		} else {
-			if (yych <= '-') goto yy35;
-			if (yych <= '.') goto yy36;
-			goto yy16;
+			if (yych <= '-') goto yy43;
+			if (yych <= '.') goto yy44;
+			goto yy18;
 		}
 	} else {
 		if (yych <= 'I') {
-			if (yych <= '9') goto yy37;
-			if (yych <= 'H') goto yy16;
-			goto yy38;
+			if (yych <= '9') goto yy45;
+			if (yych <= 'H') goto yy18;
+			goto yy47;
 		} else {
-			if (yych == 'N') goto yy39;
-			goto yy16;
+			if (yych == 'N') goto yy48;
+			goto yy18;
 		}
 	}
-yy24:
+yy27:
 	yych = *++YYCURSOR;
 	if (yych <= ',') {
-		if (yych == '+') goto yy40;
-		goto yy16;
+		if (yych == '+') goto yy49;
+		goto yy18;
 	} else {
-		if (yych <= '-') goto yy40;
-		if (yych <= '/') goto yy16;
-		if (yych <= '9') goto yy41;
-		goto yy16;
+		if (yych <= '-') goto yy49;
+		if (yych <= '/') goto yy18;
+		if (yych <= '9') goto yy50;
+		goto yy18;
 	}
-yy25:
+yy28:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy42;
-	goto yy16;
-yy26:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy52;
+	goto yy18;
+yy29:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy43;
-	goto yy16;
-yy27:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy54;
+	goto yy18;
+yy30:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	if (yybm0+yych & 128) {
-		goto yy27;
+		goto yy30;
 	}
-	if (yych <= '/') goto yy16;
-	if (yych <= ':') goto yy44;
-	goto yy16;
-yy28:
+	if (yych <= '/') goto yy18;
+	if (yych <= ':') goto yy56;
+	goto yy18;
+yy32:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy28;
-	if (yych <= ':') goto yy45;
-	goto yy16;
-yy29:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy32;
+	if (yych <= ':') goto yy57;
+	goto yy18;
+yy34:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy29;
-	if (yych == ';') goto yy46;
-	goto yy16;
-yy30:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy34;
+	if (yych == ';') goto yy58;
+	goto yy18;
+yy36:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy30;
-	if (yych <= ':') goto yy47;
-	goto yy16;
-yy31:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy36;
+	if (yych <= ':') goto yy60;
+	goto yy18;
+yy38:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy31;
-	if (yych <= ':') goto yy48;
-	goto yy16;
-yy32:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy38;
+	if (yych <= ':') goto yy61;
+	goto yy18;
+yy40:
 	yych = *++YYCURSOR;
-	if (yych == ';') goto yy49;
-	goto yy16;
-yy33:
+	if (yych == ';') goto yy62;
+	goto yy18;
+yy41:
 	yych = *++YYCURSOR;
-	if (yych == ';') goto yy50;
-	goto yy16;
-yy34:
+	if (yych == ';') goto yy64;
+	goto yy18;
+yy42:
 	yych = *++YYCURSOR;
-	if (yych == '.') goto yy36;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy37;
-	goto yy16;
-yy35:
+	if (yych == '.') goto yy44;
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy45;
+	goto yy18;
+yy43:
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
-		if (yych != '.') goto yy16;
+		if (yych != '.') goto yy18;
 	} else {
-		if (yych <= '9') goto yy37;
-		if (yych == 'I') goto yy38;
-		goto yy16;
+		if (yych <= '9') goto yy45;
+		if (yych == 'I') goto yy47;
+		goto yy18;
 	}
-yy36:
+yy44:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy51;
-	goto yy16;
-yy37:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy66;
+	goto yy18;
+yy45:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	if (yych <= ':') {
 		if (yych <= '.') {
-			if (yych <= '-') goto yy16;
-			goto yy51;
+			if (yych <= '-') goto yy18;
+			goto yy66;
 		} else {
-			if (yych <= '/') goto yy16;
-			if (yych <= '9') goto yy37;
-			goto yy16;
+			if (yych <= '/') goto yy18;
+			if (yych <= '9') goto yy45;
+			goto yy18;
 		}
 	} else {
 		if (yych <= 'E') {
-			if (yych <= ';') goto yy52;
-			if (yych <= 'D') goto yy16;
-			goto yy53;
+			if (yych <= ';') goto yy68;
+			if (yych <= 'D') goto yy18;
+			goto yy70;
 		} else {
-			if (yych == 'e') goto yy53;
-			goto yy16;
+			if (yych == 'e') goto yy70;
+			goto yy18;
 		}
 	}
-yy38:
+yy47:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy54;
-	goto yy16;
-yy39:
+	if (yych == 'N') goto yy71;
+	goto yy18;
+yy48:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy55;
-	goto yy16;
-yy40:
+	if (yych == 'A') goto yy72;
+	goto yy18;
+yy49:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych >= ':') goto yy16;
-yy41:
+	if (yych <= '/') goto yy18;
+	if (yych >= ':') goto yy18;
+yy50:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy41;
-	if (yych == ';') goto yy56;
-	goto yy16;
-yy42:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy50;
+	if (yych == ';') goto yy73;
+	goto yy18;
+yy52:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy42;
-	if (yych == ';') goto yy57;
-	goto yy16;
-yy43:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy52;
+	if (yych == ';') goto yy75;
+	goto yy18;
+yy54:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy43;
-	if (yych <= ':') goto yy58;
-	goto yy16;
-yy44:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy54;
+	if (yych <= ':') goto yy77;
+	goto yy18;
+yy56:
 	yych = *++YYCURSOR;
-	if (yych == '"') goto yy59;
-	goto yy16;
-yy45:
+	if (yych == '"') goto yy78;
+	goto yy18;
+yy57:
 	yych = *++YYCURSOR;
-	if (yych == '"') goto yy60;
-	goto yy16;
-yy46:
+	if (yych == '"') goto yy80;
+	goto yy18;
+yy58:
 	++YYCURSOR;
 	{
 	zend_long id;
@@ -1251,46 +1251,46 @@
 
 	return 1;
 }
-yy47:
+yy60:
 	yych = *++YYCURSOR;
-	if (yych == '"') goto yy61;
-	goto yy16;
-yy48:
+	if (yych == '"') goto yy82;
+	goto yy18;
+yy61:
 	yych = *++YYCURSOR;
-	if (yych == '{') goto yy62;
-	goto yy16;
-yy49:
+	if (yych == '{') goto yy84;
+	goto yy18;
+yy62:
 	++YYCURSOR;
 	{
 	*p = YYCURSOR;
 	ZVAL_FALSE(rval);
 	return 1;
 }
-yy50:
+yy64:
 	++YYCURSOR;
 	{
 	*p = YYCURSOR;
 	ZVAL_TRUE(rval);
 	return 1;
 }
-yy51:
+yy66:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy16;
-		if (yych <= '9') goto yy51;
-		if (yych <= ':') goto yy16;
+		if (yych <= '/') goto yy18;
+		if (yych <= '9') goto yy66;
+		if (yych <= ':') goto yy18;
 	} else {
 		if (yych <= 'E') {
-			if (yych <= 'D') goto yy16;
-			goto yy53;
+			if (yych <= 'D') goto yy18;
+			goto yy70;
 		} else {
-			if (yych == 'e') goto yy53;
-			goto yy16;
+			if (yych == 'e') goto yy70;
+			goto yy18;
 		}
 	}
-yy52:
+yy68:
 	++YYCURSOR;
 	{
 #if SIZEOF_ZEND_LONG == 4
@@ -1300,26 +1300,26 @@
 	ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL));
 	return 1;
 }
-yy53:
+yy70:
 	yych = *++YYCURSOR;
 	if (yych <= ',') {
-		if (yych == '+') goto yy63;
-		goto yy16;
+		if (yych == '+') goto yy86;
+		goto yy18;
 	} else {
-		if (yych <= '-') goto yy63;
-		if (yych <= '/') goto yy16;
-		if (yych <= '9') goto yy64;
-		goto yy16;
+		if (yych <= '-') goto yy86;
+		if (yych <= '/') goto yy18;
+		if (yych <= '9') goto yy87;
+		goto yy18;
 	}
-yy54:
+yy71:
 	yych = *++YYCURSOR;
-	if (yych == 'F') goto yy65;
-	goto yy16;
-yy55:
+	if (yych == 'F') goto yy89;
+	goto yy18;
+yy72:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy65;
-	goto yy16;
-yy56:
+	if (yych == 'N') goto yy89;
+	goto yy18;
+yy73:
 	++YYCURSOR;
 	{
 #if SIZEOF_ZEND_LONG == 4
@@ -1346,7 +1346,7 @@
 	ZVAL_LONG(rval, parse_iv(start + 2));
 	return 1;
 }
-yy57:
+yy75:
 	++YYCURSOR;
 	{
 	zend_long id;
@@ -1372,11 +1372,11 @@
 
 	return 1;
 }
-yy58:
+yy77:
 	yych = *++YYCURSOR;
-	if (yych == '"') goto yy66;
-	goto yy16;
-yy59:
+	if (yych == '"') goto yy90;
+	goto yy18;
+yy78:
 	++YYCURSOR;
 	{
 	size_t len, maxlen;
@@ -1595,7 +1595,7 @@
 
 	return object_common(UNSERIALIZE_PASSTHRU, elements, has_unserialize);
 }
-yy60:
+yy80:
 	++YYCURSOR;
 	{
 	if (!var_hash) return 0;
@@ -1676,7 +1676,7 @@
 	zend_string_release_ex(case_name, 0);
 	return 0;
 }
-yy61:
+yy82:
 	++YYCURSOR;
 	{
 	size_t len, maxlen;
@@ -1711,7 +1711,7 @@
 	ZVAL_STR(rval, str);
 	return 1;
 }
-yy62:
+yy84:
 	++YYCURSOR;
 	{
 	zend_long elements = parse_iv(start + 2);
@@ -1745,23 +1745,23 @@
 
 	return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
-yy63:
+yy86:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych >= ':') goto yy16;
-yy64:
+	if (yych <= '/') goto yy18;
+	if (yych >= ':') goto yy18;
+yy87:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy64;
-	if (yych == ';') goto yy52;
-	goto yy16;
-yy65:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy87;
+	if (yych == ';') goto yy68;
+	goto yy18;
+yy89:
 	yych = *++YYCURSOR;
-	if (yych == ';') goto yy67;
-	goto yy16;
-yy66:
+	if (yych == ';') goto yy92;
+	goto yy18;
+yy90:
 	++YYCURSOR;
 	{
 	size_t len, maxlen;
@@ -1799,7 +1799,7 @@
 	}
 	return 1;
 }
-yy67:
+yy92:
 	++YYCURSOR;
 	{
 	*p = YYCURSOR;

php-8.2.23.tar.xz/ext/sysvmsg/sysvmsg.c -> php-8.2.28.tar.xz/ext/sysvmsg/sysvmsg.c Changed

php-8.2.28.tar.xz/ext/sysvmsg/tests/gh16592.phpt Added

php-8.2.23.tar.xz/ext/sysvshm/sysvshm.c -> php-8.2.28.tar.xz/ext/sysvshm/sysvshm.c Changed

php-8.2.28.tar.xz/ext/sysvshm/tests/gh16591.phpt Added

php-8.2.28.tar.xz/ext/xml/tests/gh15868.phpt Added

@@ -0,0 +1,46 @@
+--TEST--
+GH-15868 (Assertion failure in xml_parse_into_struct after exception)
+--EXTENSIONS--
+xml
+--FILE--
+<?php
+$parser = xml_parser_create();
+xml_set_element_handler($parser,
+    function ($parser, $name, $attrs) {
+        throw new Error('stop 1');
+    }, function ($parser, $name) {
+    }
+);
+try {
+    xml_parse_into_struct($parser, "<container/>", $values, $tags);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+$parser = xml_parser_create();
+xml_set_element_handler($parser,
+    function ($parser, $name, $attrs) {
+    }, function ($parser, $name) {
+        throw new Error('stop 2');
+    }
+);
+try {
+    xml_parse_into_struct($parser, "<container/>", $values, $tags);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+$parser = xml_parser_create();
+xml_set_character_data_handler($parser, function() {
+    throw new Error('stop 3');
+});
+try {
+    xml_parse_into_struct($parser, "<root><!CDATAx></root>", $values, $tags);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+?>
+--EXPECT--
+stop 1
+stop 2
+stop 3

php-8.2.28.tar.xz/ext/xml/tests/toffset_bounds.phpt Added

php-8.2.23.tar.xz/ext/xml/xml.c -> php-8.2.28.tar.xz/ext/xml/xml.c Changed

@@ -628,7 +628,7 @@
 		zval_ptr_dtor(&retval);
 	}
 
-	if (!Z_ISUNDEF(parser->data)) {
+	if (!Z_ISUNDEF(parser->data) && !EG(exception)) {
 		if (parser->level <= XML_MAXLEVEL)  {
 			zval tag, atr;
 			int atcnt = 0;
@@ -636,9 +636,11 @@
 			array_init(&tag);
 			array_init(&atr);
 
-			_xml_add_to_info(parser, ZSTR_VAL(tag_name) + parser->toffset);
+			char *skipped_tag_name = SKIP_TAGSTART(ZSTR_VAL(tag_name));
 
-			add_assoc_string(&tag, "tag", SKIP_TAGSTART(ZSTR_VAL(tag_name))); /* cast to avoid gcc-warning */
+			_xml_add_to_info(parser, skipped_tag_name);
+
+			add_assoc_string(&tag, "tag", skipped_tag_name);
 			add_assoc_string(&tag, "type", "open");
 			add_assoc_long(&tag, "level", parser->level);
 
@@ -699,7 +701,7 @@
 		zval_ptr_dtor(&retval);
 	}
 
-	if (!Z_ISUNDEF(parser->data)) {
+	if (!Z_ISUNDEF(parser->data) && !EG(exception)) {
 		zval tag;
 
 		if (parser->lastwasopen) {
@@ -707,9 +709,11 @@
 		} else {
 			array_init(&tag);
 
-			_xml_add_to_info(parser, ZSTR_VAL(tag_name) + parser->toffset);
+			char *skipped_tag_name = SKIP_TAGSTART(ZSTR_VAL(tag_name));
+
+			_xml_add_to_info(parser, skipped_tag_name);
 
-			add_assoc_string(&tag, "tag", SKIP_TAGSTART(ZSTR_VAL(tag_name))); /* cast to avoid gcc-warning */
+			add_assoc_string(&tag, "tag", skipped_tag_name);
 			add_assoc_string(&tag, "type", "close");
 			add_assoc_long(&tag, "level", parser->level);
 
@@ -747,7 +751,7 @@
 		zval_ptr_dtor(&retval);
 	}
 
-	if (Z_ISUNDEF(parser->data)) {
+	if (Z_ISUNDEF(parser->data) || EG(exception)) {
 		return;
 	}

php-8.2.23.tar.xz/ext/xmlreader/php_xmlreader.c -> php-8.2.28.tar.xz/ext/xmlreader/php_xmlreader.c Changed

php-8.2.28.tar.xz/ext/xmlreader/tests/gh16292.phpt Added

php-8.2.23.tar.xz/ext/zend_test/fiber.c -> php-8.2.28.tar.xz/ext/zend_test/fiber.c Changed

php-8.2.23.tar.xz/ext/zend_test/observer.c -> php-8.2.28.tar.xz/ext/zend_test/observer.c Changed

php-8.2.23.tar.xz/ext/zend_test/test.c -> php-8.2.28.tar.xz/ext/zend_test/test.c Changed

@@ -639,6 +639,17 @@
 	RETURN_BOOL(is_zend_ptr((void*)addr));
 }
 
+static ZEND_FUNCTION(zend_test_log_err_debug)
+{
+	zend_string *str;
+
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(str);
+	ZEND_PARSE_PARAMETERS_END();
+
+	php_log_err_with_severity(ZSTR_VAL(str), LOG_DEBUG);
+}
+
 static zend_object *zend_test_class_new(zend_class_entry *class_type)
 {
 	zend_object *obj = zend_objects_new(class_type);
@@ -659,7 +670,7 @@
 	    }
 	    memset(fptr, 0, sizeof(zend_internal_function));
 	    fptr->type = ZEND_INTERNAL_FUNCTION;
-	    fptr->num_args = 1;
+	    fptr->num_args = 0;
 	    fptr->scope = (*object)->ce;
 	    fptr->fn_flags = ZEND_ACC_CALL_VIA_HANDLER;
 	    fptr->function_name = zend_string_copy(name);
@@ -682,7 +693,7 @@
 		}
 		memset(fptr, 0, sizeof(zend_internal_function));
 		fptr->type = ZEND_INTERNAL_FUNCTION;
-		fptr->num_args = 1;
+		fptr->num_args = 0;
 		fptr->scope = ce;
 		fptr->fn_flags = ZEND_ACC_CALL_VIA_HANDLER|ZEND_ACC_STATIC;
 		fptr->function_name = zend_string_copy(name);
@@ -879,6 +890,26 @@
 	RETURN_ARR(zend_new_pair(&name_zv, arguments));
 }
 
+static ZEND_METHOD(_ZendTestMagicCallForward, __call)
+{
+	zend_string *name;
+	zval *arguments;
+
+	ZEND_PARSE_PARAMETERS_START(2, 2)
+		Z_PARAM_STR(name)
+		Z_PARAM_ARRAY(arguments)
+	ZEND_PARSE_PARAMETERS_END();
+
+	ZEND_IGNORE_VALUE(arguments);
+
+	zval func, rv;
+	ZVAL_STR(&func, name);
+	call_user_function(NULL, NULL, &func, &rv, 0, NULL);
+
+	ZVAL_COPY_DEREF(return_value, &rv);
+	zval_ptr_dtor(&rv);
+}
+
 PHP_INI_BEGIN()
 	STD_PHP_INI_BOOLEAN("zend_test.replace_zend_execute_ex", "0", PHP_INI_SYSTEM, OnUpdateBool, replace_zend_execute_ex, zend_zend_test_globals, zend_test_globals)
 	STD_PHP_INI_BOOLEAN("zend_test.register_passes", "0", PHP_INI_SYSTEM, OnUpdateBool, register_passes, zend_zend_test_globals, zend_test_globals)
@@ -993,6 +1024,8 @@
 
 	zend_test_magic_call = register_class__ZendTestMagicCall();
 
+	register_class__ZendTestMagicCallForward();
+
 	zend_register_functions(NULL, ext_function_legacy, NULL, EG(current_module)->type);
 
 	// Loading via dl() not supported with the observer API

php-8.2.23.tar.xz/ext/zend_test/test.stub.php -> php-8.2.28.tar.xz/ext/zend_test/test.stub.php Changed

php-8.2.23.tar.xz/ext/zend_test/test_arginfo.h -> php-8.2.28.tar.xz/ext/zend_test/test_arginfo.h Changed

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 07ce28cd75080118509ac0d30d8ce5ef54110747 */
+ * Stub hash: 1c6384894b21ff02bbc3d6088440de6616878a7d */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_array_return, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -126,6 +126,10 @@
 	ZEND_ARG_TYPE_INFO(0, addr, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_log_err_debug, 0, 1, IS_VOID, 0)
+	ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 #define arginfo_ZendTestNS2_namespaced_func arginfo_zend_test_is_pcre_bundled
 
 #define arginfo_ZendTestNS2_namespaced_deprecated_func arginfo_zend_test_void_return
@@ -161,6 +165,8 @@
 	ZEND_ARG_TYPE_INFO(0, args, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_class__ZendTestMagicCallForward___call arginfo_class__ZendTestMagicCall___call
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class__ZendTestChildClass_returnsThrowable, 0, 0, Exception, 0)
 ZEND_END_ARG_INFO()
 
@@ -235,6 +241,7 @@
 #endif
 static ZEND_FUNCTION(zend_test_cast_fread);
 static ZEND_FUNCTION(zend_test_is_zend_ptr);
+static ZEND_FUNCTION(zend_test_log_err_debug);
 static ZEND_FUNCTION(ZendTestNS2_namespaced_func);
 static ZEND_FUNCTION(ZendTestNS2_namespaced_deprecated_func);
 static ZEND_FUNCTION(ZendTestNS2_ZendSubNS_namespaced_func);
@@ -245,6 +252,7 @@
 static ZEND_METHOD(_ZendTestClass, returnsThrowable);
 static ZEND_METHOD(_ZendTestClass, variadicTest);
 static ZEND_METHOD(_ZendTestMagicCall, __call);
+static ZEND_METHOD(_ZendTestMagicCallForward, __call);
 static ZEND_METHOD(_ZendTestChildClass, returnsThrowable);
 static ZEND_METHOD(_ZendTestTrait, testMethod);
 static ZEND_METHOD(ZendTestParameterAttribute, __construct);
@@ -299,6 +307,7 @@
 #endif
 	ZEND_FE(zend_test_cast_fread, arginfo_zend_test_cast_fread)
 	ZEND_FE(zend_test_is_zend_ptr, arginfo_zend_test_is_zend_ptr)
+	ZEND_FE(zend_test_log_err_debug, arginfo_zend_test_log_err_debug)
 	ZEND_NS_FALIAS("ZendTestNS2", namespaced_func, ZendTestNS2_namespaced_func, arginfo_ZendTestNS2_namespaced_func)
 	ZEND_NS_DEP_FALIAS("ZendTestNS2", namespaced_deprecated_func, ZendTestNS2_namespaced_deprecated_func, arginfo_ZendTestNS2_namespaced_deprecated_func)
 	ZEND_NS_FALIAS("ZendTestNS2", namespaced_aliased_func, zend_test_void_return, arginfo_ZendTestNS2_namespaced_aliased_func)
@@ -332,6 +341,12 @@
 };
 
 
+static const zend_function_entry class__ZendTestMagicCallForward_methods = {
+	ZEND_ME(_ZendTestMagicCallForward, __call, arginfo_class__ZendTestMagicCallForward___call, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};
+
+
 static const zend_function_entry class__ZendTestChildClass_methods = {
 	ZEND_ME(_ZendTestChildClass, returnsThrowable, arginfo_class__ZendTestChildClass_returnsThrowable, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
@@ -532,6 +547,16 @@
 	return class_entry;
 }
 
+static zend_class_entry *register_class__ZendTestMagicCallForward(void)
+{
+	zend_class_entry ce, *class_entry;
+
+	INIT_CLASS_ENTRY(ce, "_ZendTestMagicCallForward", class__ZendTestMagicCallForward_methods);
+	class_entry = zend_register_internal_class_ex(&ce, NULL);
+
+	return class_entry;
+}
+
 static zend_class_entry *register_class__ZendTestChildClass(zend_class_entry *class_entry__ZendTestClass)
 {
 	zend_class_entry ce, *class_entry;

php-8.2.28.tar.xz/ext/zend_test/tests/gh16230.phpt Added

php-8.2.28.tar.xz/ext/zend_test/tests/gh16233.phpt Added

php-8.2.28.tar.xz/ext/zend_test/tests/gh16266.phpt Added

php-8.2.28.tar.xz/ext/zend_test/tests/gh16294.phpt Added

php-8.2.28.tar.xz/ext/zend_test/tests/gh16388.phpt Added

php-8.2.28.tar.xz/ext/zend_test/tests/gh16514.phpt Added

php-8.2.28.tar.xz/ext/zend_test/tests/gh16908.phpt Added

php-8.2.23.tar.xz/ext/zend_test/tests/observer_error_04.phpt -> php-8.2.28.tar.xz/ext/zend_test/tests/observer_error_04.phpt Changed

php-8.2.23.tar.xz/ext/zend_test/tests/observer_fiber_functions_03.phpt -> php-8.2.28.tar.xz/ext/zend_test/tests/observer_fiber_functions_03.phpt Changed

php-8.2.28.tar.xz/ext/zlib/tests/gh16326.phpt Added

php-8.2.23.tar.xz/ext/zlib/zlib.c -> php-8.2.28.tar.xz/ext/zlib/zlib.c Changed

@@ -807,35 +807,29 @@
 				if (zend_hash_num_elements(dictionary) > 0) {
 					char *dictptr;
 					zval *cur;
-					zend_string **strings = emalloc(sizeof(zend_string *) * zend_hash_num_elements(dictionary));
+					zend_string **strings = safe_emalloc(zend_hash_num_elements(dictionary), sizeof(zend_string *), 0);
 					zend_string **end, **ptr = strings - 1;
 
 					ZEND_HASH_FOREACH_VAL(dictionary, cur) {
-						size_t i;
-
 						*++ptr = zval_get_string(cur);
-						if (!*ptr || ZSTR_LEN(*ptr) == 0 || EG(exception)) {
-							if (*ptr) {
-								efree(*ptr);
-							}
-							while (--ptr >= strings) {
-								efree(ptr);
-							}
+						ZEND_ASSERT(*ptr);
+						if (ZSTR_LEN(*ptr) == 0 || EG(exception)) {
+							do {
+								zend_string_release(*ptr);
+							} while (--ptr >= strings);
 							efree(strings);
 							if (!EG(exception)) {
 								zend_argument_value_error(2, "must not contain empty strings");
 							}
 							return 0;
 						}
-						for (i = 0; i < ZSTR_LEN(*ptr); i++) {
-							if (ZSTR_VAL(*ptr)i == 0) {
-								do {
-									efree(ptr);
-								} while (--ptr >= strings);
-								efree(strings);
-								zend_argument_value_error(2, "must not contain strings with null bytes");
-								return 0;
-							}
+						if (zend_str_has_nul_byte(*ptr)) {
+							do {
+								zend_string_release(*ptr);
+							} while (--ptr >= strings);
+							efree(strings);
+							zend_argument_value_error(2, "must not contain strings with null bytes");
+							return 0;
 						}
 
 						*dictlen += ZSTR_LEN(*ptr) + 1;

php-8.2.23.tar.xz/main/SAPI.c -> php-8.2.28.tar.xz/main/SAPI.c Changed

php-8.2.23.tar.xz/main/main.c -> php-8.2.28.tar.xz/main/main.c Changed

php-8.2.23.tar.xz/main/network.c -> php-8.2.28.tar.xz/main/network.c Changed

@@ -118,7 +118,9 @@
 		{EAI_NONAME, "Name or service not known"},
 		{EAI_SERVICE, "Servname not supported for ai_socktype"},
 		{EAI_SOCKTYPE, "ai_socktype not supported"},
+#  ifdef EAI_SYSTEM
 		{EAI_SYSTEM, "System error"},
+#  endif
 		{0, NULL}
 	};
 	int i;
@@ -297,6 +299,35 @@
 	 fcntl(sock, F_SETFL, save)
 #endif
 
+#if HAVE_GETTIMEOFDAY
+/* Subtract times */
+static inline void sub_times(struct timeval a, struct timeval b, struct timeval *result)
+{
+	result->tv_usec = a.tv_usec - b.tv_usec;
+	if (result->tv_usec < 0L) {
+		a.tv_sec--;
+		result->tv_usec += 1000000L;
+	}
+	result->tv_sec = a.tv_sec - b.tv_sec;
+	if (result->tv_sec < 0L) {
+		result->tv_sec++;
+		result->tv_usec -= 1000000L;
+	}
+}
+
+static inline void php_network_set_limit_time(struct timeval *limit_time,
+		struct timeval *timeout)
+{
+	gettimeofday(limit_time, NULL);
+	limit_time->tv_sec += timeout->tv_sec;
+	limit_time->tv_usec += timeout->tv_usec;
+	if (limit_time->tv_usec >= 1000000) {
+		limit_time->tv_usec -= 1000000;
+		limit_time->tv_sec++;
+	}
+}
+#endif
+
 /* Connect to a socket using an interruptible connect with optional timeout.
  * Optionally, the connect can be made asynchronously, which will implicitly
  * enable non-blocking mode on the socket.
@@ -349,25 +380,53 @@
 	 * expected when a connection is actively refused. This way,
 	 * php_pollfd_for will return a mask with POLLOUT if the connection
 	 * is successful and with POLLPRI otherwise. */
-	if ((n = php_pollfd_for(sockfd, POLLOUT|POLLPRI, timeout)) == 0) {
+	int events = POLLOUT|POLLPRI;
 #else
-	if ((n = php_pollfd_for(sockfd, PHP_POLLREADABLE|POLLOUT, timeout)) == 0) {
+	int events = PHP_POLLREADABLE|POLLOUT;
+#endif
+	struct timeval working_timeout;
+#if HAVE_GETTIMEOFDAY
+	struct timeval limit_time, time_now;
+#endif
+	if (timeout) {
+		memcpy(&working_timeout, timeout, sizeof(working_timeout));
+#if HAVE_GETTIMEOFDAY
+		php_network_set_limit_time(&limit_time, &working_timeout);
 #endif
-		error = PHP_TIMEOUT_ERROR_VALUE;
 	}
 
-	if (n > 0) {
-		len = sizeof(error);
-		/*
-		   BSD-derived systems set errno correctly
-		   Solaris returns -1 from getsockopt in case of error
-		   */
-		if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (char*)&error, &len) != 0) {
+	while (true) {
+		n = php_pollfd_for(sockfd, events, timeout ? &working_timeout : NULL);
+		if (n < 0) {
+			if (errno == EINTR) {
+#if HAVE_GETTIMEOFDAY
+				if (timeout) {
+					gettimeofday(&time_now, NULL);
+
+					if (!timercmp(&time_now, &limit_time, <)) {
+						/* time limit expired; no need for another poll */
+						error = PHP_TIMEOUT_ERROR_VALUE;
+						break;
+					} else {
+						/* work out remaining time */
+						sub_times(limit_time, time_now, &working_timeout);
+					}
+				}
+#endif
+				continue;
+			}
 			ret = -1;
+		} else if (n == 0) {
+			error = PHP_TIMEOUT_ERROR_VALUE;
+		} else {
+			len = sizeof(error);
+			/* BSD-derived systems set errno correctly.
+			 * Solaris returns -1 from getsockopt in case of error. */
+			if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, (char*)&error, &len) != 0) {
+				ret = -1;
+			}
 		}
-	} else {
-		/* whoops: sockfd has disappeared */
-		ret = -1;
+		break;
 	}
 
 ok:
@@ -390,22 +449,6 @@
 }
 /* }}} */
 
-/* {{{ sub_times */
-static inline void sub_times(struct timeval a, struct timeval b, struct timeval *result)
-{
-	result->tv_usec = a.tv_usec - b.tv_usec;
-	if (result->tv_usec < 0L) {
-		a.tv_sec--;
-		result->tv_usec += 1000000L;
-	}
-	result->tv_sec = a.tv_sec - b.tv_sec;
-	if (result->tv_sec < 0L) {
-		result->tv_sec++;
-		result->tv_usec -= 1000000L;
-	}
-}
-/* }}} */
-
 /* Bind to a local IP address.
  * Returns the bound socket, or -1 on failure.
  * */
@@ -775,7 +818,6 @@
 }
 /* }}} */
 
-
 /* Connect to a remote host using an interruptible connect with optional timeout.
  * Optionally, the connect can be made asynchronously, which will implicitly
  * enable non-blocking mode on the socket.
@@ -807,13 +849,7 @@
 	if (timeout) {
 		memcpy(&working_timeout, timeout, sizeof(working_timeout));
 #if HAVE_GETTIMEOFDAY
-		gettimeofday(&limit_time, NULL);
-		limit_time.tv_sec += working_timeout.tv_sec;
-		limit_time.tv_usec += working_timeout.tv_usec;
-		if (limit_time.tv_usec >= 1000000) {
-			limit_time.tv_usec -= 1000000;
-			limit_time.tv_sec++;
-		}
+		php_network_set_limit_time(&limit_time, &working_timeout);
 #endif
 	}

php-8.2.23.tar.xz/main/php_config.h.in -> php-8.2.28.tar.xz/main/php_config.h.in Changed

@@ -243,6 +243,11 @@
 /* */
 #undef COOKIE_SEEKER_USES_OFF64_T
 
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+#undef CRAY_STACKSEG_END
+
 /* Define if crypt_r has uses CRYPTD */
 #undef CRYPT_R_CRYPTD
 
@@ -252,7 +257,7 @@
 /* Define if crypt_r uses struct crypt_data */
 #undef CRYPT_R_STRUCT_CRYPT_DATA
 
-/* Define to 1 if using 'alloca.c'. */
+/* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
 /* Define if the target system is darwin */
@@ -336,13 +341,13 @@
 /* */
 #undef GDBM_INCLUDE_FILE
 
-/* Define to 1 if 'TIOCGWINSZ' requires <sys/ioctl.h>. */
+/* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
 #undef GWINSZ_IN_SYS_IOCTL
 
 /* Whether 3 arg set_rebind_proc() */
 #undef HAVE_3ARG_SETREBINDPROC
 
-/* Define when aarch64 CRC32 API is available. */
+/* Define to 1 when aarch64 CRC32 API is available. */
 #undef HAVE_AARCH64_CRC32
 
 /* */
@@ -360,13 +365,14 @@
 /* whether the compiler supports __alignof__ */
 #undef HAVE_ALIGNOF
 
-/* Define to 1 if you have 'alloca', as a function or macro. */
+/* Define to 1 if you have `alloca', as a function or macro. */
 #undef HAVE_ALLOCA
 
-/* Define to 1 if <alloca.h> works. */
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
 #undef HAVE_ALLOCA_H
 
-/* Define to 1 if you have the 'alphasort' function. */
+/* Define to 1 if you have the `alphasort' function. */
 #undef HAVE_ALPHASORT
 
 /* AppArmor confinement available */
@@ -381,16 +387,16 @@
 /* Define to 1 if you have the <arpa/nameser.h> header file. */
 #undef HAVE_ARPA_NAMESER_H
 
-/* Define to 1 if you have the 'asctime_r' function. */
+/* Define to 1 if you have the `asctime_r' function. */
 #undef HAVE_ASCTIME_R
 
 /* Define if asm goto support */
 #undef HAVE_ASM_GOTO
 
-/* Define to 1 if you have the 'asprintf' function. */
+/* Define to 1 if you have the `asprintf' function. */
 #undef HAVE_ASPRINTF
 
-/* Define to 1 if you have the 'atoll' function. */
+/* Define to 1 if you have the `atoll' function. */
 #undef HAVE_ATOLL
 
 /* whether the compiler supports __attribute__ ((__aligned__)) */
@@ -429,10 +435,10 @@
 /* */
 #undef HAVE_CAPSTONE
 
-/* Define to 1 if you have the 'chroot' function. */
+/* Define to 1 if you have the `chroot' function. */
 #undef HAVE_CHROOT
 
-/* Define to 1 if you have the 'clearenv' function. */
+/* Define to 1 if you have the `clearenv' function. */
 #undef HAVE_CLEARENV
 
 /* */
@@ -471,7 +477,7 @@
 /* Define to 1 if you have the <cpuid.h> header file. */
 #undef HAVE_CPUID_H
 
-/* Define to 1 if you have the 'CreateProcess' function. */
+/* Define to 1 if you have the `CreateProcess' function. */
 #undef HAVE_CREATEPROCESS
 
 /* */
@@ -483,10 +489,10 @@
 /* */
 #undef HAVE_CRYPT_R
 
-/* Define to 1 if you have the 'ctermid' function. */
+/* Define to 1 if you have the `ctermid' function. */
 #undef HAVE_CTERMID
 
-/* Define to 1 if you have the 'ctime_r' function. */
+/* Define to 1 if you have the `ctime_r' function. */
 #undef HAVE_CTIME_R
 
 /* */
@@ -507,15 +513,15 @@
 /* */
 #undef HAVE_DCNGETTEXT
 
-/* Define to 1 if you have the declaration of 'arc4random_buf', and to 0 if
+/* Define to 1 if you have the declaration of `arc4random_buf', and to 0 if
    you don't. */
 #undef HAVE_DECL_ARC4RANDOM_BUF
 
-/* Define to 1 if you have the declaration of 'strerror_r', and to 0 if you
+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRERROR_R
 
-/* Define to 1 if you have the declaration of 'tzname', and to 0 if you don't.
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
    */
 #undef HAVE_DECL_TZNAME
 
@@ -585,19 +591,19 @@
 /* Whether you want EXIF (metadata from images) support */
 #undef HAVE_EXIF
 
-/* Define to 1 if you have the 'explicit_bzero' function. */
+/* Define to 1 if you have the `explicit_bzero' function. */
 #undef HAVE_EXPLICIT_BZERO
 
-/* Define to 1 if you have the 'explicit_memset' function. */
+/* Define to 1 if you have the `explicit_memset' function. */
 #undef HAVE_EXPLICIT_MEMSET
 
-/* Define to 1 if you have the 'fabsf' function. */
+/* Define to 1 if you have the `fabsf' function. */
 #undef HAVE_FABSF
 
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* Define to 1 if you have the 'fdatasync' function. */
+/* Define to 1 if you have the `fdatasync' function. */
 #undef HAVE_FDATASYNC
 
 /* Have ffi support */
@@ -624,25 +630,25 @@
 /* Whether libffi supports thiscall calling convention */
 #undef HAVE_FFI_THISCALL
 
-/* Define to 1 if you have the 'flock' function. */
+/* Define to 1 if you have the `flock' function. */
 #undef HAVE_FLOCK
 
-/* Define to 1 if you have the 'floorf' function. */
+/* Define to 1 if you have the `floorf' function. */
 #undef HAVE_FLOORF
 
 /* Define if flush should be called explicitly after a buffered io. */
 #undef HAVE_FLUSHIO
 
-/* Define to 1 if your system has a working POSIX 'fnmatch' function. */
+/* Define to 1 if your system has a working POSIX `fnmatch' function. */
 #undef HAVE_FNMATCH
 
 /* */
 #undef HAVE_FOPENCOOKIE
 
-/* Define to 1 if you have the 'fork' function. */
+/* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
-/* Define to 1 if you have the 'forkx' function. */
+/* Define to 1 if you have the `forkx' function. */
 #undef HAVE_FORKX
 
 /* do we have acl support? */
@@ -654,7 +660,7 @@
 /* whether FPU control word can be manipulated by inline assembler */
 #undef HAVE_FPU_INLINE_ASM_X86
 
-/* Define to 1 if you have the 'ftok' function. */
+/* Define to 1 if you have the `ftok' function. */
 #undef HAVE_FTOK
 
 /* Whether you want FTP support */
@@ -678,10 +684,10 @@
 /* Define to 1 if you have the six-argument form of gethostbyname_r(). */
 #undef HAVE_FUNC_GETHOSTBYNAME_R_6
 
-/* Define to 1 if you have the 'funopen' function. */
+/* Define to 1 if you have the `funopen' function. */
 #undef HAVE_FUNOPEN
 
-/* Define to 1 if you have the 'gai_strerror' function. */
+/* Define to 1 if you have the `gai_strerror' function. */
 #undef HAVE_GAI_STRERROR
 
 /* Define if the target system has support for global register variables */
@@ -726,16 +732,16 @@
 /* Define if you have the getaddrinfo function */
 #undef HAVE_GETADDRINFO
 
-/* Define to 1 if you have the 'getcwd' function. */
+/* Define to 1 if you have the `getcwd' function. */
 #undef HAVE_GETCWD
 
-/* Define to 1 if you have the 'getgrgid_r' function. */
+/* Define to 1 if you have the `getgrgid_r' function. */
 #undef HAVE_GETGRGID_R
 
-/* Define to 1 if you have the 'getgrnam_r' function. */
+/* Define to 1 if you have the `getgrnam_r' function. */
 #undef HAVE_GETGRNAM_R
 
-/* Define to 1 if you have the 'getgroups' function. */
+/* Define to 1 if you have the `getgroups' function. */
 #undef HAVE_GETGROUPS
 
 /* */
@@ -750,67 +756,70 @@
 /* whether getifaddrs is present and usable */
 #undef HAVE_GETIFADDRS
 
-/* Define to 1 if you have the 'getloadavg' function. */
+/* Define to 1 if you have the `getloadavg' function. */
 #undef HAVE_GETLOADAVG
 
-/* Define to 1 if you have the 'getlogin' function. */
+/* Define to 1 if you have the `getlogin' function. */
 #undef HAVE_GETLOGIN
 
-/* Define to 1 if you have the 'getopt' function. */
+/* Define to 1 if you have the `getopt' function. */
 #undef HAVE_GETOPT
 
-/* Define to 1 if you have the 'getpgid' function. */
+/* Define to 1 if you have the `getpgid' function. */
 #undef HAVE_GETPGID
 
-/* Define to 1 if you have the 'getpid' function. */
+/* Define to 1 if you have the `getpid' function. */
 #undef HAVE_GETPID
 
-/* Define to 1 if you have the 'getpriority' function. */
+/* Define to 1 if you have the `getpriority' function. */
 #undef HAVE_GETPRIORITY
 
-/* Define to 1 if you have the 'getprotobyname' function. */
+/* Define to 1 if you have the `getprotobyname' function. */
 #undef HAVE_GETPROTOBYNAME
 
-/* Define to 1 if you have the 'getprotobynumber' function. */
+/* Define to 1 if you have the `getprotobynumber' function. */
 #undef HAVE_GETPROTOBYNUMBER
 
-/* Define to 1 if you have the 'getpwnam_r' function. */
+/* Define to 1 if you have the `getpwnam_r' function. */
 #undef HAVE_GETPWNAM_R
 
-/* Define to 1 if you have the 'getpwuid_r' function. */
+/* Define to 1 if you have the `getpwuid_r' function. */
 #undef HAVE_GETPWUID_R
 
-/* Define to 1 if you have the 'getrlimit' function. */
+/* Define to 1 if you have the `getrandom' function. */
+#undef HAVE_GETRANDOM
+
+/* Define to 1 if you have the `getrlimit' function. */
 #undef HAVE_GETRLIMIT
 
-/* Define to 1 if you have the 'getrusage' function. */
+/* Define to 1 if you have the `getrusage' function. */
 #undef HAVE_GETRUSAGE
 
-/* Define to 1 if you have the 'getservbyname' function. */
+/* Define to 1 if you have the `getservbyname' function. */
 #undef HAVE_GETSERVBYNAME
 
-/* Define to 1 if you have the 'getservbyport' function. */
+/* Define to 1 if you have the `getservbyport' function. */
 #undef HAVE_GETSERVBYPORT
 
-/* Define to 1 if you have the 'getsid' function. */
+/* Define to 1 if you have the `getsid' function. */
 #undef HAVE_GETSID
 
-/* Define to 1 if you have the 'gettimeofday' function. */
+/* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
-/* Define to 1 if you have the 'getwd' function. */
+/* Define to 1 if you have the `getwd' function. */
 #undef HAVE_GETWD
 
 /* glibc's iconv implementation */
 #undef HAVE_GLIBC_ICONV
 
-/* Define to 1 if you have the 'glob' function. */
+/* Define to 1 if you have the `glob' function. */
 #undef HAVE_GLOB
 
 /* */
 #undef HAVE_GMP
 
-/* Define to 1 if you have the 'gmtime_r' function. */
+/* Define to 1 if you have the `gmtime_r' function. */
 #undef HAVE_GMTIME_R
 
 /* Define to 1 if you have the <grp.h> header file. */
@@ -819,7 +828,7 @@
 /* */
 #undef HAVE_HISTORY_LIST
 
-/* Define to 1 if you have the 'hstrerror' function. */
+/* Define to 1 if you have the `hstrerror' function. */
 #undef HAVE_HSTRERROR
 
 /* */
@@ -840,10 +849,10 @@
 /* Define to 1 if you have the <ieeefp.h> header file. */
 #undef HAVE_IEEEFP_H
 
-/* Define to 1 if you have the 'if_indextoname' function. */
+/* Define to 1 if you have the `if_indextoname' function. */
 #undef HAVE_IF_INDEXTONAME
 
-/* Define to 1 if you have the 'if_nametoindex' function. */
+/* Define to 1 if you have the `if_nametoindex' function. */
 #undef HAVE_IF_NAMETOINDEX
 
 /* */
@@ -876,28 +885,28 @@
 /* */
 #undef HAVE_INET_ATON
 
-/* Define to 1 if you have the 'inet_ntoa' function. */
+/* Define to 1 if you have the `inet_ntoa' function. */
 #undef HAVE_INET_NTOA
 
-/* Define to 1 if you have the 'inet_ntop' function. */
+/* Define to 1 if you have the `inet_ntop' function. */
 #undef HAVE_INET_NTOP
 
-/* Define to 1 if you have the 'inet_pton' function. */
+/* Define to 1 if you have the `inet_pton' function. */
 #undef HAVE_INET_PTON
 
-/* Define to 1 if you have the 'initgroups' function. */
+/* Define to 1 if you have the `initgroups' function. */
 #undef HAVE_INITGROUPS
 
-/* Define to 1 if the system has the type 'int16_t'. */
+/* Define to 1 if the system has the type `int16_t'. */
 #undef HAVE_INT16_T
 
-/* Define to 1 if the system has the type 'int32_t'. */
+/* Define to 1 if the system has the type `int32_t'. */
 #undef HAVE_INT32_T
 
-/* Define to 1 if the system has the type 'int64_t'. */
+/* Define to 1 if the system has the type `int64_t'. */
 #undef HAVE_INT64_T
 
-/* Define to 1 if the system has the type 'int8_t'. */
+/* Define to 1 if the system has the type `int8_t'. */
 #undef HAVE_INT8_T
 
 /* Whether intmax_t is available */
@@ -930,7 +939,7 @@
 /* whether to enable JavaScript Object Serialization support */
 #undef HAVE_JSON
 
-/* Define to 1 if you have the 'kill' function. */
+/* Define to 1 if you have the `kill' function. */
 #undef HAVE_KILL
 
 /* do we have kqueue? */
@@ -939,43 +948,43 @@
 /* Define to 1 if you have the <langinfo.h> header file. */
 #undef HAVE_LANGINFO_H
 
-/* Define to 1 if you have the 'lchown' function. */
+/* Define to 1 if you have the `lchown' function. */
 #undef HAVE_LCHOWN
 
 /* */
 #undef HAVE_LDAP
 
-/* Define to 1 if you have the 'ldap_control_find' function. */
+/* Define to 1 if you have the `ldap_control_find' function. */
 #undef HAVE_LDAP_CONTROL_FIND
 
-/* Define to 1 if you have the 'ldap_extended_operation' function. */
+/* Define to 1 if you have the `ldap_extended_operation' function. */
 #undef HAVE_LDAP_EXTENDED_OPERATION
 
-/* Define to 1 if you have the 'ldap_extended_operation_s' function. */
+/* Define to 1 if you have the `ldap_extended_operation_s' function. */
 #undef HAVE_LDAP_EXTENDED_OPERATION_S
 
-/* Define to 1 if you have the 'ldap_parse_extended_result' function. */
+/* Define to 1 if you have the `ldap_parse_extended_result' function. */
 #undef HAVE_LDAP_PARSE_EXTENDED_RESULT
 
-/* Define to 1 if you have the 'ldap_parse_reference' function. */
+/* Define to 1 if you have the `ldap_parse_reference' function. */
 #undef HAVE_LDAP_PARSE_REFERENCE
 
-/* Define to 1 if you have the 'ldap_parse_result' function. */
+/* Define to 1 if you have the `ldap_parse_result' function. */
 #undef HAVE_LDAP_PARSE_RESULT
 
-/* Define to 1 if you have the 'ldap_passwd' function. */
+/* Define to 1 if you have the `ldap_passwd' function. */
 #undef HAVE_LDAP_PASSWD
 
-/* Define to 1 if you have the 'ldap_refresh_s' function. */
+/* Define to 1 if you have the `ldap_refresh_s' function. */
 #undef HAVE_LDAP_REFRESH_S
 
 /* LDAP SASL support */
 #undef HAVE_LDAP_SASL
 
-/* Define to 1 if you have the 'ldap_start_tls_s' function. */
+/* Define to 1 if you have the `ldap_start_tls_s' function. */
 #undef HAVE_LDAP_START_TLS_S
 
-/* Define to 1 if you have the 'ldap_whoami_s' function. */
+/* Define to 1 if you have the `ldap_whoami_s' function. */
 #undef HAVE_LDAP_WHOAMI_S
 
 /* */
@@ -1017,7 +1026,7 @@
 /* */
 #undef HAVE_LIBJPEG
 
-/* Define to 1 if you have the 'm' library (-lm). */
+/* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 
 /* Whether you have libmm */
@@ -1035,7 +1044,7 @@
 /* */
 #undef HAVE_LIBPNG
 
-/* Define to 1 if you have the 'pq' library (-lpq). */
+/* Define to 1 if you have the `pq' library (-lpq). */
 #undef HAVE_LIBPQ
 
 /* */
@@ -1077,10 +1086,10 @@
 /* Define to 1 if you have the <linux/sock_diag.h> header file. */
 #undef HAVE_LINUX_SOCK_DIAG_H
 
-/* Define to 1 if you have the 'localtime_r' function. */
+/* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 
-/* Define to 1 if the system has the type 'long double'. */
+/* Define to 1 if the system has the type `long double'. */
 #undef HAVE_LONG_DOUBLE
 
 /* do we have SO_LISTENQxxx? */
@@ -1095,7 +1104,7 @@
 /* do we have mach_vm_read? */
 #undef HAVE_MACH_VM_READ
 
-/* Define to 1 if you have the 'makedev' function. */
+/* Define to 1 if you have the `makedev' function. */
 #undef HAVE_MAKEDEV
 
 /* Define to 1 if you have the <malloc.h> header file. */
@@ -1107,40 +1116,40 @@
 /* whether to have multibyte string support */
 #undef HAVE_MBSTRING
 
-/* Define to 1 if you have the 'memcntl' function. */
+/* Define to 1 if you have the `memcntl' function. */
 #undef HAVE_MEMCNTL
 
-/* Define to 1 if you have the 'memmem' function. */
+/* Define to 1 if you have the `memmem' function. */
 #undef HAVE_MEMMEM
 
-/* Define to 1 if you have the 'memmove' function. */
+/* Define to 1 if you have the `memmove' function. */
 #undef HAVE_MEMMOVE
 
-/* Define to 1 if you have the 'memrchr' function. */
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memrchr' function. */
 #undef HAVE_MEMRCHR
 
 /* Libzip >= 1.7.0 with zip_*_method_supported functions */
 #undef HAVE_METHOD_SUPPORTED
 
-/* Define to 1 if you have the <minix/config.h> header file. */
-#undef HAVE_MINIX_CONFIG_H
-
-/* Define to 1 if you have the 'mkfifo' function. */
+/* Define to 1 if you have the `mkfifo' function. */
 #undef HAVE_MKFIFO
 
-/* Define to 1 if you have the 'mknod' function. */
+/* Define to 1 if you have the `mknod' function. */
 #undef HAVE_MKNOD
 
-/* Define to 1 if you have the 'mkstemp' function. */
+/* Define to 1 if you have the `mkstemp' function. */
 #undef HAVE_MKSTEMP
 
-/* Define to 1 if you have the 'mmap' function. */
+/* Define to 1 if you have the `mmap' function. */
 #undef HAVE_MMAP
 
-/* Define to 1 if you have the 'mprotect' function. */
+/* Define to 1 if you have the `mprotect' function. */
 #undef HAVE_MPROTECT
 
-/* Define to 1 if you have the 'mremap' function. */
+/* Define to 1 if you have the `mremap' function. */
 #undef HAVE_MREMAP
 
 /* Whether you have MySQL */
@@ -1164,10 +1173,10 @@
 /* */
 #undef HAVE_NGETTEXT
 
-/* Define to 1 if you have the 'nice' function. */
+/* Define to 1 if you have the `nice' function. */
 #undef HAVE_NICE
 
-/* Define to 1 if you have the 'nl_langinfo' function. */
+/* Define to 1 if you have the `nl_langinfo' function. */
 #undef HAVE_NL_LANGINFO
 
 /* Define to 1 if you have the <nmmintrin.h> header file. */
@@ -1258,7 +1267,7 @@
 /* */
 #undef HAVE_PHP_SESSION
 
-/* Define to 1 if you have the 'poll' function. */
+/* Define to 1 if you have the `poll' function. */
 #undef HAVE_POLL
 
 /* Define to 1 if you have the <poll.h> header file. */
@@ -1288,7 +1297,7 @@
 /* Define to 1 if the PS_STRINGS thing exists. */
 #undef HAVE_PS_STRINGS
 
-/* Define to 1 if you have the 'pthread_jit_write_protect_np' function. */
+/* Define to 1 if you have the `pthread_jit_write_protect_np' function. */
 #undef HAVE_PTHREAD_JIT_WRITE_PROTECT_NP
 
 /* do we have ptrace? */
@@ -1300,7 +1309,7 @@
 /* Define to 1 if you have the <pty.h> header file. */
 #undef HAVE_PTY_H
 
-/* Define to 1 if you have the 'putenv' function. */
+/* Define to 1 if you have the `putenv' function. */
 #undef HAVE_PUTENV
 
 /* Define to 1 if you have the <pwd.h> header file. */
@@ -1309,7 +1318,7 @@
 /* */
 #undef HAVE_PWRITE
 
-/* Define to 1 if you have the 'RAND_egd' function. */
+/* Define to 1 if you have the `RAND_egd' function. */
 #undef HAVE_RAND_EGD
 
 /* Define to 1 if you have the <resolv.h> header file. */
@@ -1327,7 +1336,7 @@
 /* */
 #undef HAVE_RFC822_OUTPUT_ADDRESS_LIST
 
-/* Define to 1 if you have the 'rfork' function. */
+/* Define to 1 if you have the `rfork' function. */
 #undef HAVE_RFORK
 
 /* */
@@ -1345,7 +1354,7 @@
 /* Whether you have sockaddr_storage.ss_family */
 #undef HAVE_SA_SS_FAMILY
 
-/* Define to 1 if you have the 'scandir' function. */
+/* Define to 1 if you have the `scandir' function. */
 #undef HAVE_SCANDIR
 
 /* do we have select? */
@@ -1360,34 +1369,34 @@
 /* */
 #undef HAVE_SEMUN
 
-/* Define to 1 if you have the 'setegid' function. */
+/* Define to 1 if you have the `setegid' function. */
 #undef HAVE_SETEGID
 
-/* Define to 1 if you have the 'setenv' function. */
+/* Define to 1 if you have the `setenv' function. */
 #undef HAVE_SETENV
 
-/* Define to 1 if you have the 'seteuid' function. */
+/* Define to 1 if you have the `seteuid' function. */
 #undef HAVE_SETEUID
 
-/* Define to 1 if you have the 'setitimer' function. */
+/* Define to 1 if you have the `setitimer' function. */
 #undef HAVE_SETITIMER
 
 /* do we have setpflags? */
 #undef HAVE_SETPFLAGS
 
-/* Define to 1 if you have the 'setpriority' function. */
+/* Define to 1 if you have the `setpriority' function. */
 #undef HAVE_SETPRIORITY
 
-/* Define to 1 if you have the 'setproctitle' function. */
+/* Define to 1 if you have the `setproctitle' function. */
 #undef HAVE_SETPROCTITLE
 
-/* Define to 1 if you have the 'setproctitle_fast' function. */
+/* Define to 1 if you have the `setproctitle_fast' function. */
 #undef HAVE_SETPROCTITLE_FAST
 
-/* Define to 1 if you have the 'setrlimit' function. */
+/* Define to 1 if you have the `setrlimit' function. */
 #undef HAVE_SETRLIMIT
 
-/* Define to 1 if you have the 'setsid' function. */
+/* Define to 1 if you have the `setsid' function. */
 #undef HAVE_SETSID
 
 /* */
@@ -1411,25 +1420,25 @@
 /* */
 #undef HAVE_SHM_OPEN
 
-/* Define to 1 if you have the 'shutdown' function. */
+/* Define to 1 if you have the `shutdown' function. */
 #undef HAVE_SHUTDOWN
 
 /* */
 #undef HAVE_SHUTDOWN_SNMP_LOGGING
 
-/* Define to 1 if you have the 'sigaction' function. */
+/* Define to 1 if you have the `sigaction' function. */
 #undef HAVE_SIGACTION
 
-/* Define to 1 if you have the 'sigprocmask' function. */
+/* Define to 1 if you have the `sigprocmask' function. */
 #undef HAVE_SIGPROCMASK
 
-/* Define to 1 if you have the 'sigsetjmp' function. */
+/* Define to 1 if you have the `sigsetjmp' function. */
 #undef HAVE_SIGSETJMP
 
-/* Define to 1 if you have the 'sigtimedwait' function. */
+/* Define to 1 if you have the `sigtimedwait' function. */
 #undef HAVE_SIGTIMEDWAIT
 
-/* Define to 1 if you have the 'sigwaitinfo' function. */
+/* Define to 1 if you have the `sigwaitinfo' function. */
 #undef HAVE_SIGWAITINFO
 
 /* */
@@ -1468,7 +1477,7 @@
 /* */
 #undef HAVE_SOCKETS
 
-/* Define to 1 if the system has the type 'socklen_t'. */
+/* Define to 1 if the system has the type `socklen_t'. */
 #undef HAVE_SOCKLEN_T
 
 /* */
@@ -1519,28 +1528,25 @@
 /* Whether ssize_t is available */
 #undef HAVE_SSIZE_T
 
-/* Define to 1 if you have the 'statfs' function. */
+/* Define to 1 if you have the `statfs' function. */
 #undef HAVE_STATFS
 
-/* Define to 1 if you have the 'statvfs' function. */
+/* Define to 1 if you have the `statvfs' function. */
 #undef HAVE_STATVFS
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the 'std_syslog' function. */
+/* Define to 1 if you have the `std_syslog' function. */
 #undef HAVE_STD_SYSLOG
 
-/* Define to 1 if you have the 'strcasecmp' function. */
+/* Define to 1 if you have the `strcasecmp' function. */
 #undef HAVE_STRCASECMP
 
-/* Define if you have 'strerror_r'. */
+/* Define to 1 if you have the `strerror_r' function. */
 #undef HAVE_STRERROR_R
 
 /* Define to 1 if you have the <strings.h> header file. */
@@ -1549,53 +1555,53 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the 'strlcat' function. */
+/* Define to 1 if you have the `strlcat' function. */
 #undef HAVE_STRLCAT
 
-/* Define to 1 if you have the 'strlcpy' function. */
+/* Define to 1 if you have the `strlcpy' function. */
 #undef HAVE_STRLCPY
 
-/* Define to 1 if you have the 'strndup' function. */
+/* Define to 1 if you have the `strndup' function. */
 #undef HAVE_STRNDUP
 
-/* Define to 1 if you have the 'strnlen' function. */
+/* Define to 1 if you have the `strnlen' function. */
 #undef HAVE_STRNLEN
 
-/* Define to 1 if you have the 'strptime' function. */
+/* Define to 1 if you have the `strptime' function. */
 #undef HAVE_STRPTIME
 
 /* whether strptime() declaration fails */
 #undef HAVE_STRPTIME_DECL_FAILS
 
-/* Define to 1 if you have the 'strtok_r' function. */
+/* Define to 1 if you have the `strtok_r' function. */
 #undef HAVE_STRTOK_R
 
-/* Define to 1 if you have the 'strtoll' function. */
+/* Define to 1 if you have the `strtoll' function. */
 #undef HAVE_STRTOLL
 
 /* whether you have struct flock */
 #undef HAVE_STRUCT_FLOCK
 
-/* Define to 1 if 'st_blksize' is a member of 'struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
-/* Define to 1 if 'st_blocks' is a member of 'struct stat'. */
+/* Define to 1 if `st_blocks' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLOCKS
 
-/* Define to 1 if 'st_rdev' is a member of 'struct stat'. */
+/* Define to 1 if `st_rdev' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_RDEV
 
-/* Define to 1 if 'tm_gmtoff' is a member of 'struct tm'. */
+/* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_GMTOFF
 
-/* Define to 1 if 'tm_zone' is a member of 'struct tm'. */
+/* Define to 1 if `tm_zone' is a member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_ZONE
 
-/* Define to 1 if your 'struct stat' has 'st_blocks'. Deprecated, use
-   'HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
+/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use
+   `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
 #undef HAVE_ST_BLOCKS
 
-/* Define to 1 if you have the 'symlink' function. */
+/* Define to 1 if you have the `symlink' function. */
 #undef HAVE_SYMLINK
 
 /* do we have sysconf? */
@@ -1739,33 +1745,33 @@
 /* Define to 1 if you have the <tmmintrin.h> header file. */
 #undef HAVE_TMMINTRIN_H
 
-/* Define to 1 if your 'struct tm' has 'tm_zone'. Deprecated, use
-   'HAVE_STRUCT_TM_TM_ZONE' instead. */
+/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
+   `HAVE_STRUCT_TM_TM_ZONE' instead. */
 #undef HAVE_TM_ZONE
 
 /* Whether you have a working ttyname_r */
 #undef HAVE_TTYNAME_R
 
-/* Define to 1 if you don't have 'tm_zone' but do have the external array
-   'tzname'. */
+/* Define to 1 if you don't have `tm_zone' but do have the external array
+   `tzname'. */
 #undef HAVE_TZNAME
 
-/* Define to 1 if you have the 'tzset' function. */
+/* Define to 1 if you have the `tzset' function. */
 #undef HAVE_TZSET
 
 /* */
 #undef HAVE_UDBCEXT_H
 
-/* Define to 1 if the system has the type 'uint16_t'. */
+/* Define to 1 if the system has the type `uint16_t'. */
 #undef HAVE_UINT16_T
 
-/* Define to 1 if the system has the type 'uint32_t'. */
+/* Define to 1 if the system has the type `uint32_t'. */
 #undef HAVE_UINT32_T
 
-/* Define to 1 if the system has the type 'uint64_t'. */
+/* Define to 1 if the system has the type `uint64_t'. */
 #undef HAVE_UINT64_T
 
-/* Define to 1 if the system has the type 'uint8_t'. */
+/* Define to 1 if the system has the type `uint8_t'. */
 #undef HAVE_UINT8_T
 
 /* Define to 1 if you have the <unistd.h> header file. */
@@ -1777,10 +1783,10 @@
 /* Define to 1 if you have the <unix.h> header file. */
 #undef HAVE_UNIX_H
 
-/* Define to 1 if you have the 'unsetenv' function. */
+/* Define to 1 if you have the `unsetenv' function. */
 #undef HAVE_UNSETENV
 
-/* Define to 1 if you have the 'unshare' function. */
+/* Define to 1 if you have the `unshare' function. */
 #undef HAVE_UNSHARE
 
 /* */
@@ -1790,13 +1796,13 @@
    userfaultfd */
 #undef HAVE_USERFAULTFD_WRITEFAULT
 
-/* Define to 1 if you have the 'usleep' function. */
+/* Define to 1 if you have the `usleep' function. */
 #undef HAVE_USLEEP
 
-/* Define to 1 if you have the 'utime' function. */
+/* Define to 1 if you have the `utime' function. */
 #undef HAVE_UTIME
 
-/* Define to 1 if you have the 'utimes' function. */
+/* Define to 1 if you have the `utimes' function. */
 #undef HAVE_UTIMES
 
 /* Define to 1 if you have the <utime.h> header file. */
@@ -1808,21 +1814,18 @@
 /* */
 #undef HAVE_VALGRIND
 
-/* Define to 1 if you have the 'vasprintf' function. */
+/* Define to 1 if you have the `vasprintf' function. */
 #undef HAVE_VASPRINTF
 
-/* Define to 1 if you have the 'wait3' function. */
+/* Define to 1 if you have the `wait3' function. */
 #undef HAVE_WAIT3
 
-/* Define to 1 if you have the 'wait4' function. */
+/* Define to 1 if you have the `wait4' function. */
 #undef HAVE_WAIT4
 
-/* Define to 1 if you have the 'waitpid' function. */
+/* Define to 1 if you have the `waitpid' function. */
 #undef HAVE_WAITPID
 
-/* Define to 1 if you have the <wchar.h> header file. */
-#undef HAVE_WCHAR_H
-
 /* Define to 1 if you have the <wmmintrin.h> header file. */
 #undef HAVE_WMMINTRIN_H
 
@@ -2066,28 +2069,28 @@
 /* */
 #undef QDBM_INCLUDE_FILE
 
-/* The size of 'int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
 /* Size of intmax_t */
 #undef SIZEOF_INTMAX_T
 
-/* The size of 'long', as computed by sizeof. */
+/* The size of `long', as computed by sizeof. */
 #undef SIZEOF_LONG
 
-/* The size of 'long long', as computed by sizeof. */
+/* The size of `long long', as computed by sizeof. */
 #undef SIZEOF_LONG_LONG
 
-/* The size of 'off_t', as computed by sizeof. */
+/* The size of `off_t', as computed by sizeof. */
 #undef SIZEOF_OFF_T
 
 /* Size of ptrdiff_t */
 #undef SIZEOF_PTRDIFF_T
 
-/* The size of 'short', as computed by sizeof. */
+/* The size of `short', as computed by sizeof. */
 #undef SIZEOF_SHORT
 
-/* The size of 'size_t', as computed by sizeof. */
+/* The size of `size_t', as computed by sizeof. */
 #undef SIZEOF_SIZE_T
 
 /* Size of ssize_t */
@@ -2110,9 +2113,7 @@
 	STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
-/* Define to 1 if all of the C89 standard headers exist (not just the ones
-   required in a freestanding environment). This macro is provided for
-   backward compatibility; new code need not use it. */
+/* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
 /* Define to 1 if strerror_r returns char *. */
@@ -2121,7 +2122,7 @@
 /* */
 #undef TCADB_INCLUDE_FILE
 
-/* Define to 1 if your <sys/time.h> declares 'struct tm'. */
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
 /* */
@@ -2133,95 +2134,25 @@
 /* Use system default cipher list instead of hardcoded value */
 #undef USE_OPENSSL_SYSTEM_CIPHERS
 
-/* Enable extensions on AIX, Interix, z/OS.  */
+/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-/* Enable general extensions on macOS.  */
-#ifndef _DARWIN_C_SOURCE
-# undef _DARWIN_C_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Enable X/Open compliant socket functions that do not require linking
-   with -lxnet on HP-UX 11.11.  */
-#ifndef _HPUX_ALT_XOPEN_SOCKET_API
-# undef _HPUX_ALT_XOPEN_SOCKET_API
-#endif
-/* Identify the host operating system as Minix.
-   This macro does not affect the system headers' behavior.
-   A future release of Autoconf may stop defining this macro.  */
-#ifndef _MINIX
-# undef _MINIX
-#endif
-/* Enable general extensions on NetBSD.
-   Enable NetBSD compatibility extensions on Minix.  */
-#ifndef _NETBSD_SOURCE
-# undef _NETBSD_SOURCE
-#endif
-/* Enable OpenBSD compatibility extensions on NetBSD.
-   Oddly enough, this does nothing on OpenBSD.  */
-#ifndef _OPENBSD_SOURCE
-# undef _OPENBSD_SOURCE
-#endif
-/* Define to 1 if needed for POSIX-compatible behavior.  */
-#ifndef _POSIX_SOURCE
-# undef _POSIX_SOURCE
-#endif
-/* Define to 2 if needed for POSIX-compatible behavior.  */
-#ifndef _POSIX_1_SOURCE
-# undef _POSIX_1_SOURCE
-#endif
-/* Enable POSIX-compatible threading on Solaris.  */
+/* Enable threading extensions on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
-/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
-#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
-# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
-#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
-# undef __STDC_WANT_IEC_60559_BFP_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
-#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
-# undef __STDC_WANT_IEC_60559_DFP_EXT__
-#endif
-/* Enable extensions specified by C23 Annex F.  */
-#ifndef __STDC_WANT_IEC_60559_EXT__
-# undef __STDC_WANT_IEC_60559_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
-#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
-# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
-#endif
-/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015.  */
-#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
-# undef __STDC_WANT_IEC_60559_TYPES_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
-#ifndef __STDC_WANT_LIB_EXT2__
-# undef __STDC_WANT_LIB_EXT2__
-#endif
-/* Enable extensions specified by ISO/IEC 24747:2009.  */
-#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
-# undef __STDC_WANT_MATH_SPEC_FUNCS__
-#endif
 /* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
-/* Enable X/Open extensions.  Define to 500 only if necessary
-   to make mbstate_t available.  */
-#ifndef _XOPEN_SOURCE
-# undef _XOPEN_SOURCE
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
 #endif
 
 
@@ -2255,28 +2186,38 @@
 /* */
 #undef ZTS
 
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
 /* */
 #undef _XOPEN_SOURCE
 
 /* Define when using musl libc */
 #undef __MUSL__
 
-/* Define as 'int' if <sys/types.h> doesn't define. */
+/* Define to `int' if <sys/types.h> doesn't define. */
 #undef gid_t
 
 /* */
 #undef in_addr_t
 
-/* Define to '__inline__' or '__inline' if that's what the C compiler
+/* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
 #undef inline
 #endif
 
-/* Define as 'unsigned int' if <stddef.h> doesn't define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
-/* Define as 'int' if <sys/types.h> doesn't define. */
+/* Define to `int' if <sys/types.h> doesn't define. */
 #undef uid_t

php-8.2.23.tar.xz/main/php_network.h -> php-8.2.28.tar.xz/main/php_network.h Changed

php-8.2.23.tar.xz/main/php_variables.c -> php-8.2.28.tar.xz/main/php_variables.c Changed

php-8.2.23.tar.xz/main/php_version.h -> php-8.2.28.tar.xz/main/php_version.h Changed

php-8.2.23.tar.xz/main/rfc1867.c -> php-8.2.28.tar.xz/main/rfc1867.c Changed

php-8.2.23.tar.xz/main/streams/memory.c -> php-8.2.28.tar.xz/main/streams/memory.c Changed

php-8.2.23.tar.xz/main/streams/streams.c -> php-8.2.28.tar.xz/main/streams/streams.c Changed

php-8.2.23.tar.xz/pear/install-pear-nozlib.phar -> php-8.2.28.tar.xz/pear/install-pear-nozlib.phar Changed

php-8.2.23.tar.xz/run-tests.php -> php-8.2.28.tar.xz/run-tests.php Changed

@@ -23,7 +23,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: bb422e41c0fe4303a4efb3f3657568b74c20cf96 $ */
+/* $Id: 5add428aaddc5c974be0ec4111efe187d846717d $ */
 
 /* Temporary variables while this file is being refactored. */
 /** @var ?JUnit */
@@ -612,7 +612,7 @@
                     $show_progress = false;
                     break;
                 case '--version':
-                    echo '$Id: bb422e41c0fe4303a4efb3f3657568b74c20cf96 $' . "\n";
+                    echo '$Id: 5add428aaddc5c974be0ec4111efe187d846717d $' . "\n";
                     exit(1);
 
                 default:
@@ -2159,6 +2159,9 @@
         } elseif (!strncasecmp('xfail', $output, 5)) {
             // Pretend we have an XFAIL section
             $test->setSection('XFAIL', ltrim(substr($output, 5)));
+        } elseif (!strncasecmp('flaky', $output, 5)) {
+            // Pretend we have a FLAKY section
+            $test->setSection('FLAKY', ltrim(substr($output, 5)));
         } elseif ($output !== '') {
             show_result("BORK", $output, $tested_file, 'reason: invalid output from SKIPIF', $temp_filenames);
             $PHP_FAILED_TESTS'BORKED' =

php-8.2.23.tar.xz/sapi/cgi/cgi_main.c -> php-8.2.28.tar.xz/sapi/cgi/cgi_main.c Changed

@@ -1746,7 +1746,6 @@
 	int status = 0;
 #endif
 	char *query_string;
-	char *decoded_query_string;
 	int skip_getopt = 0;
 
 #if defined(SIGPIPE) && defined(SIG_IGN)
@@ -1801,10 +1800,15 @@
 	 * the executable. Ideally we skip argument parsing when we're in cgi or fastcgi mode,
 	 * but that breaks PHP scripts on Linux with a hashbang: `#!/php-cgi -d option=value`.
 	 * Therefore, this code only prevents passing arguments if the query string starts with a '-'.
-	 * Similarly, scripts spawned in subprocesses on Windows may have the same issue. */
+	 * Similarly, scripts spawned in subprocesses on Windows may have the same issue.
+	 * However, Windows has lots of conversion rules and command line parsing rules that
+	 * are too difficult and dangerous to reliably emulate. */
 	if((query_string = getenv("QUERY_STRING")) != NULL && strchr(query_string, '=') == NULL) {
+#ifdef PHP_WIN32
+		skip_getopt = cgi || fastcgi;
+#else
 		unsigned char *p;
-		decoded_query_string = strdup(query_string);
+		char *decoded_query_string = strdup(query_string);
 		php_url_decode(decoded_query_string, strlen(decoded_query_string));
 		for (p = (unsigned char *)decoded_query_string; *p &&  *p <= ' '; p++) {
 			/* skip all leading spaces */
@@ -1813,22 +1817,8 @@
 			skip_getopt = 1;
 		}
 
-		/* On Windows we have to take into account the "best fit" mapping behaviour. */
-#ifdef PHP_WIN32
-		if (*p >= 0x80) {
-			wchar_t wide_buf1;
-			wide_buf0 = *p;
-			char char_buf4;
-			size_t wide_buf_len = sizeof(wide_buf) / sizeof(wide_buf0);
-			size_t char_buf_len = sizeof(char_buf) / sizeof(char_buf0);
-			if (WideCharToMultiByte(CP_ACP, 0, wide_buf, wide_buf_len, char_buf, char_buf_len, NULL, NULL) == 0
-				|| char_buf0 == '-') {
-				skip_getopt = 1;
-			}
-		}
-#endif
-
 		free(decoded_query_string);
+#endif
 	}
 
 	php_ini_builder_init(&ini_builder);
@@ -1895,18 +1885,17 @@
 
 	/* check force_cgi after startup, so we have proper output */
 	if (cgi && CGIG(force_redirect)) {
-		/* Apache will generate REDIRECT_STATUS,
-		 * Netscape and redirect.so will generate HTTP_REDIRECT_STATUS.
-		 * redirect.so and installation instructions available from
-		 * http://www.koehntopp.de/php.
-		 *   -- kk@netuse.de
-		 */
-		if (!getenv("REDIRECT_STATUS") &&
-			!getenv ("HTTP_REDIRECT_STATUS") &&
-			/* this is to allow a different env var to be configured
-			 * in case some server does something different than above */
-			(!CGIG(redirect_status_env) || !getenv(CGIG(redirect_status_env)))
-		) {
+		/* This is to allow a different environment variable to be configured
+		 * in case the we cannot auto-detect which environment variable to use.
+		 * Checking this first to allow user overrides in case the environment
+		 * variable can be set by an untrusted party. */
+		const char *redirect_status_env = CGIG(redirect_status_env);
+		if (!redirect_status_env) {
+			/* Apache will generate REDIRECT_STATUS. */
+			redirect_status_env = "REDIRECT_STATUS";
+		}
+
+		if (!getenv(redirect_status_env)) {
 			zend_try {
 				SG(sapi_headers).http_response_code = 400;
 				PUTS("<b>Security Alert!</b> The PHP CGI cannot be accessed directly.\n\n\

php-8.2.23.tar.xz/sapi/cli/php_cli.c -> php-8.2.28.tar.xz/sapi/cli/php_cli.c Changed

php-8.2.23.tar.xz/sapi/cli/php_cli_server.c -> php-8.2.28.tar.xz/sapi/cli/php_cli_server.c Changed

@@ -1680,14 +1680,33 @@
 {
 	/* Wrap header value in a zval to add is to the HashTable which acts as an array */
 	zval tmp;
-	ZVAL_STR(&tmp, client->current_header_value);
 	/* strip off the colon */
 	zend_string *lc_header_name = zend_string_tolower_ex(client->current_header_name, /* persistent */ true);
 	GC_MAKE_PERSISTENT_LOCAL(lc_header_name);
 
-	/* Add the wrapped zend_string to the HashTable */
-	zend_hash_add(&client->request.headers, lc_header_name, &tmp);
-	zend_hash_add(&client->request.headers_original_case, client->current_header_name, &tmp);
+	zval *entry = zend_hash_find(&client->request.headers, lc_header_name);
+	bool with_comma = !zend_string_equals_literal(lc_header_name, "set-cookie");
+
+	/**
+	 * `Set-Cookie` HTTP header being the exception, they can have 1 or more values separated
+	 * by a comma while still possibly be set separately by the client.
+	 **/
+	if (!with_comma || entry == NULL) {
+		ZVAL_STR(&tmp, client->current_header_value);
+	} else {
+		zend_string *curval = Z_STR_P(entry);
+		zend_string *newval = zend_string_safe_alloc(1, ZSTR_LEN(curval),  ZSTR_LEN(client->current_header_value) + 2, /* persistent */true);
+
+		memcpy(ZSTR_VAL(newval), ZSTR_VAL(curval), ZSTR_LEN(curval));
+		memcpy(ZSTR_VAL(newval) + ZSTR_LEN(curval), ", ", 2);
+		memcpy(ZSTR_VAL(newval) + ZSTR_LEN(curval) + 2, ZSTR_VAL(client->current_header_value), ZSTR_LEN(client->current_header_value) + 1);
+
+		ZVAL_STR(&tmp, newval);
+	}
+
+	/* Add/Update the wrapped zend_string to the HashTable */
+	zend_hash_update(&client->request.headers, lc_header_name, &tmp);
+	zend_hash_update(&client->request.headers_original_case, client->current_header_name, &tmp);
 
 	zend_string_release_ex(lc_header_name, /* persistent */ true);
 	zend_string_release_ex(client->current_header_name, /* persistent */ true);
@@ -1925,6 +1944,8 @@
 	request_info->auth_user = request_info->auth_password = request_info->auth_digest = NULL;
 	if (NULL != (val = zend_hash_str_find(&client->request.headers, "content-type", sizeof("content-type")-1))) {
 		request_info->content_type = Z_STRVAL_P(val);
+	} else {
+		request_info->content_type = NULL;
 	}
 } /* }}} */
 
@@ -2252,6 +2273,7 @@
 		}
 
 		ZVAL_UNDEF(&retval);
+		CG(skip_shebang) = true;
 		if (SUCCESS == zend_execute_scripts(ZEND_REQUIRE, &retval, 1, &zfd)) {
 			if (Z_TYPE(retval) != IS_UNDEF) {
 				decline = Z_TYPE(retval) == IS_FALSE;

php-8.2.28.tar.xz/sapi/cli/tests/gh16137.phpt Added

php-8.2.28.tar.xz/sapi/cli/tests/ghsa-4w77-75f9-2c8w.phpt Added

php-8.2.23.tar.xz/sapi/fpm/fpm/fpm_status.c -> php-8.2.28.tar.xz/sapi/fpm/fpm/fpm_status.c Changed

php-8.2.23.tar.xz/sapi/fpm/fpm/fpm_stdio.c -> php-8.2.28.tar.xz/sapi/fpm/fpm/fpm_stdio.c Changed

php-8.2.23.tar.xz/sapi/fpm/fpm/zlog.c -> php-8.2.28.tar.xz/sapi/fpm/fpm/zlog.c Changed

@@ -150,6 +150,7 @@
 }
 /* }}} */
 
+/* Returns the length if the print were complete, this can be larger than buf_size. */
 static size_t zlog_buf_prefix(
 		const char *function, int line, int flags,
 		char *buf, size_t buf_size, int use_syslog) /* {{{ */
@@ -186,6 +187,7 @@
 		}
 	}
 
+	/* Important: snprintf returns the number of bytes if the print were complete. */
 	return len;
 }
 /* }}} */
@@ -408,6 +410,7 @@
 static inline ssize_t zlog_stream_buf_copy_cstr(
 		struct zlog_stream *stream, const char *str, size_t str_len) /* {{{ */
 {
+	ZEND_ASSERT(stream->len <= stream->buf.size);
 	if (stream->buf.size - stream->len <= str_len &&
 			!zlog_stream_buf_alloc_ex(stream, str_len + stream->len)) {
 		return -1;
@@ -422,6 +425,7 @@
 
 static inline ssize_t zlog_stream_buf_copy_char(struct zlog_stream *stream, char c) /* {{{ */
 {
+	ZEND_ASSERT(stream->len <= stream->buf.size);
 	if (stream->buf.size - stream->len < 1 && !zlog_stream_buf_alloc_ex(stream, 1)) {
 		return -1;
 	}
@@ -678,6 +682,17 @@
 		len = zlog_buf_prefix(
 				function, line, stream->flags,
 				stream->buf.data, stream->buf.size, stream->use_syslog);
+		if (!EXPECTED(len + 1 <= stream->buf.size)) {
+			/* If the buffer was not large enough, try with a larger buffer.
+			 * Note that this may still truncate if the zlog_limit is reached. */
+			len = MIN(len + 1, zlog_limit);
+			if (!zlog_stream_buf_alloc_ex(stream, len)) {
+				return -1;
+			}
+			zlog_buf_prefix(
+				function, line, stream->flags,
+				stream->buf.data, stream->buf.size, stream->use_syslog);
+		}
 		stream->len = stream->prefix_len = len;
 		if (stream->msg_prefix != NULL) {
 			zlog_stream_buf_copy_cstr(stream, stream->msg_prefix, stream->msg_prefix_len);
@@ -689,8 +704,8 @@
 	} else {
 		char sbuf1024;
 		ssize_t written;
-		len = zlog_buf_prefix(function, line, stream->flags, sbuf, 1024, stream->use_syslog);
-		written = zlog_stream_direct_write(stream, sbuf, len);
+		len = zlog_buf_prefix(function, line, stream->flags, sbuf, sizeof(sbuf), stream->use_syslog);
+		written = zlog_stream_direct_write(stream, sbuf, MIN(len, sizeof(sbuf)));
 		if (stream->msg_prefix != NULL) {
 			written += zlog_stream_direct_write(
 					stream, stream->msg_prefix, stream->msg_prefix_len);

php-8.2.28.tar.xz/sapi/fpm/tests/gh15395-php-auth-shutdown.phpt Added

@@ -0,0 +1,61 @@
+--TEST--
+FPM: GH-15335 - PHP_AUTH shutdown  use after free
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+log_level = notice
+unconfined
+listen = {{ADDR}}
+pm = static
+pm.max_children = 1
+catch_workers_output = yes
+php_admin_valuecgi.fix_pathinfo = no
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+    ->request(
+        headers:  "HTTP_AUTHORIZATION" => "Basic Zm9vOg==", "REQUEST_METHOD" => "GET",
+        uri: $scriptName,
+        address: '{{ADDR}}',
+        scriptFilename: __DIR__ . "/__unknown.php",
+        scriptName: "/",
+    )
+    ->expectStatus('404 Not Found');
+$tester
+    ->request(
+        uri: $scriptName,
+        address: '{{ADDR}}',
+        params: ,
+    );
+$tester->expectNoLogPattern("/zend_mm_heap corrupted/");
+$tester->terminate();
+$tester->expectLogTerminatingNotices();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.2.28.tar.xz/sapi/fpm/tests/gh16432-status-high-nprocs.phpt Added

php-8.2.28.tar.xz/sapi/fpm/tests/gh16628.phpt Added

@@ -0,0 +1,53 @@
+--TEST--
+GH-16628 (FPM logs are getting corrupted with this log statement)
+--EXTENSIONS--
+zend_test
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+log_level = debug
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+catch_workers_output = yes
+decorate_workers_output = no
+EOT;
+
+$code = <<<'EOT'
+<?php
+for ($i = 1; $i < 100; $i++) {
+	zend_test_log_err_debug(str_repeat("a", $i));
+}
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$tester->start(extensions: 'zend_test');
+$tester->expectLogStartNotices();
+$tester->request()->expectEmptyBody();
+for ($i = 1; $i < 100; $i++) {
+    $tester->expectLogNotice("%sPHP message: " . str_repeat("a", $i));
+}
+$tester->terminate();
+$tester->expectLogTerminatingNotices();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.2.28.tar.xz/sapi/fpm/tests/log-bwp-msg-flush-split-sep-pos-end.phpt Added

@@ -0,0 +1,47 @@
+--TEST--
+FPM: Buffered worker output plain log with msg with flush split position towards separator end
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+catch_workers_output = yes
+decorate_workers_output = no
+EOT;
+
+$code = <<<EOT
+<?php
+file_put_contents('php://stderr', str_repeat('a', 1013) . "Quarkslab\0fscf\0Quarkslab");
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$tester->start();
+$tester->expectLogStartNotices();
+$tester->request()->expectEmptyBody();
+$tester->expectLogLine(str_repeat('a', 1013)  . "Quarkslab", decorated: false);
+$tester->expectLogLine("Quarkslab", decorated: false);
+$tester->terminate();
+$tester->expectLogTerminatingNotices();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.2.28.tar.xz/sapi/fpm/tests/log-bwp-msg-flush-split-sep-pos-start.phpt Added

@@ -0,0 +1,47 @@
+--TEST--
+FPM: Buffered worker output plain log with msg with flush split position towards separator start
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+catch_workers_output = yes
+decorate_workers_output = no
+EOT;
+
+$code = <<<EOT
+<?php
+file_put_contents('php://stderr', str_repeat('a', 1009) . "Quarkslab\0fscf\0Quarkslab");
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$tester->start();
+$tester->expectLogStartNotices();
+$tester->request()->expectEmptyBody();
+$tester->expectLogLine(str_repeat('a', 1009)  . "Quarkslab", decorated: false);
+$tester->expectLogLine("Quarkslab", decorated: false);
+$tester->terminate();
+$tester->expectLogTerminatingNotices();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.2.23.tar.xz/sapi/fpm/tests/tester.inc -> php-8.2.28.tar.xz/sapi/fpm/tests/tester.inc Changed

php-8.2.23.tar.xz/sapi/phpdbg/phpdbg.c -> php-8.2.28.tar.xz/sapi/phpdbg/phpdbg.c Changed

php-8.2.23.tar.xz/sapi/phpdbg/phpdbg_info.c -> php-8.2.28.tar.xz/sapi/phpdbg/phpdbg_info.c Changed

@@ -399,27 +399,29 @@
 	phpdbg_notice("User Classes (%d)", zend_hash_num_elements(&classes));
 
 	/* once added, assume that classes are stable... until shutdown. */
-	ZEND_HASH_PACKED_FOREACH_PTR(&classes, ce) {
-		phpdbg_print_class_name(ce);
-
-		if (ce->parent) {
-			if (ce->ce_flags & ZEND_ACC_LINKED) {
-				zend_class_entry *pce = ce->parent;
-				do {
-					phpdbg_out("|-------- ");
-					phpdbg_print_class_name(pce);
-				} while ((pce = pce->parent));
-			} else {
-				phpdbg_writeln("|-------- User Class %s (not yet linked because declaration for parent was not encountered when declaring the class)", ZSTR_VAL(ce->parent_name));
+	if (HT_IS_INITIALIZED(&classes)) {
+		ZEND_HASH_PACKED_FOREACH_PTR(&classes, ce) {
+			phpdbg_print_class_name(ce);
+
+			if (ce->parent) {
+				if (ce->ce_flags & ZEND_ACC_LINKED) {
+					zend_class_entry *pce = ce->parent;
+					do {
+						phpdbg_out("|-------- ");
+						phpdbg_print_class_name(pce);
+					} while ((pce = pce->parent));
+				} else {
+					phpdbg_writeln("|-------- User Class %s (not yet linked because declaration for parent was not encountered when declaring the class)", ZSTR_VAL(ce->parent_name));
+				}
 			}
-		}
 
-		if (ce->info.user.filename) {
-			phpdbg_writeln("|---- in %s on line %u", ZSTR_VAL(ce->info.user.filename), ce->info.user.line_start);
-		} else {
-			phpdbg_writeln("|---- no source code");
-		}
-	} ZEND_HASH_FOREACH_END();
+			if (ce->info.user.filename) {
+				phpdbg_writeln("|---- in %s on line %u", ZSTR_VAL(ce->info.user.filename), ce->info.user.line_start);
+			} else {
+				phpdbg_writeln("|---- no source code");
+			}
+		} ZEND_HASH_FOREACH_END();
+	}
 
 	zend_hash_destroy(&classes);
 
@@ -445,17 +447,19 @@
 
 	phpdbg_notice("User Functions (%d)", zend_hash_num_elements(&functions));
 
-	ZEND_HASH_PACKED_FOREACH_PTR(&functions, zf) {
-		zend_op_array *op_array = &zf->op_array;
+	if (HT_IS_INITIALIZED(&functions)) {
+		ZEND_HASH_PACKED_FOREACH_PTR(&functions, zf) {
+			zend_op_array *op_array = &zf->op_array;
 
-		phpdbg_write("|-------- %s", op_array->function_name ? ZSTR_VAL(op_array->function_name) : "{main}");
+			phpdbg_write("|-------- %s", op_array->function_name ? ZSTR_VAL(op_array->function_name) : "{main}");
 
-		if (op_array->filename) {
-			phpdbg_writeln(" in %s on line %d", ZSTR_VAL(op_array->filename), op_array->line_start);
-		} else {
-			phpdbg_writeln(" (no source code)");
-		}
-	} ZEND_HASH_FOREACH_END();
+			if (op_array->filename) {
+				phpdbg_writeln(" in %s on line %d", ZSTR_VAL(op_array->filename), op_array->line_start);
+			} else {
+				phpdbg_writeln(" (no source code)");
+			}
+		} ZEND_HASH_FOREACH_END();
+	}
 
 	zend_hash_destroy(&functions);

php-8.2.23.tar.xz/sapi/phpdbg/phpdbg_lexer.c -> php-8.2.28.tar.xz/sapi/phpdbg/phpdbg_lexer.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 3.1 */
+/* Generated by re2c 2.0.3 */
 /*
  * phpdbg_lexer.l
  */
@@ -66,176 +66,6 @@
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
-	static const unsigned char yybm_NORMAL = {
-		/* table 1 .. 8: 0 */
-		  0,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  40,   0,  62,  62,  40,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 40,  62,  50,  40,  62,  62,  62,  14, 
-		 62,  62,  62,  62,  62,  62,  63,  62, 
-		127, 127, 127, 127, 127, 127, 127, 127, 
-		127, 127,  40,  62,  62,  62,  62,  62, 
-		 62, 254, 254, 254, 254, 254, 254, 190, 
-		190, 190, 190, 190, 190, 190, 190, 190, 
-		190, 190, 190, 190, 190, 190, 190, 190, 
-		190, 190, 190,  62,   2,  62,  62, 190, 
-		 62, 254, 254, 254, 254, 254, 254, 190, 
-		190, 190, 190, 190, 190, 190, 190, 190, 
-		190, 190, 190, 190, 190, 190, 190, 190, 
-		190, 190, 190,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		 62,  62,  62,  62,  62,  62,  62,  62, 
-		/* table 9 .. 10: 256 */
-		  0,  64,  64,  64,  64,  64,  64,  64, 
-		 64, 128,   0,  64,  64, 128,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		128,  64,   0,   0,  64,  64,  64,   0, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,   0,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-		 64,  64,  64,  64,  64,  64,  64,  64, 
-	};
-	static const unsigned char yybm_PRE_RAW = {
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,  64,   0,   0,   0,  64,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		 64,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0, 128,   0, 
-		128, 128, 128, 128, 128, 128, 128, 128, 
-		128, 128,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-	};
-	static const unsigned char yybm_RAW = {
-		  0, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232,   0, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232,  64, 224, 232, 232, 232,  32, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232,  16, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-		232, 232, 232, 232, 232, 232, 232, 232, 
-	};
-	static const unsigned char yybm_INITIAL = {
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0, 128,   0,   0,   0, 128,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		128,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-		  0,   0,   0,   0,   0,   0,   0,   0, 
-	};
 	if (YYGETCONDITION() < 2) {
 		if (YYGETCONDITION() < 1) {
 			goto yyc_NORMAL;
@@ -251,20 +81,89 @@
 	}
 /* *********************************** */
 yyc_NORMAL:
-	YYDEBUG(0, *YYCURSOR);
-	YYFILL(11);
-	yych = *YYCURSOR;
-	if (yybm_NORMAL256+yych & 128) {
-		goto yy5;
-	}
-	switch (yych) {
+	{
+		static const unsigned char yybm = {
+			/* table 1 .. 8: 0 */
+			  0,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  40,   0,  62,  62,  40,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 40,  62,  50,  40,  62,  62,  62,  14, 
+			 62,  62,  62,  62,  62,  62,  63,  62, 
+			127, 127, 127, 127, 127, 127, 127, 127, 
+			127, 127,  40,  62,  62,  62,  62,  62, 
+			 62, 254, 254, 254, 254, 254, 254, 190, 
+			190, 190, 190, 190, 190, 190, 190, 190, 
+			190, 190, 190, 190, 190, 190, 190, 190, 
+			190, 190, 190,  62,   2,  62,  62, 190, 
+			 62, 254, 254, 254, 254, 254, 254, 190, 
+			190, 190, 190, 190, 190, 190, 190, 190, 
+			190, 190, 190, 190, 190, 190, 190, 190, 
+			190, 190, 190,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			/* table 9 .. 10: 256 */
+			  0,  64,  64,  64,  64,  64,  64,  64, 
+			 64, 128,   0,  64,  64, 128,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			128,  64,   0,   0,  64,  64,  64,   0, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,   0,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+		};
+		YYDEBUG(0, *YYCURSOR);
+		YYFILL(11);
+		yych = *YYCURSOR;
+		if (yybm256+yych & 128) {
+			goto yy7;
+		}
+		switch (yych) {
 		case 0x00:
 		case '\t':
-		case '\n': goto yy1;
-		case '"': goto yy6;
-		case '#': goto yy8;
-		case '\'': goto yy10;
-		case '-': goto yy11;
+		case '\n':	goto yy2;
+		case '"':	goto yy10;
+		case '#':	goto yy12;
+		case '\'':	goto yy14;
+		case '-':	goto yy15;
 		case '.':
 		case '1':
 		case '2':
@@ -274,1702 +173,1689 @@
 		case '6':
 		case '7':
 		case '8':
-		case '9': goto yy12;
-		case '0': goto yy14;
-		case ':': goto yy15;
+		case '9':	goto yy16;
+		case '0':	goto yy19;
+		case ':':	goto yy20;
 		case 'D':
-		case 'd': goto yy16;
+		case 'd':	goto yy21;
 		case 'E':
-		case 'e': goto yy17;
+		case 'e':	goto yy22;
 		case 'F':
-		case 'f': goto yy18;
+		case 'f':	goto yy23;
 		case 'I':
-		case 'i': goto yy19;
+		case 'i':	goto yy24;
 		case 'N':
-		case 'n': goto yy20;
+		case 'n':	goto yy25;
 		case 'O':
-		case 'o': goto yy21;
+		case 'o':	goto yy26;
 		case 'T':
-		case 't': goto yy22;
+		case 't':	goto yy27;
 		case 'Y':
-		case 'y': goto yy23;
-		case 'Z': goto yy24;
-		case 'z': goto yy25;
-		default: goto yy2;
-	}
-yy1:
-	YYDEBUG(1, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+		case 'y':	goto yy28;
+		case 'Z':	goto yy29;
+		case 'z':	goto yy30;
+		default:	goto yy4;
+		}
+yy2:
+		YYDEBUG(2, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(3, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	return 0;
 }
-yy2:
-	YYDEBUG(2, *YYCURSOR);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-yy3:
-	YYDEBUG(3, *YYCURSOR);
-	if (yybm_NORMAL256+yych & 64) {
-		goto yy2;
-	}
-	if (yych <= ' ') goto yy4;
-	if (yych == '#') goto yy4;
-	if (yych <= '\'') goto yy26;
-	goto yy28;
 yy4:
-	YYDEBUG(4, *YYCURSOR);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+		YYDEBUG(4, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+yy5:
+		YYDEBUG(5, *YYCURSOR);
+		if (yybm256+yych & 64) {
+			goto yy4;
+		}
+		if (yych <= ' ') goto yy6;
+		if (yych == '#') goto yy6;
+		if (yych <= '\'') goto yy31;
+		goto yy33;
+yy6:
+		YYDEBUG(6, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	phpdbg_init_param(yylval, STR_PARAM);
 	yylval->str = estrndup(yytext, yyleng - unescape_string(yytext));
 	yylval->len = yyleng;
 	return T_ID;
 }
-yy5:
-	YYDEBUG(5, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_NORMAL256+yych & 128) {
-		goto yy5;
-	}
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy7:
+		YYDEBUG(7, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(8, *YYCURSOR);
+		if (yybm256+yych & 128) {
+			goto yy7;
+		}
+		YYDEBUG(9, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	/* ignore whitespace */
 
 	goto restart;
 }
-yy6:
-	YYDEBUG(6, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '"') goto yy26;
-	goto yy30;
-yy7:
-	YYDEBUG(7, *YYCURSOR);
-	YYCURSOR = YYMARKER;
-	if (yyaccept <= 3) {
-		if (yyaccept <= 1) {
-			if (yyaccept == 0) {
-				goto yy4;
+yy10:
+		YYDEBUG(10, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '"') goto yy31;
+		goto yy35;
+yy11:
+		YYDEBUG(11, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept <= 3) {
+			if (yyaccept <= 1) {
+				if (yyaccept == 0) {
+					goto yy6;
+				} else {
+					goto yy13;
+				}
 			} else {
-				goto yy9;
+				if (yyaccept == 2) {
+					goto yy18;
+				} else {
+					goto yy82;
+				}
 			}
 		} else {
-			if (yyaccept == 2) {
-				goto yy13;
+			if (yyaccept <= 5) {
+				if (yyaccept == 4) {
+					goto yy85;
+				} else {
+					goto yy101;
+				}
 			} else {
-				goto yy71;
+				goto yy118;
 			}
 		}
-	} else {
-		if (yyaccept <= 5) {
-			if (yyaccept == 4) {
-				goto yy73;
-			} else {
-				goto yy85;
+yy12:
+		YYDEBUG(12, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '.') {
+			if (yych <= ',') goto yy13;
+			if (yych <= '-') {
+				YYCTXMARKER = YYCURSOR;
+				goto yy40;
 			}
-		} else {
-			goto yy100;
-		}
-	}
-yy8:
-	YYDEBUG(8, *YYCURSOR);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '.') {
-		if (yych <= ',') goto yy9;
-		if (yych <= '-') {
-			YYCTXMARKER = YYCURSOR;
-			goto yy35;
-		}
-		YYCTXMARKER = YYCURSOR;
-		goto yy36;
-	} else {
-		if (yych <= '/') goto yy9;
-		if (yych <= '9') {
 			YYCTXMARKER = YYCURSOR;
-			goto yy36;
+			goto yy41;
+		} else {
+			if (yych <= '/') goto yy13;
+			if (yych <= '9') {
+				YYCTXMARKER = YYCURSOR;
+				goto yy41;
+			}
 		}
-	}
-yy9:
-	YYDEBUG(9, *YYCURSOR);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy13:
+		YYDEBUG(13, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(INITIAL);
 	return T_SEPARATOR;
 }
-yy10:
-	YYDEBUG(10, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '\'') goto yy26;
-	goto yy39;
-yy11:
-	YYDEBUG(11, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_NORMAL0+yych & 1) {
-		goto yy12;
-	}
-	if (yych == 'r') goto yy44;
-	goto yy3;
-yy12:
-	YYDEBUG(12, *YYCURSOR);
-	yyaccept = 2;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-	if (yybm_NORMAL0+yych & 1) {
-		goto yy12;
-	}
-	if (yych <= ' ') {
-		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy13;
-			if (yych <= 0x08) goto yy2;
-		} else {
-			if (yych == '\r') goto yy13;
-			if (yych <= 0x1F) goto yy2;
+yy14:
+		YYDEBUG(14, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\'') goto yy31;
+		goto yy45;
+yy15:
+		YYDEBUG(15, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 1) {
+			goto yy16;
 		}
-	} else {
-		if (yych <= '&') {
-			if (yych <= '!') goto yy2;
-			if (yych <= '"') goto yy26;
-			if (yych >= '$') goto yy2;
+		if (yych == 'r') goto yy50;
+		goto yy5;
+yy16:
+		YYDEBUG(16, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+		YYDEBUG(17, *YYCURSOR);
+		if (yybm0+yych & 1) {
+			goto yy16;
+		}
+		if (yych <= ' ') {
+			if (yych <= '\n') {
+				if (yych <= 0x00) goto yy18;
+				if (yych <= 0x08) goto yy4;
+			} else {
+				if (yych == '\r') goto yy18;
+				if (yych <= 0x1F) goto yy4;
+			}
 		} else {
-			if (yych <= '\'') goto yy26;
-			if (yych <= '/') goto yy2;
-			if (yych <= ':') goto yy28;
-			goto yy2;
+			if (yych <= '&') {
+				if (yych <= '!') goto yy4;
+				if (yych <= '"') goto yy31;
+				if (yych >= '$') goto yy4;
+			} else {
+				if (yych <= '\'') goto yy31;
+				if (yych <= '/') goto yy4;
+				if (yych <= ':') goto yy33;
+				goto yy4;
+			}
 		}
-	}
-yy13:
-	YYDEBUG(13, *YYCURSOR);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy18:
+		YYDEBUG(18, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	phpdbg_init_param(yylval, NUMERIC_PARAM);
 	yylval->num = atoi(yytext);
 	return T_DIGITS;
 }
-yy14:
-	YYDEBUG(14, *YYCURSOR);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_NORMAL0+yych & 1) {
-		goto yy12;
-	}
-	if (yych <= 0x1F) {
-		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy13;
-			if (yych <= 0x08) goto yy3;
-			goto yy13;
-		} else {
-			if (yych == '\r') goto yy13;
-			goto yy3;
+yy19:
+		YYDEBUG(19, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 1) {
+			goto yy16;
 		}
-	} else {
-		if (yych <= '#') {
-			if (yych <= ' ') goto yy13;
-			if (yych <= '"') goto yy3;
-			goto yy13;
+		if (yych <= 0x1F) {
+			if (yych <= '\n') {
+				if (yych <= 0x00) goto yy18;
+				if (yych <= 0x08) goto yy5;
+				goto yy18;
+			} else {
+				if (yych == '\r') goto yy18;
+				goto yy5;
+			}
 		} else {
-			if (yych == 'x') goto yy45;
-			goto yy3;
+			if (yych <= '#') {
+				if (yych <= ' ') goto yy18;
+				if (yych <= '"') goto yy5;
+				goto yy18;
+			} else {
+				if (yych == 'x') goto yy51;
+				goto yy5;
+			}
 		}
-	}
-yy15:
-	YYDEBUG(15, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == ':') goto yy47;
-	if (yych == '\\') goto yy48;
-	goto yy46;
-yy16:
-	YYDEBUG(16, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy49;
-	if (yych == 'i') goto yy49;
-	goto yy3;
-yy17:
-	YYDEBUG(17, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy50;
-	if (yych == 'n') goto yy50;
-	goto yy3;
-yy18:
-	YYDEBUG(18, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy51;
-	if (yych == 'a') goto yy51;
-	goto yy3;
-yy19:
-	YYDEBUG(19, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'F') goto yy52;
-	if (yych == 'f') goto yy52;
-	goto yy3;
 yy20:
-	YYDEBUG(20, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy53;
-	if (yych == 'o') goto yy53;
-	goto yy3;
+		YYDEBUG(20, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == ':') goto yy54;
+		if (yych == '\\') goto yy56;
+		goto yy52;
 yy21:
-	YYDEBUG(21, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'N') {
-		if (yych == 'F') goto yy54;
-		if (yych <= 'M') goto yy3;
-		goto yy55;
-	} else {
-		if (yych <= 'f') {
-			if (yych <= 'e') goto yy3;
-			goto yy54;
-		} else {
-			if (yych == 'n') goto yy55;
-			goto yy3;
-		}
-	}
+		YYDEBUG(21, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy58;
+		if (yych == 'i') goto yy58;
+		goto yy5;
 yy22:
-	YYDEBUG(22, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy56;
-	if (yych == 'r') goto yy56;
-	goto yy3;
+		YYDEBUG(22, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy59;
+		if (yych == 'n') goto yy59;
+		goto yy5;
 yy23:
-	YYDEBUG(23, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy57;
-	if (yych == 'e') goto yy57;
-	goto yy3;
+		YYDEBUG(23, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy60;
+		if (yych == 'a') goto yy60;
+		goto yy5;
 yy24:
-	YYDEBUG(24, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy58;
-	goto yy3;
+		YYDEBUG(24, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'F') goto yy61;
+		if (yych == 'f') goto yy61;
+		goto yy5;
 yy25:
-	YYDEBUG(25, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'e') goto yy59;
-	goto yy3;
+		YYDEBUG(25, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy62;
+		if (yych == 'o') goto yy62;
+		goto yy5;
 yy26:
-	YYDEBUG(26, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
+		YYDEBUG(26, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'N') {
+			if (yych == 'F') goto yy63;
+			if (yych <= 'M') goto yy5;
+			goto yy64;
+		} else {
+			if (yych <= 'f') {
+				if (yych <= 'e') goto yy5;
+				goto yy63;
+			} else {
+				if (yych == 'n') goto yy64;
+				goto yy5;
+			}
+		}
 yy27:
-	YYDEBUG(27, *YYCURSOR);
-	if (yybm_NORMAL0+yych & 2) {
-		goto yy26;
-	}
-	if (yych <= '#') goto yy7;
-	goto yy60;
+		YYDEBUG(27, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy65;
+		if (yych == 'r') goto yy65;
+		goto yy5;
 yy28:
-	YYDEBUG(28, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '/') goto yy61;
-	if (yych == '\\') goto yy48;
-	goto yy7;
+		YYDEBUG(28, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy66;
+		if (yych == 'e') goto yy66;
+		goto yy5;
 yy29:
-	YYDEBUG(29, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(4);
-	yych = *YYCURSOR;
+		YYDEBUG(29, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy67;
+		goto yy5;
 yy30:
-	YYDEBUG(30, *YYCURSOR);
-	if (yybm_NORMAL0+yych & 4) {
-		goto yy29;
-	}
-	if (yych <= ' ') {
-		if (yych <= 0x00) goto yy7;
-		if (yych == '\n') goto yy7;
-	} else {
-		if (yych <= '"') goto yy62;
-		if (yych <= '#') goto yy31;
-		if (yych <= ':') goto yy33;
-		goto yy34;
-	}
+		YYDEBUG(30, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'e') goto yy68;
+		goto yy5;
 yy31:
-	YYDEBUG(31, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
+		YYDEBUG(31, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
 yy32:
-	YYDEBUG(32, *YYCURSOR);
-	if (yybm_NORMAL0+yych & 8) {
-		goto yy31;
-	}
-	if (yych <= '\n') goto yy7;
-	if (yych <= '"') goto yy63;
-	goto yy64;
+		YYDEBUG(32, *YYCURSOR);
+		if (yybm0+yych & 2) {
+			goto yy31;
+		}
+		if (yych <= '#') goto yy11;
+		goto yy69;
 yy33:
-	YYDEBUG(33, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '/') goto yy65;
-	goto yy32;
+		YYDEBUG(33, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy70;
+		if (yych == '\\') goto yy56;
+		goto yy11;
 yy34:
-	YYDEBUG(34, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-	if (yych <= ' ') {
-		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy7;
-			if (yych <= 0x08) goto yy26;
-			goto yy7;
-		} else {
-			if (yych == '\r') goto yy7;
-			if (yych <= 0x1F) goto yy26;
-			goto yy7;
+		YYDEBUG(34, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(4);
+		yych = *YYCURSOR;
+yy35:
+		YYDEBUG(35, *YYCURSOR);
+		if (yybm0+yych & 4) {
+			goto yy34;
 		}
-	} else {
-		if (yych <= '9') {
-			if (yych <= '!') goto yy26;
-			if (yych <= '"') goto yy29;
-			if (yych <= '#') goto yy7;
-			goto yy26;
+		if (yych <= ' ') {
+			if (yych <= 0x00) goto yy11;
+			if (yych == '\n') goto yy11;
 		} else {
-			if (yych <= ':') goto yy60;
-			if (yych == '\\') goto yy29;
-			goto yy26;
+			if (yych <= '"') goto yy71;
+			if (yych <= '#') goto yy36;
+			if (yych <= ':') goto yy38;
+			goto yy39;
 		}
-	}
-yy35:
-	YYDEBUG(35, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '.') goto yy36;
-	if (yych <= '/') goto yy7;
-	if (yych >= ':') goto yy7;
 yy36:
-	YYDEBUG(36, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '.') goto yy36;
-	if (yych <= '/') goto yy37;
-	if (yych <= '9') goto yy36;
+		YYDEBUG(36, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 yy37:
-	YYDEBUG(37, *YYCURSOR);
-	YYCURSOR = YYCTXMARKER;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
-	return T_POUND;
-}
+		YYDEBUG(37, *YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy36;
+		}
+		if (yych <= '\n') goto yy11;
+		if (yych <= '"') goto yy72;
+		goto yy73;
 yy38:
-	YYDEBUG(38, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(4);
-	yych = *YYCURSOR;
+		YYDEBUG(38, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy74;
+		goto yy37;
 yy39:
-	YYDEBUG(39, *YYCURSOR);
-	if (yybm_NORMAL0+yych & 16) {
-		goto yy38;
-	}
-	if (yych <= '\n') {
-		if (yych <= 0x00) goto yy7;
-		if (yych >= '\n') goto yy7;
-	} else {
-		if (yych <= '#') goto yy40;
-		if (yych <= '\'') goto yy62;
-		if (yych <= ':') goto yy42;
-		goto yy43;
-	}
+		YYDEBUG(39, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+		if (yych <= ' ') {
+			if (yych <= '\n') {
+				if (yych <= 0x00) goto yy11;
+				if (yych <= 0x08) goto yy31;
+				goto yy11;
+			} else {
+				if (yych == '\r') goto yy11;
+				if (yych <= 0x1F) goto yy31;
+				goto yy11;
+			}
+		} else {
+			if (yych <= '9') {
+				if (yych <= '!') goto yy31;
+				if (yych <= '"') goto yy34;
+				if (yych <= '#') goto yy11;
+				goto yy31;
+			} else {
+				if (yych <= ':') goto yy69;
+				if (yych == '\\') goto yy34;
+				goto yy31;
+			}
+		}
 yy40:
-	YYDEBUG(40, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
+		YYDEBUG(40, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '.') goto yy41;
+		if (yych <= '/') goto yy11;
+		if (yych >= ':') goto yy11;
 yy41:
-	YYDEBUG(41, *YYCURSOR);
-	if (yybm_NORMAL0+yych & 32) {
-		goto yy40;
-	}
-	if (yych <= '\n') goto yy7;
-	if (yych <= '\'') goto yy63;
-	goto yy66;
-yy42:
-	YYDEBUG(42, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '/') goto yy67;
-	goto yy41;
+		YYDEBUG(41, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(42, *YYCURSOR);
+		if (yych == '.') goto yy41;
+		if (yych <= '/') goto yy43;
+		if (yych <= '9') goto yy41;
 yy43:
-	YYDEBUG(43, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-	if (yych <= '"') {
-		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy7;
-			if (yych <= 0x08) goto yy26;
-			if (yych <= '\n') goto yy7;
-			goto yy26;
-		} else {
-			if (yych <= '\r') goto yy7;
-			if (yych == ' ') goto yy7;
-			goto yy26;
-		}
-	} else {
-		if (yych <= '9') {
-			if (yych <= '#') goto yy7;
-			if (yych == '\'') goto yy38;
-			goto yy26;
-		} else {
-			if (yych <= ':') goto yy60;
-			if (yych == '\\') goto yy38;
-			goto yy26;
-		}
-	}
+		YYDEBUG(43, *YYCURSOR);
+		YYCURSOR = YYCTXMARKER;
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
+	return T_POUND;
+}
 yy44:
-	YYDEBUG(44, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ' ') {
-		if (yych <= '\f') {
-			if (yych == '\t') goto yy68;
-			goto yy3;
-		} else {
-			if (yych <= '\r') goto yy68;
-			if (yych <= 0x1F) goto yy3;
-			goto yy68;
+		YYDEBUG(44, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(4);
+		yych = *YYCURSOR;
+yy45:
+		YYDEBUG(45, *YYCURSOR);
+		if (yybm0+yych & 16) {
+			goto yy44;
 		}
-	} else {
-		if (yych <= '.') {
-			if (yych <= ',') goto yy3;
-			if (yych <= '-') goto yy69;
-			goto yy70;
+		if (yych <= '\n') {
+			if (yych <= 0x00) goto yy11;
+			if (yych >= '\n') goto yy11;
 		} else {
-			if (yych <= '/') goto yy3;
-			if (yych <= '9') goto yy70;
-			goto yy3;
+			if (yych <= '#') goto yy46;
+			if (yych <= '\'') goto yy71;
+			if (yych <= ':') goto yy48;
+			goto yy49;
 		}
-	}
-yy45:
-	YYDEBUG(45, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_NORMAL0+yych & 64) {
-		goto yy72;
-	}
-	goto yy3;
 yy46:
-	YYDEBUG(46, *YYCURSOR);
-	++YYCURSOR;
-	YYCURSOR -= 1;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
-	return T_COLON;
-}
+		YYDEBUG(46, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 yy47:
-	YYDEBUG(47, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
-	return T_DCOLON;
-}
+		YYDEBUG(47, *YYCURSOR);
+		if (yybm0+yych & 32) {
+			goto yy46;
+		}
+		if (yych <= '\n') goto yy11;
+		if (yych <= '\'') goto yy72;
+		goto yy75;
 yy48:
-	YYDEBUG(48, *YYCURSOR);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= ' ') {
-		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy4;
-			if (yych <= 0x08) goto yy48;
-			goto yy4;
+		YYDEBUG(48, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy76;
+		goto yy47;
+yy49:
+		YYDEBUG(49, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+		if (yych <= '"') {
+			if (yych <= '\f') {
+				if (yych <= 0x00) goto yy11;
+				if (yych <= 0x08) goto yy31;
+				if (yych <= '\n') goto yy11;
+				goto yy31;
+			} else {
+				if (yych <= '\r') goto yy11;
+				if (yych == ' ') goto yy11;
+				goto yy31;
+			}
 		} else {
-			if (yych == '\r') goto yy4;
-			if (yych <= 0x1F) goto yy48;
-			goto yy4;
+			if (yych <= '9') {
+				if (yych <= '#') goto yy11;
+				if (yych == '\'') goto yy44;
+				goto yy31;
+			} else {
+				if (yych <= ':') goto yy69;
+				if (yych == '\\') goto yy44;
+				goto yy31;
+			}
 		}
-	} else {
-		if (yych <= '&') {
-			if (yych <= '!') goto yy48;
-			if (yych <= '#') goto yy4;
-			goto yy48;
+yy50:
+		YYDEBUG(50, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= ' ') {
+			if (yych <= '\f') {
+				if (yych == '\t') goto yy77;
+				goto yy5;
+			} else {
+				if (yych <= '\r') goto yy77;
+				if (yych <= 0x1F) goto yy5;
+				goto yy77;
+			}
 		} else {
-			if (yych <= '\'') goto yy4;
-			if (yych == ':') goto yy74;
-			goto yy48;
+			if (yych <= '.') {
+				if (yych <= ',') goto yy5;
+				if (yych <= '-') goto yy79;
+				goto yy80;
+			} else {
+				if (yych <= '/') goto yy5;
+				if (yych <= '9') goto yy80;
+				goto yy5;
+			}
 		}
-	}
-yy49:
-	YYDEBUG(49, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy75;
-	if (yych == 's') goto yy75;
-	goto yy3;
-yy50:
-	YYDEBUG(50, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy76;
-	if (yych == 'a') goto yy76;
-	goto yy3;
 yy51:
-	YYDEBUG(51, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy77;
-	if (yych == 'l') goto yy77;
-	goto yy3;
+		YYDEBUG(51, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 64) {
+			goto yy83;
+		}
+		goto yy5;
 yy52:
-	YYDEBUG(52, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy78;
-		goto yy3;
-	} else {
-		if (yych <= '\r') goto yy78;
-		if (yych == ' ') goto yy78;
-		goto yy3;
-	}
-yy53:
-	YYDEBUG(53, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\f') {
-		if (yych <= 0x00) goto yy79;
-		if (yych <= 0x08) goto yy3;
-		if (yych <= '\n') goto yy79;
-		goto yy3;
-	} else {
-		if (yych <= '\r') goto yy79;
-		if (yych == ' ') goto yy79;
-		goto yy3;
-	}
+		YYDEBUG(52, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(53, *YYCURSOR);
+		YYCURSOR -= 1;
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
+	return T_COLON;
+}
 yy54:
-	YYDEBUG(54, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'F') goto yy53;
-	if (yych == 'f') goto yy53;
-	goto yy3;
-yy55:
-	YYDEBUG(55, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\f') {
-		if (yych <= 0x00) goto yy80;
-		if (yych <= 0x08) goto yy3;
-		if (yych <= '\n') goto yy80;
-		goto yy3;
-	} else {
-		if (yych <= '\r') goto yy80;
-		if (yych == ' ') goto yy80;
-		goto yy3;
-	}
+		YYDEBUG(54, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(55, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
+	return T_DCOLON;
+}
 yy56:
-	YYDEBUG(56, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy81;
-	if (yych == 'u') goto yy81;
-	goto yy3;
-yy57:
-	YYDEBUG(57, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy55;
-	if (yych == 's') goto yy55;
-	goto yy3;
+		YYDEBUG(56, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(57, *YYCURSOR);
+		if (yych <= ' ') {
+			if (yych <= '\n') {
+				if (yych <= 0x00) goto yy6;
+				if (yych <= 0x08) goto yy56;
+				goto yy6;
+			} else {
+				if (yych == '\r') goto yy6;
+				if (yych <= 0x1F) goto yy56;
+				goto yy6;
+			}
+		} else {
+			if (yych <= '&') {
+				if (yych <= '!') goto yy56;
+				if (yych <= '#') goto yy6;
+				goto yy56;
+			} else {
+				if (yych <= '\'') goto yy6;
+				if (yych == ':') goto yy86;
+				goto yy56;
+			}
+		}
 yy58:
-	YYDEBUG(58, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy82;
-	goto yy3;
+		YYDEBUG(58, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy87;
+		if (yych == 's') goto yy87;
+		goto yy5;
 yy59:
-	YYDEBUG(59, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'n') goto yy83;
-	goto yy3;
+		YYDEBUG(59, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy88;
+		if (yych == 'a') goto yy88;
+		goto yy5;
 yy60:
-	YYDEBUG(60, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych != '/') goto yy7;
+		YYDEBUG(60, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy89;
+		if (yych == 'l') goto yy89;
+		goto yy5;
 yy61:
-	YYDEBUG(61, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '/') goto yy84;
-	goto yy7;
-yy62:
-	YYDEBUG(62, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\r') {
-		if (yych <= 0x08) {
-			if (yych <= 0x00) goto yy4;
-			goto yy27;
+		YYDEBUG(61, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy90;
+			goto yy5;
 		} else {
-			if (yych <= '\n') goto yy4;
-			if (yych <= '\f') goto yy27;
-			goto yy4;
+			if (yych <= '\r') goto yy90;
+			if (yych == ' ') goto yy90;
+			goto yy5;
 		}
-	} else {
-		if (yych <= ' ') {
-			if (yych <= 0x1F) goto yy27;
-			goto yy4;
+yy62:
+		YYDEBUG(62, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\f') {
+			if (yych <= 0x00) goto yy93;
+			if (yych <= 0x08) goto yy5;
+			if (yych <= '\n') goto yy93;
+			goto yy5;
 		} else {
-			if (yych == '#') goto yy4;
-			goto yy27;
+			if (yych <= '\r') goto yy93;
+			if (yych == ' ') goto yy93;
+			goto yy5;
 		}
-	}
 yy63:
-	YYDEBUG(63, *YYCURSOR);
-	++YYCURSOR;
-	goto yy4;
+		YYDEBUG(63, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'F') goto yy62;
+		if (yych == 'f') goto yy62;
+		goto yy5;
 yy64:
-	YYDEBUG(64, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '"') goto yy31;
-	if (yych == '\\') goto yy31;
-	goto yy7;
+		YYDEBUG(64, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\f') {
+			if (yych <= 0x00) goto yy95;
+			if (yych <= 0x08) goto yy5;
+			if (yych <= '\n') goto yy95;
+			goto yy5;
+		} else {
+			if (yych <= '\r') goto yy95;
+			if (yych == ' ') goto yy95;
+			goto yy5;
+		}
 yy65:
-	YYDEBUG(65, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '/') goto yy86;
-	goto yy32;
+		YYDEBUG(65, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy97;
+		if (yych == 'u') goto yy97;
+		goto yy5;
 yy66:
-	YYDEBUG(66, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\'') goto yy40;
-	if (yych == '\\') goto yy40;
-	goto yy7;
+		YYDEBUG(66, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy64;
+		if (yych == 's') goto yy64;
+		goto yy5;
 yy67:
-	YYDEBUG(67, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '/') goto yy87;
-	goto yy41;
+		YYDEBUG(67, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy98;
+		goto yy5;
 yy68:
-	YYDEBUG(68, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= ' ') {
-		if (yych <= '\f') {
-			if (yych == '\t') goto yy68;
-			goto yy7;
-		} else {
-			if (yych <= '\r') goto yy68;
-			if (yych <= 0x1F) goto yy7;
-			goto yy68;
-		}
-	} else {
-		if (yych <= '.') {
-			if (yych <= ',') goto yy7;
-			if (yych <= '-') goto yy88;
-			goto yy89;
-		} else {
-			if (yych <= '/') goto yy7;
-			if (yych <= '9') goto yy89;
-			goto yy7;
-		}
-	}
+		YYDEBUG(68, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'n') goto yy99;
+		goto yy5;
 yy69:
-	YYDEBUG(69, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy70;
-	if (yych <= '/') goto yy3;
-	if (yych >= ':') goto yy3;
+		YYDEBUG(69, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych != '/') goto yy11;
 yy70:
-	YYDEBUG(70, *YYCURSOR);
-	yyaccept = 3;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-	if (yych <= '"') {
-		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy71;
-			if (yych <= 0x08) goto yy2;
-			if (yych >= '\v') goto yy2;
-		} else {
-			if (yych <= 0x1F) {
-				if (yych >= 0x0E) goto yy2;
+		YYDEBUG(70, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy100;
+		goto yy11;
+yy71:
+		YYDEBUG(71, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\r') {
+			if (yych <= 0x08) {
+				if (yych <= 0x00) goto yy6;
+				goto yy32;
 			} else {
-				if (yych <= ' ') goto yy71;
-				if (yych <= '!') goto yy2;
-				goto yy26;
+				if (yych <= '\n') goto yy6;
+				if (yych <= '\f') goto yy32;
+				goto yy6;
 			}
-		}
-	} else {
-		if (yych <= '-') {
-			if (yych <= '#') goto yy71;
-			if (yych == '\'') goto yy26;
-			goto yy2;
 		} else {
-			if (yych <= '/') {
-				if (yych <= '.') goto yy70;
-				goto yy2;
+			if (yych <= ' ') {
+				if (yych <= 0x1F) goto yy32;
+				goto yy6;
 			} else {
-				if (yych <= '9') goto yy70;
-				if (yych <= ':') goto yy28;
-				goto yy2;
+				if (yych == '#') goto yy6;
+				goto yy32;
 			}
 		}
-	}
-yy71:
-	YYDEBUG(71, *YYCURSOR);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
-	char *text = yytext + 2;
-	while (*++text < '0');
-	yylval->num = atoi(text);
-	return T_REQ_ID;
-}
 yy72:
-	YYDEBUG(72, *YYCURSOR);
-	yyaccept = 4;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-	if (yybm_NORMAL0+yych & 64) {
-		goto yy72;
-	}
-	if (yych <= ' ') {
-		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy73;
-			if (yych <= 0x08) goto yy2;
-		} else {
-			if (yych == '\r') goto yy73;
-			if (yych <= 0x1F) goto yy2;
-		}
-	} else {
-		if (yych <= '&') {
-			if (yych <= '!') goto yy2;
-			if (yych <= '"') goto yy26;
-			if (yych >= '$') goto yy2;
-		} else {
-			if (yych <= '\'') goto yy26;
-			if (yych <= '/') goto yy2;
-			if (yych <= ':') goto yy28;
-			goto yy2;
-		}
-	}
+		YYDEBUG(72, *YYCURSOR);
+		++YYCURSOR;
+		goto yy6;
 yy73:
-	YYDEBUG(73, *YYCURSOR);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
-	phpdbg_init_param(yylval, ADDR_PARAM);
-	yylval->addr = strtoul(yytext, 0, 16);
-	return T_ADDR;
-}
+		YYDEBUG(73, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych == '"') goto yy36;
+		if (yych == '\\') goto yy36;
+		goto yy11;
 yy74:
-	YYDEBUG(74, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\\') goto yy48;
-	goto yy7;
+		YYDEBUG(74, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy102;
+		goto yy37;
 yy75:
-	YYDEBUG(75, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy90;
-	if (yych == 'a') goto yy90;
-	goto yy3;
+		YYDEBUG(75, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych == '\'') goto yy46;
+		if (yych == '\\') goto yy46;
+		goto yy11;
 yy76:
-	YYDEBUG(76, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'B') goto yy91;
-	if (yych == 'b') goto yy91;
-	goto yy3;
+		YYDEBUG(76, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy103;
+		goto yy47;
 yy77:
-	YYDEBUG(77, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy92;
-	if (yych == 's') goto yy92;
-	goto yy3;
-yy78:
-	YYDEBUG(78, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy78;
-	} else {
-		if (yych <= '\r') goto yy78;
-		if (yych == ' ') goto yy78;
-	}
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+		YYDEBUG(77, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(78, *YYCURSOR);
+		if (yych <= ' ') {
+			if (yych <= '\f') {
+				if (yych == '\t') goto yy77;
+				goto yy11;
+			} else {
+				if (yych <= '\r') goto yy77;
+				if (yych <= 0x1F) goto yy11;
+				goto yy77;
+			}
+		} else {
+			if (yych <= '.') {
+				if (yych <= ',') goto yy11;
+				if (yych <= '-') goto yy104;
+				goto yy105;
+			} else {
+				if (yych <= '/') goto yy11;
+				if (yych <= '9') goto yy105;
+				goto yy11;
+			}
+		}
+yy79:
+		YYDEBUG(79, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '.') goto yy80;
+		if (yych <= '/') goto yy5;
+		if (yych >= ':') goto yy5;
+yy80:
+		YYDEBUG(80, *YYCURSOR);
+		yyaccept = 3;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+		YYDEBUG(81, *YYCURSOR);
+		if (yych <= '"') {
+			if (yych <= '\f') {
+				if (yych <= 0x00) goto yy82;
+				if (yych <= 0x08) goto yy4;
+				if (yych >= '\v') goto yy4;
+			} else {
+				if (yych <= 0x1F) {
+					if (yych >= 0x0E) goto yy4;
+				} else {
+					if (yych <= ' ') goto yy82;
+					if (yych <= '!') goto yy4;
+					goto yy31;
+				}
+			}
+		} else {
+			if (yych <= '-') {
+				if (yych <= '#') goto yy82;
+				if (yych == '\'') goto yy31;
+				goto yy4;
+			} else {
+				if (yych <= '/') {
+					if (yych <= '.') goto yy80;
+					goto yy4;
+				} else {
+					if (yych <= '9') goto yy80;
+					if (yych <= ':') goto yy33;
+					goto yy4;
+				}
+			}
+		}
+yy82:
+		YYDEBUG(82, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
+	char *text = yytext + 2;
+	while (*++text < '0');
+	yylval->num = atoi(text);
+	return T_REQ_ID;
+}
+yy83:
+		YYDEBUG(83, *YYCURSOR);
+		yyaccept = 4;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+		YYDEBUG(84, *YYCURSOR);
+		if (yybm0+yych & 64) {
+			goto yy83;
+		}
+		if (yych <= ' ') {
+			if (yych <= '\n') {
+				if (yych <= 0x00) goto yy85;
+				if (yych <= 0x08) goto yy4;
+			} else {
+				if (yych == '\r') goto yy85;
+				if (yych <= 0x1F) goto yy4;
+			}
+		} else {
+			if (yych <= '&') {
+				if (yych <= '!') goto yy4;
+				if (yych <= '"') goto yy31;
+				if (yych >= '$') goto yy4;
+			} else {
+				if (yych <= '\'') goto yy31;
+				if (yych <= '/') goto yy4;
+				if (yych <= ':') goto yy33;
+				goto yy4;
+			}
+		}
+yy85:
+		YYDEBUG(85, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
+	phpdbg_init_param(yylval, ADDR_PARAM);
+	yylval->addr = strtoul(yytext, 0, 16);
+	return T_ADDR;
+}
+yy86:
+		YYDEBUG(86, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych == '\\') goto yy56;
+		goto yy11;
+yy87:
+		YYDEBUG(87, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy107;
+		if (yych == 'a') goto yy107;
+		goto yy5;
+yy88:
+		YYDEBUG(88, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'B') goto yy108;
+		if (yych == 'b') goto yy108;
+		goto yy5;
+yy89:
+		YYDEBUG(89, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy109;
+		if (yych == 's') goto yy109;
+		goto yy5;
+yy90:
+		YYDEBUG(90, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(91, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy90;
+		} else {
+			if (yych <= '\r') goto yy90;
+			if (yych == ' ') goto yy90;
+		}
+		YYDEBUG(92, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_IF;
 }
-yy79:
-	YYDEBUG(79, *YYCURSOR);
-	++YYCURSOR;
-	YYCURSOR -= 1;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy93:
+		YYDEBUG(93, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(94, *YYCURSOR);
+		YYCURSOR -= 1;
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	phpdbg_init_param(yylval, NUMERIC_PARAM);
 	yylval->num = 0;
 	return T_FALSY;
 }
-yy80:
-	YYDEBUG(80, *YYCURSOR);
-	++YYCURSOR;
-	YYCURSOR -= 1;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy95:
+		YYDEBUG(95, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(96, *YYCURSOR);
+		YYCURSOR -= 1;
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	phpdbg_init_param(yylval, NUMERIC_PARAM);
 	yylval->num = 1;
 	return T_TRUTHY;
 }
-yy81:
-	YYDEBUG(81, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy55;
-	if (yych == 'e') goto yy55;
-	goto yy3;
-yy82:
-	YYDEBUG(82, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy93;
-	goto yy3;
-yy83:
-	YYDEBUG(83, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'd') goto yy93;
-	goto yy3;
-yy84:
-	YYDEBUG(84, *YYCURSOR);
-	++YYCURSOR;
-yy85:
-	YYDEBUG(85, *YYCURSOR);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy97:
+		YYDEBUG(97, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy64;
+		if (yych == 'e') goto yy64;
+		goto yy5;
+yy98:
+		YYDEBUG(98, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy110;
+		goto yy5;
+yy99:
+		YYDEBUG(99, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'd') goto yy110;
+		goto yy5;
+yy100:
+		YYDEBUG(100, *YYCURSOR);
+		++YYCURSOR;
+yy101:
+		YYDEBUG(101, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	phpdbg_init_param(yylval, STR_PARAM);
 	yylval->str = estrndup(yytext, yyleng);
 	yylval->len = yyleng;
 	return T_PROTO;
 }
-yy86:
-	YYDEBUG(86, *YYCURSOR);
-	yyaccept = 5;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x00) goto yy85;
-	if (yych == '\n') goto yy85;
-	goto yy32;
-yy87:
-	YYDEBUG(87, *YYCURSOR);
-	yyaccept = 5;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x00) goto yy85;
-	if (yych == '\n') goto yy85;
-	goto yy41;
-yy88:
-	YYDEBUG(88, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == '.') goto yy89;
-	if (yych <= '/') goto yy7;
-	if (yych >= ':') goto yy7;
-yy89:
-	YYDEBUG(89, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '.') goto yy89;
-	if (yych <= '/') goto yy71;
-	if (yych <= '9') goto yy89;
-	goto yy71;
-yy90:
-	YYDEBUG(90, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'B') goto yy94;
-	if (yych == 'b') goto yy94;
-	goto yy3;
-yy91:
-	YYDEBUG(91, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy95;
-	if (yych == 'l') goto yy95;
-	goto yy3;
-yy92:
-	YYDEBUG(92, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy53;
-	if (yych == 'e') goto yy53;
-	goto yy3;
-yy93:
-	YYDEBUG(93, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy96;
-	goto yy3;
-yy94:
-	YYDEBUG(94, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy97;
-	if (yych == 'l') goto yy97;
-	goto yy3;
-yy95:
-	YYDEBUG(95, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy98;
-	if (yych == 'e') goto yy98;
-	goto yy3;
-yy96:
-	YYDEBUG(96, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_NORMAL0+yych & 128) {
-		goto yy99;
-	}
-	goto yy3;
-yy97:
-	YYDEBUG(97, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy101;
-	if (yych == 'e') goto yy101;
-	goto yy3;
-yy98:
-	YYDEBUG(98, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy55;
-	if (yych == 'd') goto yy55;
-	goto yy3;
-yy99:
-	YYDEBUG(99, *YYCURSOR);
-	yyaccept = 6;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-	if (yybm_NORMAL0+yych & 128) {
-		goto yy99;
-	}
-	if (yych <= ' ') {
-		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy100;
-			if (yych <= 0x08) goto yy2;
-		} else {
-			if (yych == '\r') goto yy100;
-			if (yych <= 0x1F) goto yy2;
+yy102:
+		YYDEBUG(102, *YYCURSOR);
+		yyaccept = 5;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 0x00) goto yy101;
+		if (yych == '\n') goto yy101;
+		goto yy37;
+yy103:
+		YYDEBUG(103, *YYCURSOR);
+		yyaccept = 5;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 0x00) goto yy101;
+		if (yych == '\n') goto yy101;
+		goto yy47;
+yy104:
+		YYDEBUG(104, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '.') goto yy105;
+		if (yych <= '/') goto yy11;
+		if (yych >= ':') goto yy11;
+yy105:
+		YYDEBUG(105, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(106, *YYCURSOR);
+		if (yych == '.') goto yy105;
+		if (yych <= '/') goto yy82;
+		if (yych <= '9') goto yy105;
+		goto yy82;
+yy107:
+		YYDEBUG(107, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'B') goto yy111;
+		if (yych == 'b') goto yy111;
+		goto yy5;
+yy108:
+		YYDEBUG(108, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy112;
+		if (yych == 'l') goto yy112;
+		goto yy5;
+yy109:
+		YYDEBUG(109, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy62;
+		if (yych == 'e') goto yy62;
+		goto yy5;
+yy110:
+		YYDEBUG(110, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy113;
+		goto yy5;
+yy111:
+		YYDEBUG(111, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy114;
+		if (yych == 'l') goto yy114;
+		goto yy5;
+yy112:
+		YYDEBUG(112, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy115;
+		if (yych == 'e') goto yy115;
+		goto yy5;
+yy113:
+		YYDEBUG(113, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy116;
 		}
-	} else {
-		if (yych <= '&') {
-			if (yych <= '!') goto yy2;
-			if (yych <= '"') goto yy26;
-			if (yych >= '$') goto yy2;
+		goto yy5;
+yy114:
+		YYDEBUG(114, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy119;
+		if (yych == 'e') goto yy119;
+		goto yy5;
+yy115:
+		YYDEBUG(115, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy64;
+		if (yych == 'd') goto yy64;
+		goto yy5;
+yy116:
+		YYDEBUG(116, *YYCURSOR);
+		yyaccept = 6;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+		YYDEBUG(117, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy116;
+		}
+		if (yych <= ' ') {
+			if (yych <= '\n') {
+				if (yych <= 0x00) goto yy118;
+				if (yych <= 0x08) goto yy4;
+			} else {
+				if (yych == '\r') goto yy118;
+				if (yych <= 0x1F) goto yy4;
+			}
 		} else {
-			if (yych <= '\'') goto yy26;
-			if (yych == ':') goto yy28;
-			goto yy2;
+			if (yych <= '&') {
+				if (yych <= '!') goto yy4;
+				if (yych <= '"') goto yy31;
+				if (yych >= '$') goto yy4;
+			} else {
+				if (yych <= '\'') goto yy31;
+				if (yych == ':') goto yy33;
+				goto yy4;
+			}
 		}
-	}
-yy100:
-	YYDEBUG(100, *YYCURSOR);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy118:
+		YYDEBUG(118, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	phpdbg_init_param(yylval, OP_PARAM);
 	yylval->str = estrndup(yytext, yyleng);
 	yylval->len = yyleng;
 	return T_OPCODE;
 }
-yy101:
-	YYDEBUG(101, *YYCURSOR);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy53;
-	if (yych == 'd') goto yy53;
-	goto yy3;
+yy119:
+		YYDEBUG(119, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy62;
+		if (yych == 'd') goto yy62;
+		goto yy5;
+	}
 /* *********************************** */
 yyc_PRE_RAW:
-	YYDEBUG(102, *YYCURSOR);
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= '\r') {
-		if (yych == '\t') goto yy104;
-		if (yych >= '\r') goto yy104;
-	} else {
-		if (yych <= ' ') {
-			if (yych >= ' ') goto yy105;
+	{
+		static const unsigned char yybm = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,  64,   0,   0,   0,  64,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			 64,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0, 128,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+		};
+		YYDEBUG(120, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych <= '\r') {
+			if (yych == '\t') goto yy124;
+			if (yych >= '\r') goto yy124;
 		} else {
-			if (yych == '-') goto yy106;
+			if (yych <= ' ') {
+				if (yych >= ' ') goto yy125;
+			} else {
+				if (yych == '-') goto yy128;
+			}
 		}
-	}
-	++YYCURSOR;
-yy103:
-	YYDEBUG(103, *YYCURSOR);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+		YYDEBUG(122, *YYCURSOR);
+		++YYCURSOR;
+yy123:
+		YYDEBUG(123, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(RAW);
 
 	YYCURSOR = LEX(text);
 	goto restart;
 }
-yy104:
-	YYDEBUG(104, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yybm_PRE_RAW0+yych & 64) {
-		goto yy105;
-	}
-	goto yy103;
-yy105:
-	YYDEBUG(105, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_PRE_RAW0+yych & 64) {
-		goto yy105;
-	}
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy124:
+		YYDEBUG(124, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yybm0+yych & 64) {
+			goto yy125;
+		}
+		goto yy123;
+yy125:
+		YYDEBUG(125, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(126, *YYCURSOR);
+		if (yybm0+yych & 64) {
+			goto yy125;
+		}
+		YYDEBUG(127, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	/* ignore whitespace */
 
 	goto restart;
 }
-yy106:
-	YYDEBUG(106, *YYCURSOR);
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych != 'r') goto yy103;
-yy107:
-	YYDEBUG(107, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_PRE_RAW0+yych & 128) {
-		goto yy110;
-	}
-	if (yych <= '\r') {
-		if (yych == '\t') goto yy107;
-		if (yych >= '\r') goto yy107;
-	} else {
-		if (yych <= ' ') {
-			if (yych >= ' ') goto yy107;
+yy128:
+		YYDEBUG(128, *YYCURSOR);
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych != 'r') goto yy123;
+yy129:
+		YYDEBUG(129, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(130, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy133;
+		}
+		if (yych <= '\r') {
+			if (yych == '\t') goto yy129;
+			if (yych >= '\r') goto yy129;
 		} else {
-			if (yych == '-') goto yy109;
+			if (yych <= ' ') {
+				if (yych >= ' ') goto yy129;
+			} else {
+				if (yych == '-') goto yy132;
+			}
 		}
-	}
-yy108:
-	YYDEBUG(108, *YYCURSOR);
-	YYCURSOR = YYMARKER;
-	goto yy103;
-yy109:
-	YYDEBUG(109, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yybm_PRE_RAW0+yych & 128) {
-		goto yy110;
-	}
-	goto yy108;
-yy110:
-	YYDEBUG(110, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_PRE_RAW0+yych & 128) {
-		goto yy110;
-	}
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy131:
+		YYDEBUG(131, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy123;
+yy132:
+		YYDEBUG(132, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yybm0+yych & 128) {
+			goto yy133;
+		}
+		goto yy131;
+yy133:
+		YYDEBUG(133, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(134, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy133;
+		}
+		YYDEBUG(135, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	char *text = yytext + 2;
 	while (*++text < '0');
 	yylval->num = atoi(text);
 	return T_REQ_ID;
 }
+	}
 /* *********************************** */
 yyc_RAW:
-	YYDEBUG(111, *YYCURSOR);
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW0+yych & 8) {
-		goto yy113;
-	}
-	if (yych <= '\n') goto yy112;
-	if (yych <= '"') goto yy115;
-	if (yych <= '#') goto yy117;
-	if (yych <= '\'') goto yy118;
-	goto yy119;
-yy112:
-	YYDEBUG(112, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
 	{
+		static const unsigned char yybm = {
+			  0, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247,   0, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 148,  70, 247, 247, 247, 162, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247,   8, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+		};
+		YYDEBUG(136, *YYCURSOR);
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm0+yych & 1) {
+			goto yy140;
+		}
+		if (yych <= '\n') goto yy138;
+		if (yych <= '"') goto yy143;
+		if (yych <= '#') goto yy146;
+		if (yych <= '\'') goto yy148;
+		goto yy150;
+yy138:
+		YYDEBUG(138, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(139, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	return 0;
 }
-yy113:
-	YYDEBUG(113, *YYCURSOR);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW0+yych & 8) {
-		goto yy113;
-	}
-	if (yych <= '\n') goto yy114;
-	if (yych <= '"') goto yy115;
-	if (yych <= '#') goto yy114;
-	if (yych <= '\'') goto yy118;
-	goto yy119;
-yy114:
-	YYDEBUG(114, *YYCURSOR);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy140:
+		YYDEBUG(140, *YYCURSOR);
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(141, *YYCURSOR);
+		if (yybm0+yych & 1) {
+			goto yy140;
+		}
+		if (yych <= '\n') goto yy142;
+		if (yych <= '"') goto yy143;
+		if (yych <= '#') goto yy142;
+		if (yych <= '\'') goto yy148;
+		goto yy150;
+yy142:
+		YYDEBUG(142, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	phpdbg_init_param(yylval, STR_PARAM);
 	yylval->str = estrdup(yytext);
 	yylval->len = yyleng;
 	return T_INPUT;
 }
-yy115:
-	YYDEBUG(115, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW0+yych & 32) {
-		goto yy120;
-	}
-	if (yych >= '#') goto yy121;
-yy116:
-	YYDEBUG(116, *YYCURSOR);
-	YYCURSOR = YYMARKER;
-	goto yy114;
-yy117:
-	YYDEBUG(117, *YYCURSOR);
-	++YYCURSOR;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy143:
+		YYDEBUG(143, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(144, *YYCURSOR);
+		if (yybm0+yych & 2) {
+			goto yy143;
+		}
+		if (yych <= '\n') goto yy145;
+		if (yych <= '"') goto yy140;
+		goto yy152;
+yy145:
+		YYDEBUG(145, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy142;
+yy146:
+		YYDEBUG(146, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(147, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(INITIAL);
 	return T_SEPARATOR;
 }
-yy118:
-	YYDEBUG(118, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW0+yych & 64) {
-		goto yy122;
-	}
-	if (yych <= '\'') goto yy116;
-	goto yy123;
-yy119:
-	YYDEBUG(119, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW0+yych & 16) {
-		goto yy119;
-	}
-	if (yych <= '!') {
-		if (yych <= 0x00) goto yy114;
-		if (yych == '\n') goto yy114;
-		goto yy113;
-	} else {
-		if (yych <= '"') goto yy124;
-		if (yych == '\'') goto yy125;
-		goto yy113;
-	}
-yy120:
-	YYDEBUG(120, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW0+yych & 32) {
-		goto yy120;
-	}
-	if (yych <= '\n') goto yy116;
-	if (yych <= '"') goto yy113;
-yy121:
-	YYDEBUG(121, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW0+yych & 32) {
-		goto yy120;
-	}
-	if (yych <= '\n') goto yy116;
-	if (yych <= '"') goto yy126;
-	goto yy121;
-yy122:
-	YYDEBUG(122, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW0+yych & 64) {
-		goto yy122;
-	}
-	if (yych <= '\n') goto yy116;
-	if (yych <= '\'') goto yy113;
-yy123:
-	YYDEBUG(123, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW0+yych & 64) {
-		goto yy122;
-	}
-	if (yych <= '\n') goto yy116;
-	if (yych <= '\'') goto yy127;
-	goto yy123;
-yy124:
-	YYDEBUG(124, *YYCURSOR);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '"') {
-		if (yych <= '\t') {
-			if (yych <= 0x00) goto yy114;
-			goto yy126;
-		} else {
-			if (yych <= '\n') goto yy114;
-			if (yych <= '!') goto yy126;
-			goto yy115;
+yy148:
+		YYDEBUG(148, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(149, *YYCURSOR);
+		if (yybm0+yych & 4) {
+			goto yy148;
 		}
-	} else {
-		if (yych <= '\'') {
-			if (yych <= '#') goto yy120;
-			if (yych <= '&') goto yy126;
-			goto yy128;
-		} else {
-			if (yych == '\\') goto yy129;
-			goto yy126;
+		if (yych <= '\n') goto yy145;
+		if (yych <= '\'') goto yy140;
+		goto yy154;
+yy150:
+		YYDEBUG(150, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(151, *YYCURSOR);
+		if (yybm0+yych & 8) {
+			goto yy150;
 		}
-	}
-yy125:
-	YYDEBUG(125, *YYCURSOR);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '"') {
-		if (yych <= '\t') {
-			if (yych <= 0x00) goto yy114;
-			goto yy127;
+		if (yych <= '!') {
+			if (yych <= 0x00) goto yy142;
+			if (yych == '\n') goto yy142;
+			goto yy140;
 		} else {
-			if (yych <= '\n') goto yy114;
-			if (yych <= '!') goto yy127;
-			goto yy130;
+			if (yych <= '"') goto yy156;
+			if (yych == '\'') goto yy158;
+			goto yy140;
 		}
-	} else {
-		if (yych <= '\'') {
-			if (yych <= '#') goto yy122;
-			if (yych <= '&') goto yy127;
-			goto yy118;
-		} else {
-			if (yych == '\\') goto yy131;
-			goto yy127;
+yy152:
+		YYDEBUG(152, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(153, *YYCURSOR);
+		if (yybm0+yych & 2) {
+			goto yy143;
 		}
-	}
-yy126:
-	YYDEBUG(126, *YYCURSOR);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '"') {
-		if (yych <= '\t') {
-			if (yych <= 0x00) goto yy114;
-			goto yy126;
-		} else {
-			if (yych <= '\n') goto yy114;
-			if (yych <= '!') goto yy126;
-			goto yy124;
+		if (yych <= '\n') goto yy145;
+		if (yych <= '"') goto yy156;
+		goto yy152;
+yy154:
+		YYDEBUG(154, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(155, *YYCURSOR);
+		if (yybm0+yych & 4) {
+			goto yy148;
 		}
-	} else {
-		if (yych <= '\'') {
-			if (yych <= '#') goto yy120;
-			if (yych <= '&') goto yy126;
-			goto yy128;
-		} else {
-			if (yych == '\\') goto yy129;
-			goto yy126;
+		if (yych <= '\n') goto yy145;
+		if (yych <= '\'') goto yy158;
+		goto yy154;
+yy156:
+		YYDEBUG(156, *YYCURSOR);
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(157, *YYCURSOR);
+		if (yybm0+yych & 16) {
+			goto yy156;
 		}
-	}
-yy127:
-	YYDEBUG(127, *YYCURSOR);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '"') {
-		if (yych <= '\t') {
-			if (yych <= 0x00) goto yy114;
-			goto yy127;
-		} else {
-			if (yych <= '\n') goto yy114;
-			if (yych <= '!') goto yy127;
-			goto yy130;
+		if (yych <= '\n') goto yy142;
+		if (yych <= '#') goto yy143;
+		if (yych <= '\'') goto yy160;
+		goto yy162;
+yy158:
+		YYDEBUG(158, *YYCURSOR);
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(159, *YYCURSOR);
+		if (yybm0+yych & 32) {
+			goto yy158;
 		}
-	} else {
-		if (yych <= '\'') {
-			if (yych <= '#') goto yy122;
-			if (yych <= '&') goto yy127;
-			goto yy125;
-		} else {
-			if (yych == '\\') goto yy131;
-			goto yy127;
+		if (yych <= '\n') goto yy142;
+		if (yych <= '"') goto yy160;
+		if (yych <= '#') goto yy148;
+		goto yy164;
+yy160:
+		YYDEBUG(160, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(161, *YYCURSOR);
+		if (yybm0+yych & 64) {
+			goto yy160;
 		}
-	}
-yy128:
-	YYDEBUG(128, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW0+yych & 128) {
-		goto yy132;
-	}
-	if (yych <= '\n') goto yy116;
-	if (yych <= '"') goto yy127;
-	if (yych <= '\'') goto yy120;
-	goto yy133;
-yy129:
-	YYDEBUG(129, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '&') {
-		if (yych <= 0x00) goto yy114;
-		if (yych == '\n') goto yy114;
-		goto yy126;
-	} else {
-		if (yych <= '\'') goto yy134;
-		if (yych == '\\') goto yy129;
-		goto yy126;
-	}
-yy130:
-	YYDEBUG(130, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW0+yych & 128) {
-		goto yy132;
-	}
-	if (yych <= '\n') goto yy116;
-	if (yych <= '"') goto yy122;
-	if (yych <= '\'') goto yy126;
-	goto yy133;
-yy131:
-	YYDEBUG(131, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '!') {
-		if (yych <= 0x00) goto yy114;
-		if (yych == '\n') goto yy114;
-		goto yy127;
-	} else {
-		if (yych <= '"') goto yy135;
-		if (yych == '\\') goto yy131;
-		goto yy127;
-	}
-yy132:
-	YYDEBUG(132, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW0+yych & 128) {
-		goto yy132;
-	}
-	if (yych <= '\n') goto yy116;
-	if (yych <= '"') goto yy127;
-	if (yych <= '\'') goto yy126;
-yy133:
-	YYDEBUG(133, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW0+yych & 128) {
-		goto yy132;
-	}
-	if (yych <= '\n') goto yy116;
-	if (yych <= '\'') goto yy136;
-	goto yy133;
-yy134:
-	YYDEBUG(134, *YYCURSOR);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '"') {
-		if (yych <= '\t') {
-			if (yych <= 0x00) goto yy114;
-			goto yy136;
-		} else {
-			if (yych <= '\n') goto yy114;
-			if (yych <= '!') goto yy136;
-		}
-	} else {
-		if (yych <= '\'') {
-			if (yych <= '#') goto yy132;
-			if (yych <= '&') goto yy136;
-			goto yy128;
+		if (yych <= '\n') goto yy145;
+		if (yych <= '"') goto yy158;
+		if (yych <= '\'') goto yy156;
+		goto yy166;
+yy162:
+		YYDEBUG(162, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(163, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= 0x00) goto yy142;
+			if (yych == '\n') goto yy142;
+			goto yy156;
 		} else {
-			if (yych == '\\') goto yy137;
-			goto yy136;
+			if (yych <= '\'') goto yy168;
+			if (yych == '\\') goto yy162;
+			goto yy156;
 		}
-	}
-yy135:
-	YYDEBUG(135, *YYCURSOR);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '"') {
-		if (yych <= '\t') {
-			if (yych <= 0x00) goto yy114;
+yy164:
+		YYDEBUG(164, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(165, *YYCURSOR);
+		if (yych <= '!') {
+			if (yych <= 0x00) goto yy142;
+			if (yych == '\n') goto yy142;
+			goto yy158;
 		} else {
-			if (yych <= '\n') goto yy114;
-			if (yych >= '"') goto yy130;
+			if (yych <= '"') goto yy168;
+			if (yych == '\\') goto yy164;
+			goto yy158;
 		}
-	} else {
-		if (yych <= '\'') {
-			if (yych <= '#') goto yy132;
-			if (yych >= '\'') goto yy134;
-		} else {
-			if (yych == '\\') goto yy137;
+yy166:
+		YYDEBUG(166, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(167, *YYCURSOR);
+		if (yybm0+yych & 64) {
+			goto yy160;
 		}
-	}
-yy136:
-	YYDEBUG(136, *YYCURSOR);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '"') {
-		if (yych <= '\t') {
-			if (yych <= 0x00) goto yy114;
-			goto yy136;
-		} else {
-			if (yych <= '\n') goto yy114;
-			if (yych <= '!') goto yy136;
-			goto yy135;
+		if (yych <= '\n') goto yy145;
+		if (yych >= '(') goto yy166;
+yy168:
+		YYDEBUG(168, *YYCURSOR);
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(169, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy168;
 		}
-	} else {
-		if (yych <= '\'') {
-			if (yych <= '#') goto yy132;
-			if (yych <= '&') goto yy136;
-			goto yy134;
+		if (yych <= '\n') goto yy142;
+		if (yych <= '#') goto yy160;
+yy170:
+		YYDEBUG(170, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(171, *YYCURSOR);
+		if (yych <= '\n') {
+			if (yych <= 0x00) goto yy142;
+			if (yych <= '\t') goto yy168;
+			goto yy142;
 		} else {
-			if (yych != '\\') goto yy136;
+			if (yych == '\\') goto yy170;
+			goto yy168;
 		}
 	}
-yy137:
-	YYDEBUG(137, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\n') {
-		if (yych <= 0x00) goto yy114;
-		if (yych <= '\t') goto yy136;
-		goto yy114;
-	} else {
-		if (yych == '\\') goto yy137;
-		goto yy136;
-	}
 /* *********************************** */
 yyc_INITIAL:
-	YYDEBUG(138, *YYCURSOR);
-	YYFILL(4);
-	yych = *YYCURSOR;
-	if (yych <= 'E') {
-		if (yych <= '\r') {
-			if (yych == '\t') goto yy141;
-			if (yych >= '\r') goto yy141;
-		} else {
-			if (yych == ' ') goto yy142;
-			if (yych >= 'E') goto yy143;
-		}
-	} else {
-		if (yych <= 'd') {
-			if (yych <= 'Q') goto yy139;
-			if (yych <= 'R') goto yy144;
-			if (yych <= 'S') goto yy145;
+	{
+		static const unsigned char yybm = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0, 128,   0,   0,   0, 128,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			128,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+		};
+		YYDEBUG(172, *YYCURSOR);
+		YYFILL(4);
+		yych = *YYCURSOR;
+		if (yych <= 'E') {
+			if (yych <= '\r') {
+				if (yych == '\t') goto yy176;
+				if (yych >= '\r') goto yy176;
+			} else {
+				if (yych == ' ') goto yy177;
+				if (yych >= 'E') goto yy180;
+			}
 		} else {
-			if (yych <= 'q') {
-				if (yych <= 'e') goto yy143;
+			if (yych <= 'd') {
+				if (yych <= 'Q') goto yy174;
+				if (yych <= 'R') goto yy181;
+				if (yych <= 'S') goto yy182;
 			} else {
-				if (yych <= 'r') goto yy146;
-				if (yych <= 's') goto yy145;
+				if (yych <= 'q') {
+					if (yych <= 'e') goto yy180;
+				} else {
+					if (yych <= 'r') goto yy183;
+					if (yych <= 's') goto yy182;
+				}
 			}
 		}
-	}
-yy139:
-	YYDEBUG(139, *YYCURSOR);
-	++YYCURSOR;
-yy140:
-	YYDEBUG(140, *YYCURSOR);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy174:
+		YYDEBUG(174, *YYCURSOR);
+		++YYCURSOR;
+yy175:
+		YYDEBUG(175, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(NORMAL);
 
 	YYCURSOR = LEX(text);
 	goto restart;
 }
-yy141:
-	YYDEBUG(141, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yybm_INITIAL0+yych & 128) {
-		goto yy142;
-	}
-	goto yy140;
-yy142:
-	YYDEBUG(142, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_INITIAL0+yych & 128) {
-		goto yy142;
-	}
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy176:
+		YYDEBUG(176, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yybm0+yych & 128) {
+			goto yy177;
+		}
+		goto yy175;
+yy177:
+		YYDEBUG(177, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(178, *YYCURSOR);
+		if (yybm0+yych & 128) {
+			goto yy177;
+		}
+		YYDEBUG(179, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	/* ignore whitespace */
 
 	goto restart;
 }
-yy143:
-	YYDEBUG(143, *YYCURSOR);
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'V') goto yy147;
-	if (yych == 'v') goto yy147;
-	goto yy140;
-yy144:
-	YYDEBUG(144, *YYCURSOR);
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy149;
-	if (yych == 'u') goto yy149;
-	goto yy140;
-yy145:
-	YYDEBUG(145, *YYCURSOR);
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy150;
-	if (yych == 'h') goto yy150;
-	goto yy140;
-yy146:
-	YYDEBUG(146, *YYCURSOR);
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x1F) {
-		if (yych <= '\t') {
-			if (yych <= 0x08) goto yy140;
-			goto yy151;
+yy180:
+		YYDEBUG(180, *YYCURSOR);
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'V') goto yy184;
+		if (yych == 'v') goto yy184;
+		goto yy175;
+yy181:
+		YYDEBUG(181, *YYCURSOR);
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy186;
+		if (yych == 'u') goto yy186;
+		goto yy175;
+yy182:
+		YYDEBUG(182, *YYCURSOR);
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy187;
+		if (yych == 'h') goto yy187;
+		goto yy175;
+yy183:
+		YYDEBUG(183, *YYCURSOR);
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych <= '\t') {
+				if (yych <= 0x08) goto yy175;
+				goto yy188;
+			} else {
+				if (yych == '\r') goto yy188;
+				goto yy175;
+			}
 		} else {
-			if (yych == '\r') goto yy151;
-			goto yy140;
+			if (yych <= 'U') {
+				if (yych <= ' ') goto yy188;
+				if (yych <= 'T') goto yy175;
+				goto yy186;
+			} else {
+				if (yych == 'u') goto yy186;
+				goto yy175;
+			}
 		}
-	} else {
-		if (yych <= 'U') {
-			if (yych <= ' ') goto yy151;
-			if (yych <= 'T') goto yy140;
-			goto yy149;
+yy184:
+		YYDEBUG(184, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy191;
 		} else {
-			if (yych == 'u') goto yy149;
-			goto yy140;
+			if (yych <= '\r') goto yy191;
+			if (yych == ' ') goto yy191;
 		}
-	}
-yy147:
-	YYDEBUG(147, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy152;
-	} else {
-		if (yych <= '\r') goto yy152;
-		if (yych == ' ') goto yy152;
-	}
-yy148:
-	YYDEBUG(148, *YYCURSOR);
-	YYCURSOR = YYMARKER;
-	goto yy140;
-yy149:
-	YYDEBUG(149, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy153;
-	if (yych == 'n') goto yy153;
-	goto yy148;
-yy150:
-	YYDEBUG(150, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy154;
-		goto yy148;
-	} else {
-		if (yych <= '\r') goto yy154;
-		if (yych == ' ') goto yy154;
-		goto yy148;
-	}
-yy151:
-	YYDEBUG(151, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy151;
-	} else {
-		if (yych <= '\r') goto yy151;
-		if (yych == ' ') goto yy151;
-	}
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy185:
+		YYDEBUG(185, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy175;
+yy186:
+		YYDEBUG(186, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy194;
+		if (yych == 'n') goto yy194;
+		goto yy185;
+yy187:
+		YYDEBUG(187, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy195;
+			goto yy185;
+		} else {
+			if (yych <= '\r') goto yy195;
+			if (yych == ' ') goto yy195;
+			goto yy185;
+		}
+yy188:
+		YYDEBUG(188, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(189, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy188;
+		} else {
+			if (yych <= '\r') goto yy188;
+			if (yych == ' ') goto yy188;
+		}
+		YYDEBUG(190, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(PRE_RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_RUN;
 }
-yy152:
-	YYDEBUG(152, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy152;
-	} else {
-		if (yych <= '\r') goto yy152;
-		if (yych == ' ') goto yy152;
-	}
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy191:
+		YYDEBUG(191, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(192, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy191;
+		} else {
+			if (yych <= '\r') goto yy191;
+			if (yych == ' ') goto yy191;
+		}
+		YYDEBUG(193, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(PRE_RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_EVAL;
 }
-yy153:
-	YYDEBUG(153, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy151;
-		goto yy148;
-	} else {
-		if (yych <= '\r') goto yy151;
-		if (yych == ' ') goto yy151;
-		goto yy148;
-	}
-yy154:
-	YYDEBUG(154, *YYCURSOR);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy154;
-	} else {
-		if (yych <= '\r') goto yy154;
-		if (yych == ' ') goto yy154;
-	}
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy194:
+		YYDEBUG(194, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy188;
+			goto yy185;
+		} else {
+			if (yych <= '\r') goto yy188;
+			if (yych == ' ') goto yy188;
+			goto yy185;
+		}
+yy195:
+		YYDEBUG(195, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(196, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy195;
+		} else {
+			if (yych <= '\r') goto yy195;
+			if (yych == ' ') goto yy195;
+		}
+		YYDEBUG(197, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(PRE_RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_SHELL;
 }
+	}
 }
 
 }

php-8.2.23.tar.xz/sapi/phpdbg/phpdbg_lexer.l -> php-8.2.28.tar.xz/sapi/phpdbg/phpdbg_lexer.l Changed

php-8.2.23.tar.xz/sapi/phpdbg/phpdbg_parser.c -> php-8.2.28.tar.xz/sapi/phpdbg/phpdbg_parser.c Changed

@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.8.2.  */
+/* A Bison parser, made by GNU Bison 3.7.5.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -46,10 +46,10 @@
    USER NAME SPACE" below.  */
 
 /* Identify Bison output, and Bison version.  */
-#define YYBISON 30802
+#define YYBISON 30705
 
 /* Bison version string.  */
-#define YYBISON_VERSION "3.8.2"
+#define YYBISON_VERSION "3.7.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -308,18 +308,12 @@
 # define YY_USE(E) /* empty */
 #endif
 
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
-# if __GNUC__ * 100 + __GNUC_MINOR__ < 407
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
-    _Pragma ("GCC diagnostic push")                                     \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")
-# else
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                            \
     _Pragma ("GCC diagnostic push")                                     \
     _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# endif
 # define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
     _Pragma ("GCC diagnostic pop")
 #else
@@ -535,7 +529,7 @@
 };
 
 #if PHPDBG_DEBUG
-/* YYRLINEYYN -- Source line where rule number YYN was defined.  */
+  /* YYRLINEYYN -- Source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline =
 {
        0,    67,    67,    68,    69,    73,    74,    78,    79,    80,
@@ -578,6 +572,17 @@
 }
 #endif
 
+#ifdef YYPRINT
+/* YYTOKNUMNUM -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_int16 yytoknum =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277
+};
+#endif
+
 #define YYPACT_NINF (-15)
 
 #define yypact_value_is_default(Yyn) \
@@ -588,8 +593,8 @@
 #define yytable_value_is_error(Yyn) \
   0
 
-/* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
+  /* YYPACTSTATE-NUM -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
 static const yytype_int8 yypact =
 {
       -3,   -14,   -14,   -14,   -10,   -15,   -15,    12,   -15,   -15,
@@ -599,9 +604,9 @@
       29,   -15,   -15,    30,   -15,   -15
 };
 
-/* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE does not specify something else to do.  Zero
-   means the default is an error.  */
+  /* YYDEFACTSTATE-NUM -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_int8 yydefact =
 {
        4,    26,    26,    26,     0,    21,    22,     0,    23,    20,
@@ -611,21 +616,21 @@
        0,    12,    11,     0,    13,    15
 };
 
-/* YYPGOTONTERM-NUM.  */
+  /* YYPGOTONTERM-NUM.  */
 static const yytype_int8 yypgoto =
 {
      -15,   -15,    23,   -15,    32,    20,   -15
 };
 
-/* YYDEFGOTONTERM-NUM.  */
+  /* YYDEFGOTONTERM-NUM.  */
 static const yytype_int8 yydefgoto =
 {
        0,    13,    14,    15,    16,    19,    17
 };
 
-/* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule whose
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+  /* YYTABLEYYPACTSTATE-NUM -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int8 yytable =
 {
        1,     2,     3,     4,     5,     6,    35,    27,    18,    36,
@@ -646,8 +651,8 @@
       -1,    28
 };
 
-/* YYSTOSSTATE-NUM -- The symbol kind of the accessing symbol of
-   state STATE-NUM.  */
+  /* YYSTOSSTATE-NUM -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_int8 yystos =
 {
        0,     3,     4,     5,     6,     7,     8,    14,    15,    16,
@@ -657,7 +662,7 @@
       12,    15,    15,    12,    15,    15
 };
 
-/* YYR1RULE-NUM -- Symbol kind of the left-hand side of rule RULE-NUM.  */
+  /* YYR1YYN -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_int8 yyr1 =
 {
        0,    23,    24,    24,    24,    25,    25,    26,    26,    26,
@@ -666,7 +671,7 @@
       29
 };
 
-/* YYR2RULE-NUM -- Number of symbols on the right-hand side of rule RULE-NUM.  */
+  /* YYR2YYN -- Number of symbols on the right hand side of rule YYN.  */
 static const yytype_int8 yyr2 =
 {
        0,     2,     1,     3,     0,     1,     1,     1,     2,     2,
@@ -684,7 +689,6 @@
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
 #define YYERROR         goto yyerrorlab
-#define YYNOMEM         goto yyexhaustedlab
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
@@ -725,7 +729,10 @@
     YYFPRINTF Args;                             \
 } while (0)
 
-
+/* This macro is provided for backward compatibility. */
+# ifndef YY_LOCATION_PRINT
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 
 
 # define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
@@ -752,6 +759,10 @@
   YY_USE (yyoutput);
   if (!yyvaluep)
     return;
+# ifdef YYPRINT
+  if (yykind < YYNTOKENS)
+    YYPRINT (yyo, yytoknumyykind, *yyvaluep);
+# endif
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   YY_USE (yykind);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
@@ -1212,7 +1223,6 @@
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yychar = PHPDBG_EMPTY; /* Cause a token to be read.  */
-
   goto yysetstate;
 
 
@@ -1238,7 +1248,7 @@
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
-    YYNOMEM;
+    goto yyexhaustedlab;
 #else
     {
       /* Get the current used size of the three stacks, in elements.  */
@@ -1266,7 +1276,7 @@
 # else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-        YYNOMEM;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
         yystacksize = YYMAXDEPTH;
@@ -1277,7 +1287,7 @@
           YY_CAST (union yyalloc *,
                    YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
         if (! yyptr)
-          YYNOMEM;
+          goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
@@ -1299,7 +1309,6 @@
     }
 #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
-
   if (yystate == YYFINAL)
     YYACCEPT;
 
@@ -1658,7 +1667,7 @@
           }
         yyerror (yymsgp);
         if (yysyntax_error_status == YYENOMEM)
-          YYNOMEM;
+          goto yyexhaustedlab;
       }
     }
 
@@ -1694,7 +1703,6 @@
      label yyerrorlab therefore never appears in user code.  */
   if (0)
     YYERROR;
-  ++yynerrs;
 
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
@@ -1755,7 +1763,7 @@
 `-------------------------------------*/
 yyacceptlab:
   yyresult = 0;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
 /*-----------------------------------.
@@ -1763,22 +1771,24 @@
 `-----------------------------------*/
 yyabortlab:
   yyresult = 1;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
-/*-----------------------------------------------------------.
-| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here.  |
-`-----------------------------------------------------------*/
+#if 1
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
 yyexhaustedlab:
   yyerror (YY_("memory exhausted"));
   yyresult = 2;
-  goto yyreturnlab;
+  goto yyreturn;
+#endif
 
 
-/*----------------------------------------------------------.
-| yyreturnlab -- parsing is finished, clean up and return.  |
-`----------------------------------------------------------*/
-yyreturnlab:
+/*-------------------------------------------------------.
+| yyreturn -- parsing is finished, clean up and return.  |
+`-------------------------------------------------------*/
+yyreturn:
   if (yychar != PHPDBG_EMPTY)
     {
       /* Make sure we have latest lookahead translation.  See comments at

php-8.2.23.tar.xz/sapi/phpdbg/phpdbg_parser.h -> php-8.2.28.tar.xz/sapi/phpdbg/phpdbg_parser.h Changed

php-8.2.23.tar.xz/sapi/phpdbg/phpdbg_parser.output -> php-8.2.28.tar.xz/sapi/phpdbg/phpdbg_parser.output Changed

php-8.2.23.tar.xz/sapi/phpdbg/phpdbg_prompt.c -> php-8.2.28.tar.xz/sapi/phpdbg/phpdbg_prompt.c Changed

php-8.2.28.tar.xz/sapi/phpdbg/tests/gh15208.phpt Added

php-8.2.28.tar.xz/sapi/phpdbg/tests/gh15901.phpt Added

php-8.2.28.tar.xz/sapi/phpdbg/tests/gh16174.phpt Added

php-8.2.28.tar.xz/sapi/phpdbg/tests/gh16181.phpt Added

php-8.2.23.tar.xz/scripts/dev/credits -> php-8.2.28.tar.xz/scripts/dev/credits Changed

php-8.2.23.tar.xz/scripts/dev/genfiles -> php-8.2.28.tar.xz/scripts/dev/genfiles Changed

php-8.2.23.tar.xz/scripts/dev/makedist -> php-8.2.28.tar.xz/scripts/dev/makedist Changed

php-8.2.23.tar.xz/scripts/phpize.m4 -> php-8.2.28.tar.xz/scripts/phpize.m4 Changed

php-8.2.28.tar.xz/tests/basic/GHSA-9pqp-7h25-4f32.inc Added

php-8.2.28.tar.xz/tests/basic/GHSA-9pqp-7h25-4f32.phpt Added

@@ -0,0 +1,103 @@
+--TEST--
+GHSA-9pqp-7h25-4f32
+--SKIPIF--
+<?php
+if (!getenv('TEST_PHP_CGI_EXECUTABLE')) {
+    die("skip php-cgi not available");
+}
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die("skip not for Windows in CI - probably resource issue");
+}
+?>
+--FILE--
+<?php
+
+const FILLUNIT = 5 * 1024;
+
+function test($boundaryLen) {
+    printf("Boundary len: %d\n", $boundaryLen);
+
+    $cmd = 
+        getenv('TEST_PHP_CGI_EXECUTABLE'),
+        '-C',
+        '-n',
+        __DIR__ . '/GHSA-9pqp-7h25-4f32.inc',
+    ;
+
+    $boundary = str_repeat('A', $boundaryLen);
+    $body = ""
+        . "--$boundary\r\n"
+        . "Content-Disposition: form-data; name=\"koko\"\r\n"
+        . "\r\n"
+        . "BBB\r\n--" . substr($boundary, 0, -1) . "CCC\r\n"
+        . "--$boundary--\r\n"
+        ;
+
+    $env = array_merge($_ENV, 
+        'REDIRECT_STATUS' => '1',
+        'CONTENT_TYPE' => "multipart/form-data; boundary=$boundary",
+        'CONTENT_LENGTH' => strlen($body),
+        'REQUEST_METHOD' => 'POST',
+        'SCRIPT_FILENAME' => __DIR__ . '/GHSA-9pqp-7h25-4f32.inc',
+    );
+
+    $spec = 
+        0 => 'pipe', 'r',
+        1 => STDOUT,
+        2 => STDOUT,
+    ;
+
+    $pipes = ;
+
+    print "Starting...\n";
+
+    $handle = proc_open($cmd, $spec, $pipes, getcwd(), $env);
+
+    fwrite($pipes0, $body);
+
+    $status = proc_close($handle);
+
+    print "\n";
+}
+
+for ($offset = -1; $offset <= 1; $offset++) {
+    test(FILLUNIT - strlen("\r\n--") + $offset);
+}
+
+?>
+--EXPECTF--
+Boundary len: 5115
+Starting...
+X-Powered-By: %s
+Content-type: text/html; charset=UTF-8
+
+Hello world
+array(1) {
+  "koko"=>
+  string(5124) "BBB
+--AAA%sCCC"
+}
+
+Boundary len: 5116
+Starting...
+X-Powered-By: %s
+Content-type: text/html; charset=UTF-8
+
+Hello world
+array(1) {
+  "koko"=>
+  string(5125) "BBB
+--AAA%sCCC"
+}
+
+Boundary len: 5117
+Starting...
+X-Powered-By: %s
+Content-type: text/html; charset=UTF-8
+
+<br />
+<b>Warning</b>:  Boundary too large in multipart/form-data POST data in <b>Unknown</b> on line <b>0</b><br />
+Hello world
+array(0) {
+}
+

php-8.2.28.tar.xz/tests/basic/gh15905.phpt Added

php-8.2.28.tar.xz/tests/basic/gh16998.phpt Added

@@ -0,0 +1,49 @@
+--TEST--
+GH-16998 (UBSAN warning in rfc1867)
+--SKIPIF--
+<?php
+if (!getenv('TEST_PHP_CGI_EXECUTABLE')) {
+    die("skip php-cgi not available");
+}
+?>
+--FILE--
+<?php
+const FILLUNIT = 5 * 1024;
+$cmd = 
+    getenv('TEST_PHP_CGI_EXECUTABLE'),
+    '-C',
+    '-n',
+    __DIR__ . '/GHSA-9pqp-7h25-4f32.inc',
+;
+$boundary = str_repeat('A', FILLUNIT);
+$body = ""
+    . "--$boundary\r\n"
+    . "Content-Disposition: form-data; name=\"koko\"\r\n"
+    . "\r\n"
+    . "BBB\r\n--" . substr($boundary, 0, -1) . "CCC\r\n"
+    . "--$boundary--\r\n"
+    ;
+$env = array_merge($_ENV, 
+    'REDIRECT_STATUS' => '1',
+    'CONTENT_TYPE' => "multipart/form-data; boundary=",
+    'CONTENT_LENGTH' => strlen($body),
+    'REQUEST_METHOD' => 'POST',
+    'SCRIPT_FILENAME' => __DIR__ . '/GHSA-9pqp-7h25-4f32.inc',
+);
+$spec = 
+    0 => 'pipe', 'r',
+    1 => STDOUT,
+    2 => STDOUT,
+;
+$pipes = ;
+$handle = proc_open($cmd, $spec, $pipes, getcwd(), $env);
+fwrite($pipes0, $body);
+proc_close($handle);
+?>
+--EXPECTF--
+X-Powered-By: PHP/%s
+Content-type: text/html; charset=UTF-8
+
+Hello world
+array(0) {
+}

php-8.2.23.tar.xz/win32/build/phpize.js.in -> php-8.2.28.tar.xz/win32/build/phpize.js.in Changed