Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ jobs:
ldap-utils \
openssl \
slapd \
apache2 \
apache2-dev \
libgmp-dev \
libicu-dev \
libtidy-dev \
Expand Down Expand Up @@ -90,6 +92,7 @@ jobs:
--prefix=/usr \
--enable-phpdbg \
--enable-fpm \
--with-apxs2 \
--with-pdo-mysql=mysqlnd \
--with-mysqli=mysqlnd \
--with-pgsql \
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/apk/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ runs:
openldap-dev \
unixodbc-dev \
postgresql-dev \
apache2 \
apache2-dev \
tzdata \
musl-locales \
musl-locales-lang \
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/apt-x32/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ runs:
apt-get update -y | true
# TODO: Reenable postgresql + postgresql-contrib packages once they work again.
apt-get install -y \
apache2:i386 \
apache2-dev:i386 \
autoconf \
bison \
curl \
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/apt-x64/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ runs:

sudo apt-get update -y | true
sudo apt-get install -y \
apache2 \
apache2-dev \
autoconf \
gcc \
make \
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/brew/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ runs:
libxslt \
openssl@4
brew link --force --overwrite openssl@4
brew install -v \
httpd
1 change: 1 addition & 0 deletions .github/actions/configure-alpine/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ runs:
--prefix=/usr \
--enable-phpdbg \
--enable-fpm \
--with-apxs2 \
--with-pdo-mysql=mysqlnd \
--with-mysqli=mysqlnd \
${{ inputs.skipSlow == 'false' && '--with-pgsql' || '' }} \
Expand Down
1 change: 1 addition & 0 deletions .github/actions/configure-gentoo/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ runs:
--with-libdir=lib64 \
--enable-phpdbg \
--enable-fpm \
--with-apxs2 \
--with-pdo-mysql=mysqlnd \
--with-mysqli=mysqlnd \
${{ inputs.skipSlow == 'false' && '--with-pgsql' || '' }} \
Expand Down
1 change: 1 addition & 0 deletions .github/actions/configure-macos/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ runs:
--enable-option-checking=fatal \
--prefix=/usr/local \
--enable-fpm \
--with-apxs2 \
--with-pdo-mysql=mysqlnd \
--with-mysqli=mysqlnd \
--with-pgsql="$BREW_OPT"/libpq \
Expand Down
1 change: 1 addition & 0 deletions .github/actions/configure-x32/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ runs:
--prefix=/usr \
--enable-phpdbg \
--enable-fpm \
--with-apxs2 \
--enable-intl \
--with-pdo-mysql=mysqlnd \
--with-mysqli=mysqlnd \
Expand Down
1 change: 1 addition & 0 deletions .github/actions/configure-x64/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ runs:
--prefix=/usr \
--enable-phpdbg \
--enable-fpm \
--with-apxs2 \
--with-pdo-mysql=mysqlnd \
--with-mysqli=mysqlnd \
${{ inputs.skipSlow == 'false' && '--with-pgsql' || '' }} \
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/freebsd/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ runs:
libavif \
sqlite3 \
curl \
apache24 \
$OPCACHE_TLS_TESTS_DEPS
./buildconf -f
Expand All @@ -57,6 +58,7 @@ runs:
--enable-debug \
--enable-option-checking=fatal \
--enable-fpm \
--with-apxs2 \
--with-pdo-sqlite \
--without-pear \
--with-bz2 \
Expand Down
3 changes: 2 additions & 1 deletion .github/actions/solaris/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runs:
disable-cache: true
prepare: |
cd $GITHUB_WORKSPACE
pkg install bison developer/icu libzip oniguruma re2c
pkg install bison developer/icu libzip oniguruma re2c apache-24

./buildconf -f
CC=gcc CXX=g++ \
Expand All @@ -31,6 +31,7 @@ runs:
--enable-werror \
--enable-option-checking=fatal \
--enable-fpm \
--with-apxs2 \
--without-pear \
--with-bz2 \
--with-jpeg \
Expand Down
2 changes: 1 addition & 1 deletion sapi/apache2handler/apache_config.c
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ const command_rec php_dir_cmds[] =
AP_INIT_TAKE2("php_admin_value", php_apache_admin_value_handler, NULL, ACCESS_CONF|RSRC_CONF, "PHP Value Modifier (Admin)"),
AP_INIT_TAKE2("php_admin_flag", php_apache_admin_flag_handler, NULL, ACCESS_CONF|RSRC_CONF, "PHP Flag Modifier (Admin)"),
AP_INIT_TAKE1("PHPINIDir", php_apache_phpini_set, NULL, RSRC_CONF, "Directory containing the php.ini file"),
{NULL}
{}
};

static apr_status_t destroy_php_config(void *data)
Expand Down
Loading