Commit: b980e4fedc945dd0a45d73349716f6ab18a97635 Author: Patrick Allaert <p...@ez.no> Tue, 9 Jul 2013 15:05:10 +0200 Parents: 3cdd09a76eb21789bb10d02581b21fc9403e39a1 Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b980e4fedc945dd0a45d73349716f6ab18a97635 Log: Fixed #65225: PHP_BINARY incorrectly set Bugs: https://bugs.php.net/65225 Changed paths: M main/main.c Diff: diff --git a/main/main.c b/main/main.c index de794ac..d11ef84 100644 --- a/main/main.c +++ b/main/main.c @@ -114,6 +114,10 @@ #endif /* }}} */ +#ifndef S_ISREG +#define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG) +#endif + PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) = php_register_internal_extensions; #ifndef ZTS @@ -275,13 +279,14 @@ static void php_binary_init(TSRMLS_D) if ((envpath = getenv("PATH")) != NULL) { char *search_dir, search_path[MAXPATHLEN]; char *last = NULL; + struct stat s; path = estrdup(envpath); search_dir = php_strtok_r(path, ":", &last); while (search_dir) { snprintf(search_path, MAXPATHLEN, "%s/%s", search_dir, sapi_module.executable_location); - if (VCWD_REALPATH(search_path, binary_location) && !VCWD_ACCESS(binary_location, X_OK)) { + if (VCWD_REALPATH(search_path, binary_location) && !VCWD_ACCESS(binary_location, X_OK) && VCWD_STAT(binary_location, &s) == 0 && S_ISREG(s.st_mode)) { found = 1; break; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
