Merge branch 'openssl_error_store' into openssl_aead

1 files changed, 10 insertions, 12 deletions

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 3d60e9473d..2ce1070838 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -1315,8 +1315,6 @@ PHP_FUNCTION(imap_append)
 	zend_string* regex;
 	pcre_cache_entry *pce;				/* Compiled regex */
 	zval *subpats = NULL;				/* Parts (not used) */
-	long regex_flags = 0;				/* Flags (not used) */
-	long start_offset = 0;				/* Start offset (not used) */
 	int global = 0;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "rSS|SS", &streamind, &folder, &message, &flags, &internal_date) == FAILURE) {
@@ -1334,7 +1332,7 @@ PHP_FUNCTION(imap_append)
 
 		zend_string_free(regex);
 		php_pcre_match_impl(pce, ZSTR_VAL(internal_date), ZSTR_LEN(internal_date), return_value, subpats, global,
-			0, regex_flags, start_offset);
+			0, Z_L(0), Z_L(0));
 
 		if (!Z_LVAL_P(return_value)) {
 			php_error_docref(NULL, E_WARNING, "internal date not correctly formatted");
@@ -4259,7 +4257,7 @@ PHP_FUNCTION(imap_mime_header_decode)
 	zval myobject;
 	zend_string *str;
 	char *string, *charset, encoding, *text, *decode;
-	long charset_token, encoding_token, end_token, end, offset=0, i;
+	zend_long charset_token, encoding_token, end_token, end, offset=0, i;
 	unsigned long newlength;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &str) == FAILURE) {
@@ -4274,8 +4272,8 @@ PHP_FUNCTION(imap_mime_header_decode)
 	charset = (char *) safe_emalloc((end + 1), 2, 0);
 	text = &charset[end + 1];
 	while (offset < end) {	/* Reached end of the string? */
-		if ((charset_token = (long)php_memnstr(&string[offset], "=?", 2, string + end))) {	/* Is there anything encoded in the string? */
-			charset_token -= (long)string;
+		if ((charset_token = (zend_long)php_memnstr(&string[offset], "=?", 2, string + end))) {	/* Is there anything encoded in the string? */
+			charset_token -= (zend_long)string;
 			if (offset != charset_token) {	/* Is there anything before the encoded data? */
 				/* Retrieve unencoded data that is found before encoded data */
 				memcpy(text, &string[offset], charset_token-offset);
@@ -4285,10 +4283,10 @@ PHP_FUNCTION(imap_mime_header_decode)
 				add_property_string(&myobject, "text", text);
 				zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &myobject);
 			}
-			if ((encoding_token = (long)php_memnstr(&string[charset_token+2], "?", 1, string+end))) {		/* Find token for encoding */
-				encoding_token -= (long)string;
-				if ((end_token = (long)php_memnstr(&string[encoding_token+3], "?=", 2, string+end))) {	/* Find token for end of encoded data */
-					end_token -= (long)string;
+			if ((encoding_token = (zend_long)php_memnstr(&string[charset_token+2], "?", 1, string+end))) {		/* Find token for encoding */
+				encoding_token -= (zend_long)string;
+				if ((end_token = (zend_long)php_memnstr(&string[encoding_token+3], "?=", 2, string+end))) {	/* Find token for end of encoded data */
+					end_token -= (zend_long)string;
 					memcpy(charset, &string[charset_token + 2], encoding_token - (charset_token + 2));	/* Extract charset encoding */
 					charset[encoding_token-(charset_token + 2)] = 0x00;
 					encoding=string[encoding_token + 1];	/* Extract encoding from string */
@@ -4797,7 +4795,7 @@ PHP_FUNCTION(imap_timeout)
 				break;
 		}
 
-		timeout = (long) mail_parameters(NIL, timeout_type, NIL);
+		timeout = (zend_long) mail_parameters(NIL, timeout_type, NIL);
 		RETURN_LONG(timeout);
 	} else if (timeout >= 0) {
 		switch (ttype) {
@@ -4818,7 +4816,7 @@ PHP_FUNCTION(imap_timeout)
 				break;
 		}
 
-		timeout = (long) mail_parameters(NIL, timeout_type, (void *) timeout);
+		timeout = (zend_long) mail_parameters(NIL, timeout_type, (void *) timeout);
 		RETURN_TRUE;
 	} else {
 		RETURN_FALSE;