Update versions for PHP 7.4.18RC1

NEWS

@@ -1,12 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-06 May 2021, PHP 7.4.19
-
-- PDO_pgsql:
-  . Reverted bug fix for #80892 (PDO::PARAM_INT is treated the same as
-    PDO::PARAM_STR). (Matteo)
-
-29 Apr 2021, PHP 7.4.18
+15 Apr 2021, PHP 7.4.18RC1
 
 - Core:
   . Fixed bug #80781 (Error handler that throws ErrorException infinite loop).
@@ -23,13 +17,6 @@ PHP                                                                        NEWS
   . Fixed bug #80024 (Duplication of info about inherited socket after pool
     removing). (Jakub Zelenka)
 
-- FTP:
-  . Fixed bug #80880 (SSL_read on shutdown, ftp/proc_open). (cmb, Jakub
-    Zelenka)
-
-- Imap:
-  . Fixed bug #80710 (imap_mail_compose() header injection). (cmb, Stas)
-
 - Intl:
   . Fixed bug #80763 (msgfmt_format() does not accept DateTime references).
     (cmb)
@@ -44,12 +31,8 @@ PHP                                                                        NEWS
   . Fixed bug #80837 (Calling stmt_store_result after fetch doesn't throw an
     error). (Kamil Tekiela)
 
-- Opcache:
+- opcache:
   . Fixed bug #80805 (create simple class and get error in opcache.so). (Nikita)
-  . Fixed bug #80950 (Variables become null in if statements). (Nikita)
-
-- Pcntl:
-  . Fixed bug #79812 (Potential integer overflow in pcntl_exec()). (cmb)
 
 - PCRE:
   . Fixed bug #80866 (preg_split ignores limit flag when pattern with \K has
@@ -59,10 +42,6 @@ PHP                                                                        NEWS
   . Fixed bug #80783 (PDO ODBC truncates BLOB records at every 256th byte).
     (cmb)
 
-- PDO_pgsql:
-  . Fixed bug #80892 (PDO::PARAM_INT is treated the same as PDO::PARAM_STR).
-    (Matteo)
-
 - phpdbg:
   . Fixed bug #80757 (Exit code is 0 when could not open file). (Felipe)
 
@@ -71,18 +50,12 @@ PHP                                                                        NEWS
   . Fixed bug #80889 (Cannot set save handler when save_handler is invalid).
     (cmb)
 
-- SOAP:
-  . Fixed bug #69668 (SOAP special XML characters in namespace URIs not
-    encoded). (cmb)
-
 - Standard:
+  . Fixed bug #80771 (phpinfo(INFO_CREDITS) displays nothing in CLI). (cmb)
   . Fixed bug #78719 (http wrapper silently ignores long Location headers).
     (cmb)
-  . Fixed bug #80771 (phpinfo(INFO_CREDITS) displays nothing in CLI). (cmb)
   . Fixed bug #80838 (HTTP wrapper waits for HTTP 1 response after HTTP 101).
     (manuelm)
-  . Fixed bug #80915 (Taking a reference to $_SERVER hides its values from
-    phpinfo()). (Rowan Tommins)
 
 04 Mar 2021, php 7.4.16
 

configure.ac

@@ -17,7 +17,7 @@ dnl Basic autoconf initialization, generation of config.nice.
 dnl ----------------------------------------------------------------------------
 
 AC_PREREQ([2.68])
