From: Anatol Belski <ab@php.net>
Date: Fri, 19 Sep 2014 14:26:32 +0000 (+0200)
Subject: reverted too much
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~183
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4c5271c0c87c8b0b1a5f8f9c7a43917e2a58039;p=php

reverted too much
---

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 7afa04c7d5..a4aa10fce8 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -759,11 +759,15 @@ PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path, co
 	cwd_state new_state;
 	char cwd[MAXPATHLEN];
 	int copy_len;
-	int path_len = (int)strlen(filepath);
+	int path_len;
 
 	if (!filepath[0]) {
 		return NULL;
-	} else if (IS_ABSOLUTE_PATH(filepath, path_len)) {
+	}
+
+	path_len = (int)strlen(filepath);
+
+	if (IS_ABSOLUTE_PATH(filepath, path_len)) {
 		cwd[0] = '\0';
 	} else {
 		const char *iam = SG(request_info).path_translated;