Merge pull request #19 from php/master

sync

Author: chopins

.appveyor.yml

@@ -2,12 +2,7 @@ version: "{branch}.build.{build}"
 
 image: Visual Studio 2019
 
-branches:
-        except:
-                - PHP-5.6
-                - PHP-7.0
-
-clone_depth: 64
+clone_depth: 1
 
 skip_commits:
   files:
@@ -41,7 +36,7 @@ environment:
                 - THREAD_SAFE: 1
                   OPCACHE: 1
                   PARALLEL: -j2
-                  INTRINSICS: AVX
+                  INTRINSICS: AVX2
 
 services:
         # the setup scripts have to be touched, once some other db version is used
@@ -51,10 +46,10 @@ services:
 
 platform:
         - x64
-          #        - x86
+        #- x86
 
 build_script:
-        - appveyor\build.bat
+        - .github\scripts\windows\build.bat
 
 test_script:
-        - appveyor\test.bat
+        - .github\scripts\windows\test.bat

.cirrus.yml

@@ -1,12 +1,188 @@
 env:
   CIRRUS_CLONE_DEPTH: 1
-  ARCH: amd64
 
-freebsd_instance:
-  image_family: freebsd-13-0
+asan_task:
+  name: ASAN_DEBUG_NTS
+  container:
+    image: gcc:latest
+    additional_containers:
+      - name: mysql
+        image: mysql:latest
+        port: 3306
+        env:
+          MYSQL_ROOT_PASSWORD: "root"
+          MYSQL_DATABASE: "test"
+  install_script:
+    - apt-get update -y
+    - >-
+        apt-get install -y
+        bison
+        re2c
+        locales
+        locales-all
+        `#ldap-utils`
+        openssl
+        `slapd`
+        libgmp-dev
+        libicu-dev
+        `#libtidy-dev`
+        `#libenchant-dev`
+        libaspell-dev
+        libpspell-dev
+        libsasl2-dev
+        libxpm-dev
+        libzip-dev
+        `#libsqlite3-dev`
+        libwebp-dev
+        libonig-dev
+        libkrb5-dev
+        libgssapi-krb5-2
+        libcurl4-openssl-dev
+        libxml2-dev
+        libxslt1-dev
+        libpq-dev
+        libreadline-dev
+        `#libldap2-dev`
+        libsodium-dev
+        libargon2-0-dev
+        libmm-dev
+        `#libsnmp-dev`
+        `#postgresql`
+        `#postgresql-contrib`
+        `#snmpd`
+        `#snmp-mibs-downloader`
+        `#freetds-dev`
+        `#unixodbc-dev`
+        llvm
+        clang
+        libc-client-dev
+        dovecot-core
+        dovecot-pop3d
+        dovecot-imapd
+        `#sendmail`
+        `#firebird-dev`
+        liblmdb-dev
+        libtokyocabinet-dev
+        libdb-dev
+        libqdbm-dev
+        libjpeg-dev
+        libpng-dev
+        libfreetype6-dev
+  build_script:
+    - ./buildconf -f
+    - >-
+        ./configure
+        --enable-debug
+        --enable-zts
+        --enable-option-checking=fatal
+        --prefix=/usr
+        --enable-phpdbg
+        --enable-fpm
+        --enable-opcache
+        --disable-opcache-jit
+        --with-pdo-mysql=mysqlnd
+        --with-mysqli=mysqlnd
+        `#--with-pgsql`
+        `#--with-pdo-pgsql`
+        `#--with-pdo-sqlite`
+        --enable-intl
+        --without-pear
+        --enable-gd
+        --with-jpeg
+        --with-webp
+        --with-freetype
+        --with-xpm
+        --enable-exif
+        --with-zip
+        --with-zlib
+        --with-zlib-dir=/usr
+        --enable-soap
+        --enable-xmlreader
+        --with-xsl
+        `#--with-tidy`
+        --enable-sysvsem
+        --enable-sysvshm
+        --enable-shmop
+        --enable-pcntl
+        --with-readline
+        --enable-mbstring
+        --with-curl
+        --with-gettext
+        --enable-sockets
+        --with-bz2
+        --with-openssl
+        --with-gmp
+        --enable-bcmath
+        --enable-calendar
+        --enable-ftp
+        --with-pspell=/usr
+        `#--with-enchant=/usr`
+        --with-kerberos
+        --enable-sysvmsg
+        --with-ffi
+        --enable-zend-test
+        `#--enable-dl-test=shared`
+        `#--with-ldap`
+        `#--with-ldap-sasl`
+        --with-password-argon2
+        --with-mhash
+        --with-sodium
+        --enable-dba
+        --with-cdb
+        --enable-flatfile
+        --enable-inifile
+        --with-tcadb
+        --with-lmdb
+        --with-qdbm
+        `#--with-snmp`
+        `#--with-unixODBC`
+        `#--with-imap`
+        --with-kerberos
+        --with-imap-ssl
+        `#--with-pdo-odbc=unixODBC,/usr`
+        `#--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient`
+        `#--with-oci8=shared,instantclient,/opt/oracle/instantclient`
+        --with-config-file-path=/etc
+        --with-config-file-scan-dir=/etc/php.d
+        `#--with-pdo-firebird`
+        `#--with-pdo-dblib`
+        --enable-werror
+        CFLAGS='-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC' LDFLAGS='-fsanitize=undefined,address'
+        CC=clang
+        CXX=clang++
+    - make -j2
+    - make install
+    - mkdir -p /etc/php.d
+    - 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
+    - export MYSQL_TEST_HOST=mysql
+    - export MYSQL_TEST_USER=root
+    - export MYSQL_TEST_PASSWD=root
+    - export PDO_MYSQL_TEST_DSN="mysql:host=mysql;dbname=test"
+    - export PDO_MYSQL_TEST_USER=root
+    - export PDO_MYSQL_TEST_PASS=root
+    - >-
+        sapi/cli/php run-tests.php
+        -P -q -x -j2
+        -g FAIL,BORK,LEAK,XLEAK
+        --no-progress
+        --offline
+        --show-diff
+        --show-slow 1000
+        --set-timeout 120
+        -d zend_extension=opcache.so
+        -d opcache.enable_cli=1
+        --asan
 
