diff options
author | Anatol Belski <ab@php.net> | 2014-10-05 19:26:17 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-10-05 19:26:17 +0200 |
commit | a91d3580a7c9461729608c4b7e2c193cdf4206ce (patch) | |
tree | 3a1b3b4dc105b1d46a9609a8b485c041304bd50c /ext/phar | |
parent | 11cf279196a7edba43080b3497fa04abe5a0e5f5 (diff) | |
parent | d58b70622a7e99ceee074e420d9271c2d8de116c (diff) | |
download | php-git-a91d3580a7c9461729608c4b7e2c193cdf4206ce.tar.gz |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
properly export tsrm_strtok_r()
Fixed list() behavior inconsistency (string handling is disabled for all cases, ArrayAccess objects handling is enabled for all cases, ZEND_FETCH_DIM_TMP_VAR opcode is renamed into ZEND_FETCH_LIST, ZEND_FETCH_ADD_LOCK flag is removed).
Fix accidental edit in previous commit
Fix arginfo
DateTimeZone::getOffset() now accepts a DateTimeInterface
DateTimeZone::getOffset() now accepts a DateTimeInterface
Moved checks and error reporting related to static methods from DO_FCALL inti INTI_FCALL* opcodes that may really deal with static methods. (In some rare cases it may lead to different order of warning messages).
Fixed a bug that causes crash when environment variable is access while parsing php.ini
Fixed a bug that causes crash when environment variable is access while parsing php.ini
Diffstat (limited to 'ext/phar')
-rw-r--r-- | ext/phar/phar.c | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c index a0c99c5f40..e3b663a011 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -2068,54 +2068,6 @@ static int php_check_dots(const char *element, int n) /* {{{ */ #define IS_BACKSLASH(c) ((c) == '/') -#ifdef COMPILE_DL_PHAR -/* stupid-ass non-extern declaration in tsrm_strtok.h breaks dumbass MS compiler */ -static inline int in_character_class(char ch, const char *delim) /* {{{ */ -{ - while (*delim) { - if (*delim == ch) { - return 1; - } - ++delim; - } - return 0; -} -/* }}} */ - -char *tsrm_strtok_r(char *s, const char *delim, char **last) /* {{{ */ -{ - char *token; - - if (s == NULL) { - s = *last; - } - - while (*s && in_character_class(*s, delim)) { - ++s; - } - - if (!*s) { - return NULL; - } - - token = s; - - while (*s && !in_character_class(*s, delim)) { - ++s; - } - - if (!*s) { - *last = s; - } else { - *s = '\0'; - *last = s + 1; - } - - return token; -} -/* }}} */ -#endif - /** * Remove .. and . references within a phar filename */ |