com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/config.m4 ext/fileinfo/libmagic/file.h

From: Date: Sun, 04 Jan 2015 08:42:46 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/fileinfo/config.m4 ext/fileinfo/libmagic/file.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83953@lists.php.net to get a copy of this message
Commit: c06f66563adaba30f5577add7a4a50bbe24c29e6 Author: Anatol Belski <ab@php.net> Sun, 4 Jan 2015 09:42:46 +0100 Parents: fe46966678db3b82b66b715d37c6254d81dbe568 b644dcfb72ddc436d626ad043b7c96b602de2d55 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c06f66563adaba30f5577add7a4a50bbe24c29e6 Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: removed dead code Conflicts: ext/fileinfo/libmagic/readelf.c ext/fileinfo/libmagic/readelf.h Changed paths: MM ext/fileinfo/config.m4 MM ext/fileinfo/libmagic/file.h Diff: diff --cc ext/fileinfo/config.m4 index a11dbf8,b890820..7e98d62 --- a/ext/fileinfo/config.m4 +++ b/ext/fileinfo/config.m4 @@@ -11,43 -11,8 +11,43 @@@ if test "$PHP_FILEINFO" != "no"; the libmagic/cdf.c libmagic/cdf_time.c libmagic/compress.c \ libmagic/encoding.c libmagic/fsmagic.c libmagic/funcs.c \ libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ - libmagic/readcdf.c libmagic/readelf.c libmagic/softmagic.c" + libmagic/readcdf.c libmagic/softmagic.c" + AC_MSG_CHECKING([for strcasestr]) + AC_TRY_RUN([ +#include <string.h> +#include <strings.h> +#include <stdlib.h> + +int main(void) +{ + char *s0, *s1, *ret; + + s0 = (char *) malloc(42); + s1 = (char *) malloc(8); + + memset(s0, 'X', 42); + s0[24] = 'Y'; + s0[26] = 'Z'; + s0[41] = '\0'; + memset(s1, 'x', 8); + s1[0] = 'y'; + s1[2] = 'Z'; + s1[7] = '\0'; + + ret = strcasestr(s0, s1); + + return !(NULL != ret); +} + ],[ + dnl using the platform implementation + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + AC_MSG_NOTICE(using libmagic strcasestr implementation) + libmagic_sources="$libmagic_sources libmagic/strcasestr.c" + ]) + PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) PHP_ADD_BUILD_DIR($ext_builddir/libmagic) diff --cc ext/fileinfo/libmagic/file.h index 9a61d2c,a0976cd..5d50f62 --- a/ext/fileinfo/libmagic/file.h +++ b/ext/fileinfo/libmagic/file.h @@@ -420,11 -420,9 +420,9 @@@ protected int file_pipe2file(struct mag protected int file_replace(struct magic_set *, const char *, const char *); protected int file_printf(struct magic_set *, const char *, ...); protected int file_reset(struct magic_set *); - protected int file_tryelf(struct magic_set *, int, const unsigned char *, - size_t); protected int file_trycdf(struct magic_set *, int, const unsigned char *, size_t); -#ifdef PHP_FILEINFO_UNCOMPRESS +#ifdef PHP_FILEINFO_UNCOMPRESS protected int file_zmagic(struct magic_set *, int, const char *, const unsigned char *, size_t); #endif

« previous php.cvs (#83953) next »