diff options
| author | Anatol Belski <ab@php.net> | 2016-02-02 14:26:58 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-02-02 14:26:58 +0100 |
| commit | 2c691f06b513dadbdc9902f0453425d3a003b08c (patch) | |
| tree | ec331045a45ac77cbbe608c3338ac7d01472ba94 | |
| parent | b57365809259c63c2dd09b1ec1a1dc99dc10e926 (diff) | |
| download | php-git-2c691f06b513dadbdc9902f0453425d3a003b08c.tar.gz | |
reapply the sysconf error check patch
| -rw-r--r-- | ext/standard/exec.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ext/standard/exec.c b/ext/standard/exec.c index cbaaedbc83..a73d0b4e6e 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -50,6 +50,10 @@ #include <unistd.h> #endif +#if HAVE_LIMITS_H +#include <limits.h> +#endif + static int cmd_max_len; /* {{{ PHP_MINIT_FUNCTION(exec) */ @@ -57,6 +61,13 @@ PHP_MINIT_FUNCTION(exec) { #ifdef _SC_ARG_MAX cmd_max_len = sysconf(_SC_ARG_MAX); + if (-1 == cmd_max_len) { +#ifdef _POSIX_ARG_MAX + cmd_max_len = _POSIX_ARG_MAX; +#else + cmd_max_len = 4096; +#endif + } #elif defined(ARG_MAX) cmd_max_len = ARG_MAX; #elif defined(PHP_WIN32) |