-task:
+freebsd_task:
   name: FREEBSD_DEBUG_NTS
+  freebsd_instance:
+    image_family: freebsd-13-0
   install_script:
     #- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf
     #- pkg upgrade -y
@@ -25,4 +201,4 @@ task:
   tests_script:
     - export SKIP_IO_CAPTURE_TESTS=1
     - export CI_NO_IPV6=1
-    - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so
+    - 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

.editorconfig

@@ -9,7 +9,7 @@ end_of_line              = lf
 charset                  = utf-8
 tab_width                = 4
 
-[{*.{awk,bat,c,cpp,d,h,l,re,skl,w32,y},Makefile*}]
+[{*.{awk,bat,c,cpp,d,dasc,h,l,re,skl,w32,y},Makefile*}]
 indent_size              = 4
 indent_style             = tab
 

.gdbinit

@@ -318,7 +318,8 @@ define ____print_ht
 		set $n = $n - 1
 	end
 
-	if $ht->u.v.flags & 4
+	set $packed = $ht->u.v.flags & 4
+	if $packed
 		printf "Packed"
 	else
 		printf "Hash"
@@ -329,36 +330,45 @@ define ____print_ht
 	set $i = 0
 	set $ind = $ind + 1
 	while $i < $num
-		set $p = (Bucket*)($ht->arData + $i)
+		if $packed
+			set $val = (zval*)($ht->arPacked + $i)
+			set $key = (zend_string*)0
+			set $h = $i
+		else
+			set $bucket = (Bucket*)($ht->arData + $i)
+			set $val = &$bucket->val
+			set $key = $bucket->key
+			set $h = $bucket->h
+		end
 		set $n = $ind
-		if $p->val.u1.v.type > 0
+		if $val->u1.v.type > 0
 			while $n > 0
 				printf "  "
 				set $n = $n - 1
 			end
 			printf "[%d] ", $i
-			if $p->key
-				____print_str $p->key->val $p->key->len
+			if $key
+				____print_str $key->val $key->len
 				printf " => "
 			else
-				printf "%d => ", $p->h
+				printf "%d => ", $h
 			end
 			if $arg1 == 0
-				printf "%p\n", (zval *)&$p->val
+				printf "%p\n", $val
 			end
 			if $arg1 == 1
-				set $zval = (zval *)&$p->val
+				set $zval = $val
 				____printzv $zval 1
 			end
 			if $arg1 == 2
-				printf "%s\n", (char*)$p->val.value.ptr
+				printf "%s\n", (char*)$val->value.ptr
 			end
 			if $arg1 == 3
-				set $func = (zend_function*)$p->val.value.ptr
+				set $func = (zend_function*)$val->value.ptr
 				printf "\"%s\"\n", $func->common.function_name->val
 			end
 			if $arg1 == 4
-				set $const = (zend_constant *)$p->val.value.ptr
+				set $const = (zend_constant *)$val->value.ptr
 				____printzv $const 1
 			end
 		end

.gitattributes

@@ -18,3 +18,8 @@
 *.phpt diff=php
 *.php diff=php
 *.[ch] diff=cpp
+
+# Collapse generated files within a pull request.
+**/*_arginfo.h linguist-generated
+/Zend/zend_vm_execute.h linguist-generated
+/Zend/zend_vm_opcodes.{h,c} linguist-generated

.github/actions/apt-x32/action.yml

@@ -0,0 +1,52 @@
+name: apt
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -x
+
+        export DEBIAN_FRONTEND=noninteractive
+        dpkg --add-architecture i386
+        apt-get update -y | true
+        # TODO: Reenable postgresql + postgresql-contrib packages once they work again.
+        apt-get install -y \
+          autoconf \
+          bison \
+          g++-multilib \
+          gcc-multilib \
+          language-pack-de \
+          libaspell-dev:i386 \
+          libbz2-dev:i386 \
+          libc6:i386 \
+          libcurl4-openssl-dev:i386 \
+          libffi-dev:i386 \
+          libfreetype6-dev:i386 \
+          libgmp-dev:i386 \
+          libgssapi-krb5-2:i386 \
+          libicu-dev:i386 \
+          libjpeg-dev:i386 \
+          libkrb5-dev:i386 \
+          libonig-dev:i386 \
+          libpng-dev:i386 \
+          libpq-dev:i386 \
+          libpspell-dev:i386 \
+          libreadline-dev:i386 \
+          libsasl2-dev:i386 \
+          libsodium-dev:i386 \
+          libsqlite3-dev:i386 \
+          libssl-dev:i386 \
+          libtidy-dev:i386 \
+          libwebp-dev:i386 \
+          libxml2-dev:i386 \
+          libxml2-dev:i386 \
+          libxpm-dev:i386 \
+          libxslt1-dev:i386 \
+          libzip-dev:i386 \
+          locales \
+          make \
+          pkg-config:i386 \
+          re2c \
+          unzip \
+          wget \
+          zlib1g-dev:i386