From: Anatol Belski <ab@php.net>
Date: Tue, 24 Mar 2015 20:24:49 +0000 (+0100)
Subject: fix datatype mismatches
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~498
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=512429ffc547372c0ddb41d76a0ddb28f3d77685;p=php

fix datatype mismatches
---

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index db88b29f20..f325f3e816 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -378,7 +378,7 @@ PS_OPEN_FUNC(files)
 
 	if (argc > 2) {
 		errno = 0;
-		filemode = ZEND_STRTOL(argv[1], NULL, 8);
+		filemode = (int)ZEND_STRTOL(argv[1], NULL, 8);
 		if (errno == ERANGE || filemode < 0 || filemode > 07777) {
 			php_error(E_WARNING, "The second parameter in session.save_path is invalid");
 			return FAILURE;
diff --git a/ext/session/session.c b/ext/session/session.c
index eed91fc90a..71d4cd133f 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -767,8 +767,8 @@ static PHP_INI_MH(OnUpdateHashFunc) /* {{{ */
 
 static PHP_INI_MH(OnUpdateRfc1867Freq) /* {{{ */
 {
-	zend_long tmp;
-	tmp = zend_atoi(new_value->val, new_value->len);
+	int tmp;
+	tmp = zend_atoi(new_value->val, (int)new_value->len);
 	if(tmp < 0) {
 		php_error_docref(NULL, E_WARNING, "session.upload_progress.freq must be greater than or equal to zero");
 		return FAILURE;