-AC_INIT([PHP],[7.4.19],[https://bugs.php.net],[php],[https://www.php.net])
+AC_INIT([PHP],[7.4.18RC1],[https://bugs.php.net],[php],[https://www.php.net])
 AC_CONFIG_SRCDIR([main/php_version.h])
 AC_CONFIG_AUX_DIR([build])
 AC_PRESERVE_HELP_ORDER

ext/imap/php_imap.c

@@ -3551,23 +3551,6 @@ PHP_FUNCTION(imap_fetch_overview)
 }
 /* }}} */
 
-static zend_bool header_injection(zend_string *str, zend_bool adrlist)
-{
-	char *p = ZSTR_VAL(str);
-
-	while ((p = strpbrk(p, "\r\n")) != NULL) {
-		if (!(p[0] == '\r' && p[1] == '\n')
-		 /* adrlists do not support folding, but swallow trailing line breaks */
-		 && !((adrlist && p[1] == '\0')
-		  /* other headers support folding */
-		  || !adrlist && (p[1] == ' ' || p[1] == '\t'))) {
-			return 1;
-		}
-		p++;
-	}
-	return 0;
-}
-
 /* {{{ proto string imap_mail_compose(array envelope, array body)
    Create a MIME message based on given envelope and body sections */
 PHP_FUNCTION(imap_mail_compose)
@@ -3588,13 +3571,6 @@ PHP_FUNCTION(imap_mail_compose)
 		return;
 	}
 
-#define CHECK_HEADER_INJECTION(zstr, adrlist, header) \
-	if (header_injection(zstr, adrlist)) { \
-		php_error_docref(NULL, E_WARNING, "header injection attempt in " header); \
-		RETVAL_FALSE; \
-		goto done; \
-	}
-
 #define PHP_RFC822_PARSE_ADRLIST(target, value) \
 	str_copy = estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)); \
 	rfc822_parse_adrlist(target, str_copy, "NO HOST"); \
@@ -3603,57 +3579,46 @@ PHP_FUNCTION(imap_mail_compose)
 	env = mail_newenvelope();
 	if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(envelope), "remail", sizeof("remail") - 1)) != NULL) {
 		convert_to_string_ex(pvalue);
-		CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "remail");
 		env->remail = cpystr(Z_STRVAL_P(pvalue));
 	}
 	if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(envelope), "return_path", sizeof("return_path") - 1)) != NULL) {
 		convert_to_string_ex(pvalue);
-		CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 1, "return_path");
 		PHP_RFC822_PARSE_ADRLIST(&env->return_path, pvalue);
 	}
 	if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(envelope), "date", sizeof("date") - 1)) != NULL) {
 		convert_to_string_ex(pvalue);
-		CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "date");
 		env->date = (unsigned char*)cpystr(Z_STRVAL_P(pvalue));
 	}
 	if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(envelope), "from", sizeof("from") - 1)) != NULL) {
 		convert_to_string_ex(pvalue);
-		CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 1, "from");
 		PHP_RFC822_PARSE_ADRLIST(&env->from, pvalue);
 	}
 	if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(envelope), "reply_to", sizeof("reply_to") - 1)) != NULL) {
 		convert_to_string_ex(pvalue);
-		CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 1, "reply_to");
 		PHP_RFC822_PARSE_ADRLIST(&env->reply_to, pvalue);
 	}
 	if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(envelope), "in_reply_to", sizeof("in_reply_to") - 1)) != NULL) {
 		convert_to_string_ex(pvalue);
-		CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "in_reply_to");
 		env->in_reply_to = cpystr(Z_STRVAL_P(pvalue));
 	}
 	if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(envelope), "subject", sizeof("subject") - 1)) != NULL) {
 		convert_to_string_ex(pvalue);
-		CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "subject");
 		env->subject = cpystr(Z_STRVAL_P(pvalue));
 	}
 	if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(envelope), "to", sizeof("to") - 1)) != NULL) {
 		convert_to_string_ex(pvalue);
-		CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 1, "to");
 		PHP_RFC822_PARSE_ADRLIST(&env->to, pvalue);
 	}
 	if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(envelope), "cc", sizeof("cc") - 1)) != NULL) {
 		convert_to_string_ex(pvalue);
-		CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 1, "cc");
 		PHP_RFC822_PARSE_ADRLIST(&env->cc, pvalue);
 	}
 	if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(envelope), "bcc", sizeof("bcc") - 1)) != NULL) {
 		convert_to_string_ex(pvalue);
-		CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 1, "bcc");
 		PHP_RFC822_PARSE_ADRLIST(&env->bcc, pvalue);
 	}
 	if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(envelope), "message_id", sizeof("message_id") - 1)) != NULL) {
 		convert_to_string_ex(pvalue);
-		CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "message_id");
 		env->message_id=cpystr(Z_STRVAL_P(pvalue));
 	}
 
