Add new literal ini API and remove the INI_*() macros

Girgias · Girgias · commit e37da49aec4c · 2026-02-23T13:53:24.000Z
diff --git a/Zend/zend_fibers.c b/Zend/zend_fibers.c
@@ -572,9 +572,9 @@ static ZEND_STACK_ALIGNED void zend_fiber_execute(zend_fiber_transfer *transfer)
 	zend_fiber *fiber = EG(active_fiber);
 
 	/* Determine the current error_reporting ini setting. */
-	zend_long error_reporting = INI_INT("error_reporting");
+	zend_long error_reporting = zend_ini_long_literal("error_reporting");
 	/* If error_reporting is 0 and not explicitly set to 0, zend_ini_str returns a null pointer. */
-	if (!error_reporting && !zend_ini_str(ZEND_STRL("error_reporting"), false)) {
+	if (!error_reporting && !zend_ini_str_literal("error_reporting")) {
 		error_reporting = E_ALL;
 	}
 
diff --git a/Zend/zend_ini.h b/Zend/zend_ini.h
@@ -95,6 +95,17 @@ ZEND_API zend_string *zend_ini_str_ex(const char *name, size_t name_length, bool
 ZEND_API zend_string *zend_ini_get_value(zend_string *name);
 ZEND_API bool zend_ini_parse_bool(const zend_string *str);
 
+#define zend_ini_bool_literal(name) zend_ini_parse_bool(zend_ini_str((name), sizeof("" name) - 1, false))
+#define zend_ini_long_literal(name) zend_ini_long((name), sizeof("" name) - 1, false)
+#define zend_ini_double_literal(name) zend_ini_double((name), sizeof("" name) - 1, false)
+#define zend_ini_str_literal(name) zend_ini_str((name), sizeof("" name) - 1, false)
+#define zend_ini_string_literal(name) zend_ini_string((name), sizeof("" name) - 1, false)
+
+#define INI_ORIG_INT(name)	zend_ini_long((name), strlen(name), 1)
+#define INI_ORIG_FLT(name)	zend_ini_double((name), strlen(name), 1)
+#define INI_ORIG_STR(name)	zend_ini_string((name), strlen(name), 1)
+#define INI_ORIG_BOOL(name) zend_ini_parse_bool(zend_ini_str((name), strlen(name), true))
+
 /**
  * Parses an ini quantity
  *
@@ -191,16 +202,6 @@ END_EXTERN_C()
 	ZEND_INI_ENTRY3_EX(name, default_value, modifiable, on_modify, (void *) XtOffsetOf(struct_type, property_name), (void *) &struct_ptr, NULL, zend_ini_boolean_displayer_cb)
 #endif
 
-#define INI_INT(name) zend_ini_long((name), strlen(name), 0)
-#define INI_FLT(name) zend_ini_double((name), strlen(name), 0)
-#define INI_STR(name) zend_ini_string_ex((name), strlen(name), 0, NULL)
-#define INI_BOOL(name) zend_ini_parse_bool(zend_ini_str((name), strlen(name), false))
-
-#define INI_ORIG_INT(name)	zend_ini_long((name), strlen(name), 1)
-#define INI_ORIG_FLT(name)	zend_ini_double((name), strlen(name), 1)
-#define INI_ORIG_STR(name)	zend_ini_string((name), strlen(name), 1)
-#define INI_ORIG_BOOL(name) zend_ini_parse_bool(zend_ini_str((name), strlen(name), true))
-
 #define REGISTER_INI_ENTRIES() zend_register_ini_entries_ex(ini_entries, module_number, type)
 #define UNREGISTER_INI_ENTRIES() zend_unregister_ini_entries_ex(module_number, type)
 #define DISPLAY_INI_ENTRIES() display_ini_entries(zend_module)
diff --git a/Zend/zend_multibyte.c b/Zend/zend_multibyte.c
@@ -114,8 +114,8 @@ ZEND_API zend_result zend_multibyte_set_functions(const zend_multibyte_functions
 	 * populated, we need to reinitialize script_encoding here.
 	 */
 	{
-		const char *value = zend_ini_string("zend.script_encoding", sizeof("zend.script_encoding") - 1, 0);
-		zend_multibyte_set_script_encoding_by_string(value, strlen(value));
+		const zend_string *value = zend_ini_str_literal("zend.script_encoding");
+		zend_multibyte_set_script_encoding_by_string(ZSTR_VAL(value), ZSTR_LEN(value));
 	}
 	return SUCCESS;
 }
diff --git a/ext/com_dotnet/com_dotnet.c b/ext/com_dotnet/com_dotnet.c
@@ -139,7 +139,7 @@ static HRESULT dotnet_bind_runtime(LPVOID FAR *ppv)
 		return S_FALSE;
 	}
 
