rlerdorf

diff --git a/entry/event.php b/entry/event.php
index 80c4899..2fc07ad 100644
--- a/entry/event.php
+++ b/entry/event.php
@@ -3,7 +3,7 @@
 $mailto = '[email protected]';
 #$mailto = '[email protected]';
 
-$re = array(
+$re = [

rlerdorf

diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
index 71f9781442..042d828d58 100644
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@ -897,7 +897,7 @@ retry_reparse_tag_cloud:
 		tmp = do_alloca(len+1, use_heap);
 		memcpy(tmp, path, len+1);
 
-		if (save && S_ISLNK(st.st_mode)) {
+		if (save && S_ISLNK(st.st_mode) && CWDG(resolve_symlinks)) {

rlerdorf

<?php

class Endpoint {
    function __construct(public string $url, ?callable $dfunc=null, array $opts = []) {
        $this->context = stream_context_create($opts);
        $this->dfunc = $dfunc ? $dfunc : fn($x)=>$x;
    }
}

class Api {

rlerdorf

diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
index 220e14b675..a7682270b3 100644
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@ -1153,7 +1153,10 @@ retry_reparse_tag_cloud:
 		memcpy(tmp, path, len+1);
 
 		if (save && S_ISLNK(st.st_mode)) {
-			if (++(*ll) > LINK_MAX || (j = (size_t)php_sys_readlink(tmp, path, MAXPATHLEN)) == (size_t)-1) {
+			if (!CWDG(resolve_symlinks)) {

rlerdorf

diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
index 220e14b675..7e94548a00 100644
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@ -1153,10 +1153,13 @@ retry_reparse_tag_cloud:
 		memcpy(tmp, path, len+1);
 
 		if (save && S_ISLNK(st.st_mode)) {
-			if (++(*ll) > LINK_MAX || (j = (size_t)php_sys_readlink(tmp, path, MAXPATHLEN)) == (size_t)-1) {
-				/* too many links or broken symlinks */

rlerdorf

diff --git a/mod_realdoc.c b/mod_realdoc.c
index b643dd1..4a4a6d5 100644
--- a/mod_realdoc.c
+++ b/mod_realdoc.c
@@ -41,6 +41,7 @@ typedef struct {
 
 typedef struct {
     apr_time_t realpath_every;
+    unsigned int use_readlink;
 } realdoc_config_struct;

rlerdorf

diff --git a/provider.c b/provider.c
index e870bae..13ad9d6 100644
--- a/provider.c
+++ b/provider.c
@@ -329,6 +329,7 @@ static zval *oauth_provider_call_cb(INTERNAL_FUNCTION_PARAMETERS, int type) /* {
 	php_oauth_provider_fcall *cb = NULL;
 	zval args, *pthis;
 	char *errstr = "";
+	int cb_ok = TRUE;
 

rlerdorf

diff --git a/php_memcached.c b/php_memcached.c
index 1e218a0..b572701 100644
--- a/php_memcached.c
+++ b/php_memcached.c
@@ -1509,6 +1509,22 @@ void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
 	}
 }
 
+/* {{{ bool Memcached::checkKey(string key)
+   Checks if a key is valid */

rlerdorf

/* startup_script extension for PHP */

#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

#include "php.h"
#include "ext/standard/info.h"
#include "php_startup_script.h"

rlerdorf

diff -u ./config.m4 /home/rasmus/src/thrift/lib/php/src/ext/thrift_protocol/config.m4
--- ./config.m4	2021-01-18 16:11:33.415106280 -0800
+++ /home/rasmus/src/thrift/lib/php/src/ext/thrift_protocol/config.m4	2021-01-18 20:41:05.013160911 -0800
@@ -2,14 +2,33 @@
 dnl Copying and distribution of this file, with or without modification,
 dnl are permitted in any medium without royalty provided the copyright
 dnl notice and this notice are preserved.
+dnl
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file