@@ -3664,7 +3629,6 @@ PHP_FUNCTION(imap_mail_compose)
 			ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(pvalue), env_data) {
 				custom_headers_param = mail_newbody_parameter();
 				convert_to_string_ex(env_data);
-				CHECK_HEADER_INJECTION(Z_STR_P(env_data), 0, "custom_headers");
 				custom_headers_param->value = (char *) fs_get(Z_STRLEN_P(env_data) + 1);
 				custom_headers_param->attribute = NULL;
 				memcpy(custom_headers_param->value, Z_STRVAL_P(env_data), Z_STRLEN_P(env_data) + 1);
@@ -3703,7 +3667,6 @@ PHP_FUNCTION(imap_mail_compose)
 			}
 			if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "charset", sizeof("charset") - 1)) != NULL) {
 				convert_to_string_ex(pvalue);
-				CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "body charset");
 				tmp_param = mail_newbody_parameter();
 				tmp_param->value = cpystr(Z_STRVAL_P(pvalue));
 				tmp_param->attribute = cpystr("CHARSET");
@@ -3716,11 +3679,9 @@ PHP_FUNCTION(imap_mail_compose)
 					SEPARATE_ARRAY(pvalue);
 					ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(pvalue), key, disp_data) {
 						if (key == NULL) continue;
-						CHECK_HEADER_INJECTION(key, 0, "body disposition key");
 						disp_param = mail_newbody_parameter();
 						disp_param->attribute = cpystr(ZSTR_VAL(key));
 						convert_to_string_ex(disp_data);
-						CHECK_HEADER_INJECTION(Z_STR_P(disp_data), 0, "body disposition value");
 						disp_param->value = (char *) fs_get(Z_STRLEN_P(disp_data) + 1);
 						memcpy(disp_param->value, Z_STRVAL_P(disp_data), Z_STRLEN_P(disp_data) + 1);
 						disp_param->next = tmp_param;
@@ -3731,22 +3692,18 @@ PHP_FUNCTION(imap_mail_compose)
 			}
 			if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "subtype", sizeof("subtype") - 1)) != NULL) {
 				convert_to_string_ex(pvalue);
-				CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "body subtype");
 				bod->subtype = cpystr(Z_STRVAL_P(pvalue));
 			}
 			if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "id", sizeof("id") - 1)) != NULL) {
 				convert_to_string_ex(pvalue);
-				CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "body id");
 				bod->id = cpystr(Z_STRVAL_P(pvalue));
 			}
 			if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "description", sizeof("description") - 1)) != NULL) {
 				convert_to_string_ex(pvalue);
-				CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "body description");
 				bod->description = cpystr(Z_STRVAL_P(pvalue));
 			}
 			if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "disposition.type", sizeof("disposition.type") - 1)) != NULL) {
 				convert_to_string_ex(pvalue);
-				CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "body disposition.type");
 				bod->disposition.type = (char *) fs_get(Z_STRLEN_P(pvalue) + 1);
 				memcpy(bod->disposition.type, Z_STRVAL_P(pvalue), Z_STRLEN_P(pvalue)+1);
 			}
@@ -3756,11 +3713,9 @@ PHP_FUNCTION(imap_mail_compose)
 					SEPARATE_ARRAY(pvalue);
 					ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(pvalue), key, disp_data) {
 						if (key == NULL) continue;
-						CHECK_HEADER_INJECTION(key, 0, "body type.parameters key");
 						disp_param = mail_newbody_parameter();
 						disp_param->attribute = cpystr(ZSTR_VAL(key));
 						convert_to_string_ex(disp_data);
-						CHECK_HEADER_INJECTION(Z_STR_P(disp_data), 0, "body type.parameters value");
 						disp_param->value = (char *) fs_get(Z_STRLEN_P(disp_data) + 1);
 						memcpy(disp_param->value, Z_STRVAL_P(disp_data), Z_STRLEN_P(disp_data) + 1);
 						disp_param->next = tmp_param;
@@ -3791,7 +3746,6 @@ PHP_FUNCTION(imap_mail_compose)
 			}
 			if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "md5", sizeof("md5") - 1)) != NULL) {
 				convert_to_string_ex(pvalue);
-				CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "body md5");
 				bod->md5 = cpystr(Z_STRVAL_P(pvalue));
 			}
 		} else if (Z_TYPE_P(data) == IS_ARRAY && topbod->type == TYPEMULTIPART) {
@@ -3824,7 +3778,6 @@ PHP_FUNCTION(imap_mail_compose)
 			}
 			if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "charset", sizeof("charset") - 1)) != NULL) {
 				convert_to_string_ex(pvalue);
-				CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "body charset");
 				tmp_param = mail_newbody_parameter();
 				tmp_param->value = (char *) fs_get(Z_STRLEN_P(pvalue) + 1);
 				memcpy(tmp_param->value, Z_STRVAL_P(pvalue), Z_STRLEN_P(pvalue) + 1);