-	const zend_string *version = zend_ini_str(ZEND_STRL("com.dotnet_version"), false);
+	const zend_string *version = zend_ini_str_literal("com.dotnet_version");
 	if (version == NULL || ZSTR_LEN(version) == 0) {
 		oleversion = NULL;
 	} else {
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
@@ -1112,9 +1112,9 @@ static void _php_curl_set_default_options(php_curl *ch)
 	curl_easy_setopt(ch->cp, CURLOPT_DNS_CACHE_TIMEOUT, 120L);
 	curl_easy_setopt(ch->cp, CURLOPT_MAXREDIRS, 20L); /* prevent infinite redirects */
 
-	const char* cainfo = INI_STR("openssl.cafile");
+	const char* cainfo = zend_ini_string_literal("openssl.cafile");
 	if (!(cainfo && cainfo[0] != '\0')) {
-		cainfo = INI_STR("curl.cainfo");
+		cainfo = zend_ini_string_literal("curl.cainfo");
 	}
 	if (cainfo && cainfo[0] != '\0') {
 		curl_easy_setopt(ch->cp, CURLOPT_CAINFO, cainfo);
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -5480,18 +5480,18 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, bool calc_s
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (latitude_is_null) {
-		latitude = INI_FLT("date.default_latitude");
+		latitude = zend_ini_double_literal("date.default_latitude");
 	}
 
 	if (longitude_is_null) {
-		longitude = INI_FLT("date.default_longitude");
+		longitude = zend_ini_double_literal("date.default_longitude");
 	}
 
 	if (zenith_is_null) {
 		if (calc_sunset) {
-			zenith = INI_FLT("date.sunset_zenith");
+			zenith = zend_ini_double_literal("date.sunset_zenith");
 		} else {
-			zenith = INI_FLT("date.sunrise_zenith");
+			zenith = zend_ini_double_literal("date.sunrise_zenith");
 		}
 	}
 
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
@@ -1599,7 +1599,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 
 #ifdef HAVE_GD_JPG
 			case PHP_GDIMG_TYPE_JPG:
-				ignore_warning = INI_INT("gd.jpeg_ignore_warning");
+				ignore_warning = zend_ini_bool_literal("gd.jpeg_ignore_warning");
 				im = gdImageCreateFromJpegEx(fp, ignore_warning);
 			break;
 #endif
diff --git a/ext/openssl/openssl_backend_common.c b/ext/openssl/openssl_backend_common.c
@@ -504,10 +504,8 @@ void php_openssl_set_cert_locations(zval *return_value)
 	add_assoc_string(return_value, "default_cert_dir_env", (char *) X509_get_default_cert_dir_env());
 	add_assoc_string(return_value, "default_private_dir", (char *) X509_get_default_private_dir());
 	add_assoc_string(return_value, "default_default_cert_area", (char *) X509_get_default_cert_area());
-	add_assoc_str(return_value, "ini_cafile",
-		zend_string_copy(zend_ini_str(ZEND_STRL("openssl.cafile"), false)));
-	add_assoc_str(return_value, "ini_capath",
-		zend_string_copy(zend_ini_str(ZEND_STRL("openssl.capath"), false)));
+	add_assoc_str(return_value, "ini_cafile", zend_string_copy(zend_ini_str_literal("openssl.cafile")));
+	add_assoc_str(return_value, "ini_capath", zend_string_copy(zend_ini_str_literal("openssl.capath")));
 }
 
 X509 *php_openssl_x509_from_str(
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
@@ -888,7 +888,7 @@ static zend_result php_openssl_enable_peer_verification(SSL_CTX *ctx, php_stream
 	GET_VER_OPT_STRING("capath", capath);
 
 	if (cafile == NULL) {
-		const zend_string *cafile_str = zend_ini_str(ZEND_STRL("openssl.cafile"), false);
+		const zend_string *cafile_str = zend_ini_str_literal("openssl.cafile");
 		cafile = ZSTR_LEN(cafile_str) ? ZSTR_VAL(cafile_str) : NULL;
 	} else if (!sslsock->is_client) {
 		/* Servers need to load and assign CA names from the cafile */
@@ -902,7 +902,7 @@ static zend_result php_openssl_enable_peer_verification(SSL_CTX *ctx, php_stream
 	}
 
 	if (capath == NULL) {
-		const zend_string *capath_str = zend_ini_str(ZEND_STRL("openssl.capath"), false);
+		const zend_string *capath_str = zend_ini_str_literal("openssl.capath");
 		capath = ZSTR_LEN(capath_str) ? ZSTR_VAL(capath_str) : NULL;
 	}
 
diff --git a/ext/session/session.c b/ext/session/session.c
@@ -1637,15 +1637,15 @@ PHPAPI zend_result php_session_start(void)
 			break;
 
 		case php_session_disabled: {
-			const char *value = zend_ini_string(ZEND_STRL("session.save_handler"), false);
+			const char *value = zend_ini_string_literal("session.save_handler");
 			if (!PS(mod) && value) {
 				PS(mod) = _php_find_ps_module(value);
 				if (!PS(mod)) {
 					php_error_docref(NULL, E_WARNING, "Cannot find session save handler \"%s\" - session startup failed", value);
 					return FAILURE;
 				}
 			}
-			value = zend_ini_string(ZEND_STRL("session.serialize_handler"), false);
+			value = zend_ini_string_literal("session.serialize_handler");
 			if (!PS(serializer) && value) {
 				PS(serializer) = _php_find_ps_serializer(value);
 				if (!PS(serializer)) {
@@ -2768,14 +2768,14 @@ static zend_result php_rinit_session(bool auto_start)
 
 	PS(mod) = NULL;
 	{
-		const char *value = zend_ini_string(ZEND_STRL("session.save_handler"), false);
+		const char *value = zend_ini_string_literal("session.save_handler");
 		if (value) {
 			PS(mod) = _php_find_ps_module(value);
 		}
 	}
 
 	if (PS(serializer) == NULL) {
-		const char *value = zend_ini_string(ZEND_STRL("session.serialize_handler"), false);
+		const char *value = zend_ini_string_literal("session.serialize_handler");
 		if (value) {
 			PS(serializer) = _php_find_ps_serializer(value);
 		}
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
@@ -1665,7 +1665,7 @@ PHP_METHOD(SoapServer, handle)
 			sapi_add_header("Content-Type: text/xml; charset=utf-8", sizeof("Content-Type: text/xml; charset=utf-8")-1, 1);
 		}
 
-		if (INI_INT("zlib.output_compression")) {
+		if (zend_ini_long_literal("zlib.output_compression")) {
 			sapi_add_header("Connection: close", sizeof("Connection: close")-1, 1);
 		} else {
 			snprintf(cont_len, sizeof(cont_len), "Content-Length: %d", size);
@@ -1827,7 +1827,7 @@ static void soap_server_fault_ex(sdlFunctionPtr function, zval* fault, soapHeade
 	if (use_http_error_status) {
 		sapi_add_header("HTTP/1.1 500 Internal Server Error", sizeof("HTTP/1.1 500 Internal Server Error")-1, 1);
 	}
-	if (INI_INT("zlib.output_compression")) {
+	if (zend_ini_long_literal("zlib.output_compression")) {
 		sapi_add_header("Connection: close", sizeof("Connection: close")-1, 1);
 	} else {
 		snprintf(cont_len, sizeof(cont_len), "Content-Length: %d", size);
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
@@ -1717,11 +1717,11 @@ PHPAPI bool append_user_shutdown_function(php_shutdown_function_entry *shutdown_
 
 ZEND_API void php_get_highlight_struct(zend_syntax_highlighter_ini *syntax_highlighter_ini) /* {{{ */
 {
-	syntax_highlighter_ini->highlight_comment = INI_STR("highlight.comment");
-	syntax_highlighter_ini->highlight_default = INI_STR("highlight.default");
-	syntax_highlighter_ini->highlight_html    = INI_STR("highlight.html");
-	syntax_highlighter_ini->highlight_keyword = INI_STR("highlight.keyword");
-	syntax_highlighter_ini->highlight_string  = INI_STR("highlight.string");
+	syntax_highlighter_ini->highlight_comment = zend_ini_string_literal("highlight.comment");
+	syntax_highlighter_ini->highlight_default = zend_ini_string_literal("highlight.default");
+	syntax_highlighter_ini->highlight_html    = zend_ini_string_literal("highlight.html");
+	syntax_highlighter_ini->highlight_keyword = zend_ini_string_literal("highlight.keyword");
+	syntax_highlighter_ini->highlight_string  = zend_ini_string_literal("highlight.string");
 }
 /* }}} */
 
@@ -2026,7 +2026,7 @@ PHP_FUNCTION(set_include_path)
 		Z_PARAM_PATH_STR(new_value)
 	ZEND_PARSE_PARAMETERS_END();
 
-	zend_string *old_value = zend_ini_str("include_path", sizeof("include_path") - 1, false);
+	zend_string *old_value = zend_ini_str_literal("include_path");
 	/* copy to return here, because alter might free it! */
 	if (old_value) {
 		RETVAL_STR_COPY(old_value);
@@ -2049,7 +2049,7 @@ PHP_FUNCTION(get_include_path)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
 
-	zend_string *str = zend_ini_str("include_path", sizeof("include_path") - 1, 0);
+	zend_string *str = zend_ini_str_literal("include_path");
 
 	if (str == NULL) {
 		RETURN_FALSE;
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
@@ -337,7 +337,7 @@ static void php_browscap_parser_cb(zval *arg1, zval *arg2, zval *arg3, int callb
 					) {
 						zend_error(E_CORE_ERROR, "Invalid browscap ini file: "
 							"'Parent' value cannot be same as the section name: %s "
-							"(in file %s)", ZSTR_VAL(ctx->current_section_name), INI_STR("browscap"));
+							"(in file %s)", ZSTR_VAL(ctx->current_section_name), zend_ini_string_literal("browscap"));
 						return;
 					}
 
@@ -499,7 +499,7 @@ PHP_INI_MH(OnChangeBrowscap)
 
 PHP_MINIT_FUNCTION(browscap) /* {{{ */
 {
-	const char *browscap = INI_STR("browscap");
+	const char *browscap = zend_ini_string_literal("browscap");
 
 #ifdef ZTS
 	ts_allocate_id(&browscap_globals_id, sizeof(browser_data), (ts_allocate_ctor) browscap_globals_ctor, NULL);
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
@@ -118,7 +118,7 @@ PHPAPI int php_load_extension(const char *filename, int type, int start_now)
 	char *err1, *err2;
 
 	if (type == MODULE_PERSISTENT) {
-		extension_dir = INI_STR("extension_dir");
+		extension_dir = zend_ini_string_literal("extension_dir");
 	} else {
 		extension_dir = PG(extension_dir);
 	}
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
@@ -336,7 +336,7 @@ PHP_FUNCTION(mail)
 		subject_r = subject;
 	}
 
-	zend_string *force_extra_parameters = zend_ini_str_ex("mail.force_extra_parameters", strlen("mail.force_extra_parameters"), false, NULL);
+	zend_string *force_extra_parameters = zend_ini_str_literal("mail.force_extra_parameters");
 	if (force_extra_parameters) {
 		extra_cmd = php_escape_shell_cmd(force_extra_parameters);
 	} else if (extra_cmd) {
@@ -437,9 +437,9 @@ static int php_mail_detect_multiple_crlf(const char *hdr) {
 PHPAPI bool php_mail(const char *to, const char *subject, const char *message, const char *headers, const zend_string *extra_cmd)
 {
 	FILE *sendmail;
-	const char *sendmail_path = INI_STR("sendmail_path");
+	const char *sendmail_path = zend_ini_string_literal("sendmail_path");
 	char *sendmail_cmd = NULL;
-	const zend_string *mail_log = zend_ini_str(ZEND_STRL("mail.log"), false);
+	const zend_string *mail_log = zend_ini_str_literal("mail.log");
 	const char *hdr = headers;
 	char *ahdr = NULL;
 #if PHP_SIGCHILD
@@ -536,7 +536,7 @@ PHPAPI bool php_mail(const char *to, const char *subject, const char *message, c
 		char *tsm_errmsg = NULL;
 
 		/* handle old style win smtp sending */
-		if (TSendMail(INI_STR("SMTP"), &tsm_err, &tsm_errmsg, hdr, subject, to, message) == FAILURE) {
+		if (TSendMail(zend_ini_string_literal("SMTP"), &tsm_err, &tsm_errmsg, hdr, subject, to, message) == FAILURE) {
 			if (tsm_errmsg) {
 				php_error_docref(NULL, E_WARNING, "%s", tsm_errmsg);
 				efree(tsm_errmsg);
@@ -701,7 +701,7 @@ PHPAPI bool php_mail(const char *to, const char *subject, const char *message, c
 /* {{{ PHP_MINFO_FUNCTION */
 PHP_MINFO_FUNCTION(mail)
 {
-	const char *sendmail_path = INI_STR("sendmail_path");
+	const char *sendmail_path = zend_ini_string_literal("sendmail_path");
 
 #ifdef PHP_WIN32
 	if (!sendmail_path) {
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
@@ -1278,7 +1278,7 @@ static PHP_INI_MH(OnUpdate_zlib_output_compression)
 	} else {
 		int_value = (int) zend_ini_parse_quantity_warn(new_value, entry->name);
 	}
-	const zend_string *ini_value = zend_ini_str(ZEND_STRL("output_handler"), false);
+	const zend_string *ini_value = zend_ini_str_literal("output_handler");
 
 	if (ini_value && ZSTR_LEN(ini_value) && int_value) {
 		php_error_docref("ref.outcontrol", E_CORE_ERROR, "Cannot use both zlib.output_compression and output_handler together!!");
diff --git a/main/main.c b/main/main.c
@@ -1471,8 +1471,8 @@ static ZEND_COLD void php_error_cb(int orig_type, zend_string *error_filename, c
 			if (PG(xmlrpc_errors)) {
 				php_printf("<?xml version=\"1.0\"?><methodResponse><fault><value><struct><member><name>faultCode</name><value><int>" ZEND_LONG_FMT "</int></value></member><member><name>faultString</name><value><string>%s:%s in %s on line %" PRIu32 "%s%s</string></value></member></struct></value></fault></methodResponse>", PG(xmlrpc_error_number), error_type_str, ZSTR_VAL(message), ZSTR_VAL(error_filename), error_lineno, ZSTR_LEN(backtrace) ? "\nStack trace:\n" : "", ZSTR_VAL(backtrace));
 			} else {
-				const char *prepend_string = INI_STR("error_prepend_string");
-				const char *append_string = INI_STR("error_append_string");
+				const char *prepend_string = zend_ini_string_literal("error_prepend_string");
+				const char *append_string = zend_ini_string_literal("error_append_string");
 
 				if (PG(html_errors)) {
 					if (type == E_ERROR || type == E_PARSE) {
@@ -2374,7 +2374,7 @@ zend_result php_module_startup(sapi_module_struct *sf, zend_module_entry *additi
 	}
 
 	/* disable certain functions as requested by php.ini */
-	zend_disable_functions(INI_STR("disable_functions"));
+	zend_disable_functions(zend_ini_string_literal("disable_functions"));
 
 	/* make core report what it should */
 	if ((module = zend_hash_str_find_ptr(&module_registry, "core", sizeof("core")-1)) != NULL) {
@@ -2638,7 +2638,7 @@ PHPAPI bool php_execute_script_ex(zend_file_handle *primary_file, zval *retval)
 #ifdef PHP_WIN32
 			zend_unset_timeout();
 #endif
-			zend_set_timeout(INI_INT("max_execution_time"), 0);
+			zend_set_timeout(zend_ini_long_literal("max_execution_time"), false);
 		}
 
 		if (prepend_file_p && result) {
diff --git a/main/php_ini.c b/main/php_ini.c
@@ -334,7 +334,7 @@ static void php_load_zend_extension_cb(void *arg)
 	} else {
 		DL_HANDLE handle;
 		char *libpath;
-		const char *extension_dir = INI_STR("extension_dir");
+		const char *extension_dir = zend_ini_string_literal("extension_dir");
 		int slash_suffix = 0;
 		char *err1, *err2;
 
diff --git a/main/rfc1867.c b/main/rfc1867.c
@@ -665,8 +665,8 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
 	zend_llist header;
 	void *event_extra_data = NULL;
 	unsigned int llen = 0;
-	zend_long upload_cnt = REQUEST_PARSE_BODY_OPTION_GET(max_file_uploads, INI_INT("max_file_uploads"));
-	zend_long body_parts_cnt = REQUEST_PARSE_BODY_OPTION_GET(max_multipart_body_parts, INI_INT("max_multipart_body_parts"));
+	zend_long upload_cnt = REQUEST_PARSE_BODY_OPTION_GET(max_file_uploads, zend_ini_long_literal("max_file_uploads"));
+	zend_long body_parts_cnt = REQUEST_PARSE_BODY_OPTION_GET(max_multipart_body_parts, zend_ini_long_literal("max_multipart_body_parts"));
 	zend_long post_max_size = REQUEST_PARSE_BODY_OPTION_GET(post_max_size, SG(post_max_size));
 	zend_long max_input_vars = REQUEST_PARSE_BODY_OPTION_GET(max_input_vars, PG(max_input_vars));
 	zend_long upload_max_filesize = REQUEST_PARSE_BODY_OPTION_GET(upload_max_filesize, PG(upload_max_filesize));
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
@@ -1190,7 +1190,7 @@ static void add_zendext_info(zend_extension *ext) /* {{{ */ {
 #ifdef HAVE_LIBDL
 PHPDBG_API const char *phpdbg_load_module_or_extension(char **path, const char **name) /* {{{ */ {
 	DL_HANDLE handle;
-	zend_string *extension_dir = zend_ini_str(ZEND_STRL("extension_dir"), false);
+	zend_string *extension_dir = zend_ini_str_literal("extension_dir");
 
 	if (strchr(*path, '/') != NULL || strchr(*path, DEFAULT_SLASH) != NULL) {
 		/* path is fine */
diff --git a/win32/sendmail.c b/win32/sendmail.c
@@ -216,8 +216,8 @@ PHPAPI int TSendMail(const char *host, int *error, char **error_message,
 	}
 
 	/* Fall back to sendmail_from php.ini setting */
-	if (INI_STR("sendmail_from")) {
-		RPath = estrdup(INI_STR("sendmail_from"));
+	if (zend_ini_string_literal("sendmail_from")) {
+		RPath = estrdup(zend_ini_string_literal("sendmail_from"));
 	} else if (headers_lc) {
 		int found = 0;
 		const char *lookup = ZSTR_VAL(headers_lc);
@@ -276,7 +276,7 @@ PHPAPI int TSendMail(const char *host, int *error, char **error_message,
 		snprintf(*error_message, HOST_NAME_LEN + 128,
 			"Failed to connect to mailserver at \"%s\" port " ZEND_ULONG_FMT ", verify your \"SMTP\" "
 			"and \"smtp_port\" setting in php.ini or use ini_set()",
-			PW32G(mail_host), !INI_INT("smtp_port") ? 25 : INI_INT("smtp_port"));
+			PW32G(mail_host), !zend_ini_long_literal("smtp_port") ? 25 : zend_ini_long_literal("smtp_port"));
 		return FAILURE;
 	} else {
 		ret = SendText(RPath, Subject, mailTo, data, headers_trim, headers_lc, error_message);
@@ -789,7 +789,7 @@ return 0;
 	}
 	*/
 
-	portnum = (short) INI_INT("smtp_port");
+	portnum = (short) zend_ini_long_literal("smtp_port");
 	if (!portnum) {
 		portnum = 25;
 	}

Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,8 @@ ZEND_API zend_result zend_multibyte_set_functions(const zend_multibyte_functions`
`114`	`114`	`* populated, we need to reinitialize script_encoding here.`
`115`	`115`	`*/`
`116`	`116`	`{`
`117`		`- const char *value = zend_ini_string("zend.script_encoding", sizeof("zend.script_encoding") - 1, 0);`
`118`		`- zend_multibyte_set_script_encoding_by_string(value, strlen(value));`
	`117`	`+ const zend_string *value = zend_ini_str_literal("zend.script_encoding");`
	`118`	`+ zend_multibyte_set_script_encoding_by_string(ZSTR_VAL(value), ZSTR_LEN(value));`
`119`	`119`	`}`
`120`	`120`	`return SUCCESS;`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ static HRESULT dotnet_bind_runtime(LPVOID FAR *ppv)`
`139`	`139`	`return S_FALSE;`
`140`	`140`	`}`
`141`	`141`
`142`		`- const zend_string *version = zend_ini_str(ZEND_STRL("com.dotnet_version"), false);`
	`142`	`+ const zend_string *version = zend_ini_str_literal("com.dotnet_version");`
`143`	`143`	`if (version == NULL \|\| ZSTR_LEN(version) == 0) {`
`144`	`144`	`oleversion = NULL;`
`145`	`145`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -5480,18 +5480,18 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, bool calc_s`
`5480`	`5480`	`ZEND_PARSE_PARAMETERS_END();`
`5481`	`5481`
`5482`	`5482`	`if (latitude_is_null) {`
`5483`		`- latitude = INI_FLT("date.default_latitude");`
	`5483`	`+ latitude = zend_ini_double_literal("date.default_latitude");`
`5484`	`5484`	`}`
`5485`	`5485`
`5486`	`5486`	`if (longitude_is_null) {`
`5487`		`- longitude = INI_FLT("date.default_longitude");`
	`5487`	`+ longitude = zend_ini_double_literal("date.default_longitude");`
`5488`	`5488`	`}`
`5489`	`5489`
`5490`	`5490`	`if (zenith_is_null) {`
`5491`	`5491`	`if (calc_sunset) {`
`5492`		`- zenith = INI_FLT("date.sunset_zenith");`
	`5492`	`+ zenith = zend_ini_double_literal("date.sunset_zenith");`
`5493`	`5493`	`} else {`
`5494`		`- zenith = INI_FLT("date.sunrise_zenith");`
	`5494`	`+ zenith = zend_ini_double_literal("date.sunrise_zenith");`
`5495`	`5495`	`}`
`5496`	`5496`	`}`
`5497`	`5497`
Original file line number	Diff line number	Diff line change
`@@ -888,7 +888,7 @@ static zend_result php_openssl_enable_peer_verification(SSL_CTX *ctx, php_stream`
`888`	`888`	`GET_VER_OPT_STRING("capath", capath);`
`889`	`889`
`890`	`890`	`if (cafile == NULL) {`
`891`		`- const zend_string *cafile_str = zend_ini_str(ZEND_STRL("openssl.cafile"), false);`
	`891`	`+ const zend_string *cafile_str = zend_ini_str_literal("openssl.cafile");`
`892`	`892`	`cafile = ZSTR_LEN(cafile_str) ? ZSTR_VAL(cafile_str) : NULL;`
`893`	`893`	`} else if (!sslsock->is_client) {`
`894`	`894`	`/* Servers need to load and assign CA names from the cafile */`
`@@ -902,7 +902,7 @@ static zend_result php_openssl_enable_peer_verification(SSL_CTX *ctx, php_stream`
`902`	`902`	`}`
`903`	`903`
`904`	`904`	`if (capath == NULL) {`
`905`		`- const zend_string *capath_str = zend_ini_str(ZEND_STRL("openssl.capath"), false);`
	`905`	`+ const zend_string *capath_str = zend_ini_str_literal("openssl.capath");`
`906`	`906`	`capath = ZSTR_LEN(capath_str) ? ZSTR_VAL(capath_str) : NULL;`
`907`	`907`	`}`
`908`	`908`
Original file line number	Diff line number	Diff line change
`@@ -1637,15 +1637,15 @@ PHPAPI zend_result php_session_start(void)`
`1637`	`1637`	`break;`
`1638`	`1638`
`1639`	`1639`	`case php_session_disabled: {`
`1640`		`- const char *value = zend_ini_string(ZEND_STRL("session.save_handler"), false);`
	`1640`	`+ const char *value = zend_ini_string_literal("session.save_handler");`
`1641`	`1641`	`if (!PS(mod) && value) {`
`1642`	`1642`	`PS(mod) = _php_find_ps_module(value);`
`1643`	`1643`	`if (!PS(mod)) {`
`1644`	`1644`	`php_error_docref(NULL, E_WARNING, "Cannot find session save handler \"%s\" - session startup failed", value);`
`1645`	`1645`	`return FAILURE;`
`1646`	`1646`	`}`
`1647`	`1647`	`}`
`1648`		`- value = zend_ini_string(ZEND_STRL("session.serialize_handler"), false);`
	`1648`	`+ value = zend_ini_string_literal("session.serialize_handler");`
`1649`	`1649`	`if (!PS(serializer) && value) {`
`1650`	`1650`	`PS(serializer) = _php_find_ps_serializer(value);`
`1651`	`1651`	`if (!PS(serializer)) {`
`@@ -2768,14 +2768,14 @@ static zend_result php_rinit_session(bool auto_start)`
`2768`	`2768`
`2769`	`2769`	`PS(mod) = NULL;`
`2770`	`2770`	`{`
`2771`		`- const char *value = zend_ini_string(ZEND_STRL("session.save_handler"), false);`
	`2771`	`+ const char *value = zend_ini_string_literal("session.save_handler");`
`2772`	`2772`	`if (value) {`
`2773`	`2773`	`PS(mod) = _php_find_ps_module(value);`
`2774`	`2774`	`}`
`2775`	`2775`	`}`
`2776`	`2776`
`2777`	`2777`	`if (PS(serializer) == NULL) {`
`2778`		`- const char *value = zend_ini_string(ZEND_STRL("session.serialize_handler"), false);`
	`2778`	`+ const char *value = zend_ini_string_literal("session.serialize_handler");`
`2779`	`2779`	`if (value) {`
`2780`	`2780`	`PS(serializer) = _php_find_ps_serializer(value);`
`2781`	`2781`	`}`