@@ -3838,11 +3791,9 @@ PHP_FUNCTION(imap_mail_compose)
 					SEPARATE_ARRAY(pvalue);
 					ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(pvalue), key, disp_data) {
 						if (key == NULL) continue;
-						CHECK_HEADER_INJECTION(key, 0, "body type.parameters key");
 						disp_param = mail_newbody_parameter();
 						disp_param->attribute = cpystr(ZSTR_VAL(key));
 						convert_to_string_ex(disp_data);
-						CHECK_HEADER_INJECTION(Z_STR_P(disp_data), 0, "body type.parameters value");
 						disp_param->value = (char *)fs_get(Z_STRLEN_P(disp_data) + 1);
 						memcpy(disp_param->value, Z_STRVAL_P(disp_data), Z_STRLEN_P(disp_data) + 1);
 						disp_param->next = tmp_param;
@@ -3853,22 +3804,18 @@ PHP_FUNCTION(imap_mail_compose)
 			}
 			if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "subtype", sizeof("subtype") - 1)) != NULL) {
 				convert_to_string_ex(pvalue);
-				CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "body subtype");
 				bod->subtype = cpystr(Z_STRVAL_P(pvalue));
 			}
 			if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "id", sizeof("id") - 1)) != NULL) {
 				convert_to_string_ex(pvalue);
-				CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "body id");
 				bod->id = cpystr(Z_STRVAL_P(pvalue));
 			}
 			if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "description", sizeof("description") - 1)) != NULL) {
 				convert_to_string_ex(pvalue);
-				CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "body description");
 				bod->description = cpystr(Z_STRVAL_P(pvalue));
 			}
 			if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "disposition.type", sizeof("disposition.type") - 1)) != NULL) {
 				convert_to_string_ex(pvalue);
-				CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "body disposition.type");
 				bod->disposition.type = (char *) fs_get(Z_STRLEN_P(pvalue) + 1);
 				memcpy(bod->disposition.type, Z_STRVAL_P(pvalue), Z_STRLEN_P(pvalue)+1);
 			}
@@ -3878,11 +3825,9 @@ PHP_FUNCTION(imap_mail_compose)
 					SEPARATE_ARRAY(pvalue);
 					ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(pvalue), key, disp_data) {
 						if (key == NULL) continue;
-						CHECK_HEADER_INJECTION(key, 0, "body disposition key");
 						disp_param = mail_newbody_parameter();
 						disp_param->attribute = cpystr(ZSTR_VAL(key));
 						convert_to_string_ex(disp_data);
-						CHECK_HEADER_INJECTION(Z_STR_P(disp_data), 0, "body disposition value");
 						disp_param->value = (char *) fs_get(Z_STRLEN_P(disp_data) + 1);
 						memcpy(disp_param->value, Z_STRVAL_P(disp_data), Z_STRLEN_P(disp_data) + 1);
 						disp_param->next = tmp_param;
@@ -3913,7 +3858,6 @@ PHP_FUNCTION(imap_mail_compose)
 			}
 			if ((pvalue = zend_hash_str_find(Z_ARRVAL_P(data), "md5", sizeof("md5") - 1)) != NULL) {
 				convert_to_string_ex(pvalue);
-				CHECK_HEADER_INJECTION(Z_STR_P(pvalue), 0, "body md5");
 				bod->md5 = cpystr(Z_STRVAL_P(pvalue));
 			}
 		}

ext/imap/tests/bug80710_1.phpt

@@ -1,37 +0,0 @@
---TEST--
-Bug #80710 (imap_mail_compose() header injection) - MIME Splitting Attack
---SKIPIF--
-<?php
-if (!extension_loaded("imap")) die("skip imap extension not available");
-?>
---FILE--
-<?php
-$envelope["from"]= "joe@example.com\n From : X-INJECTED";
-$envelope["to"]  = "foo@example.com\nFrom: X-INJECTED";
-$envelope["cc"]  = "bar@example.com\nFrom: X-INJECTED";
-$envelope["subject"]  = "bar@example.com\n\n From : X-INJECTED";
-$envelope["x-remail"]  = "bar@example.com\nFrom: X-INJECTED";
-$envelope["something"]  = "bar@example.com\nFrom: X-INJECTED";
-
-$part1["type"] = TYPEMULTIPART;
-$part1["subtype"] = "mixed";
-
-$part2["type"] = TYPEAPPLICATION;
-$part2["encoding"] = ENCBINARY;
-$part2["subtype"] = "octet-stream\nContent-Type: X-INJECTED";
-$part2["description"] = "some file\nContent-Type: X-INJECTED";
-$part2["contents.data"] = "ABC\nContent-Type: X-INJECTED";
-
-$part3["type"] = TYPETEXT;
-$part3["subtype"] = "plain";
-$part3["description"] = "description3";
-$part3["contents.data"] = "contents.data3\n\n\n\t";
-
-$body[1] = $part1;
-$body[2] = $part2;
-$body[3] = $part3;
-
-echo imap_mail_compose($envelope, $body);
-?>
---EXPECTF--
-Warning: imap_mail_compose(): header injection attempt in from in %s on line %d

ext/imap/tests/bug80710_2.phpt

@@ -1,37 +0,0 @@
---TEST--
-Bug #80710 (imap_mail_compose() header injection) - Remail
---SKIPIF--
-<?php
-if (!extension_loaded("imap")) die("skip imap extension not available");
-?>
---FILE--
-<?php
-$envelope["from"]= "joe@example.com\n From : X-INJECTED";
-$envelope["to"]  = "foo@example.com\nFrom: X-INJECTED";
-$envelope["cc"]  = "bar@example.com\nFrom: X-INJECTED";
-$envelope["subject"]  = "bar@example.com\n\n From : X-INJECTED";
-$envelope["remail"]  = "X-INJECTED-REMAIL: X-INJECTED\nFrom: X-INJECTED-REMAIL-FROM"; //<--- Injected as first hdr
-$envelope["something"]  = "bar@example.com\nFrom: X-INJECTED";
-
-$part1["type"] = TYPEMULTIPART;
-$part1["subtype"] = "mixed";
-
-$part2["type"] = TYPEAPPLICATION;
-$part2["encoding"] = ENCBINARY;
-$part2["subtype"] = "octet-stream\nContent-Type: X-INJECTED";
-$part2["description"] = "some file\nContent-Type: X-INJECTED";
-$part2["contents.data"] = "ABC\nContent-Type: X-INJECTED";
-
-$part3["type"] = TYPETEXT;
-$part3["subtype"] = "plain";
-$part3["description"] = "description3";
-$part3["contents.data"] = "contents.data3\n\n\n\t";
-
-$body[1] = $part1;
-$body[2] = $part2;
-$body[3] = $part3;
-
-echo imap_mail_compose($envelope, $body);
-?>
---EXPECTF--
-Warning: imap_mail_compose(): header injection attempt in remail in %s on line %d

ext/pdo_pgsql/pgsql_statement.c

@@ -54,6 +54,19 @@
 #define VARCHARLABEL "varchar"
 #define VARCHAROID   1043
 
+#define PG_INT32_MIN	(-0x7FFFFFFF-1)
+#define PG_INT32_MAX	(0x7FFFFFFF)
+
+#if defined(_MSC_VER)
+# define strtoll(s, f, b) _atoi64(s)
+#elif !defined(HAVE_STRTOLL)
+# if defined(HAVE_ATOLL)
+#  define strtoll(s, f, b) atoll(s)
+# else
+#  define strtoll(s, f, b) strtol(s, f, b)
+# endif
+#endif
+
 
 
 static int pgsql_stmt_dtor(pdo_stmt_t *stmt)
@@ -390,7 +403,16 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *
 						S->param_formats[param->paramno] = 0;
 					}
 
-					if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_LOB) {
+					if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_INT) {
+						/* we need to check if the number requires bigints */
+						long long val = strtoll(Z_STRVAL_P(parameter), NULL, 10);
+
+						if (val > PG_INT32_MAX || val < PG_INT32_MIN) {
+							S->param_types[param->paramno] = INT8OID;
+						} else {
+							S->param_types[param->paramno] = INT4OID;
+						}
+					} else if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_LOB) {
 						S->param_types[param->paramno] = 0;
 						S->param_formats[param->paramno] = 1;
 					} else {

ext/pdo_pgsql/tests/bug_80892.phpt

@@ -0,0 +1,77 @@
+--TEST--
+Bug #80892 PDO::PARAM_INT is treated the same as PDO::PARAM_STR
+--SKIPIF--
+<?php
+if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
+require __DIR__ . '/config.inc';
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
+
+/** @var PDO $db */
+$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
+$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+$db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
+
+$db->exec("CREATE OR REPLACE FUNCTION bug80892 (x bigint) RETURNS varchar AS $$ SELECT 'bigint' $$ LANGUAGE sql");
+$db->exec("CREATE OR REPLACE FUNCTION bug80892 (x int) RETURNS varchar AS $$ SELECT 'int' $$ LANGUAGE sql");
+$db->exec("CREATE OR REPLACE FUNCTION bug80892 (x text) RETURNS varchar AS $$ SELECT 'text' $$ LANGUAGE sql");
+
+// Sanity check
+var_dump($db->query("SELECT bug80892(2147483648)")->fetchColumn());
+var_dump($db->query("SELECT bug80892(1)")->fetchColumn());
+var_dump($db->query("SELECT bug80892('1')")->fetchColumn());
+
+// No binding
+$stmt = $db->prepare("SELECT bug80892(?)");
+$stmt->execute([1]);
+var_dump($stmt->fetchColumn());
+
+// Bind int value as string
+$stmt = $db->prepare("SELECT bug80892(?)");
+$stmt->bindValue(1, 1, PDO::PARAM_STR);
+$stmt->execute();
+var_dump($stmt->fetchColumn());
+
+// Bind int value as int
+$stmt = $db->prepare("SELECT bug80892(?)");
+$stmt->bindValue(1, 1, PDO::PARAM_INT);
+$stmt->execute();
+var_dump($stmt->fetchColumn());
+
+// Bind string value as int
+$stmt = $db->prepare("SELECT bug80892(?)");
+$stmt->bindValue(1, '1', PDO::PARAM_INT);
+$stmt->execute();
+var_dump($stmt->fetchColumn());
+
+// Bind bigint string value as int
+$stmt = $db->prepare("SELECT bug80892(?)");
+$stmt->bindValue(1, '2147483648', PDO::PARAM_INT);
+$stmt->execute();
+var_dump($stmt->fetchColumn());
+
+// Bind negative bigint (string on 32bit) as int
+$stmt = $db->prepare("SELECT bug80892(?)");
+$stmt->bindValue(1, PHP_INT_SIZE == 4 ? '-33333333333' : -33333333333, PDO::PARAM_INT);
+$stmt->execute();
+var_dump($stmt->fetchColumn());
+
+$db->exec("DROP FUNCTION bug80892 (bigint)");
+$db->exec("DROP FUNCTION bug80892 (int)");
+$db->exec("DROP FUNCTION bug80892 (text)");
+
+?>
+--EXPECT--
+string(6) "bigint"
+string(3) "int"
+string(4) "text"
+string(4) "text"
+string(4) "text"
+string(3) "int"
+string(3) "int"
+string(6) "bigint"
+string(6) "bigint"

main/php_version.h

@@ -2,7 +2,7 @@
 /* edit configure.ac to change version number */
 #define PHP_MAJOR_VERSION 7
 #define PHP_MINOR_VERSION 4
-#define PHP_RELEASE_VERSION 19
-#define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "7.4.19"
-#define PHP_VERSION_ID 70419
+#define PHP_RELEASE_VERSION 18
+#define PHP_EXTRA_VERSION "RC1"
+#define PHP_VERSION "7.4.18RC1"
+#define PHP_VERSION_ID 70418