Anatol Belski
fb991bd7fd
updated libmagic.patch for 5.6+
2014-05-27 22:39:54 +02:00
Anatol Belski
546797f329
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch for 5.4+
Conflicts:
ext/fileinfo/libmagic.patch
2014-05-27 22:38:02 +02:00
Anatol Belski
d2765e4b8c
updated libmagic.patch for 5.4+
2014-05-27 22:36:12 +02:00
Stanislav Malyshev
bc87ba8ee6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
backport this piece from 5.6, related to the #66307 fix
Fixed bug #66307 Fileinfo crashes with powerpoint files
Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
Fix bug #67327 : fileinfo: CDF infinite loop in nelements DoS
fix my last commit with some locales
2014-05-26 18:06:58 -07:00
Anatol Belski
d184f07b3c
backport this piece from 5.6, related to the #66307 fix
2014-05-26 18:05:13 -07:00
Anatol Belski
15ee33eb21
Fixed bug #66307 Fileinfo crashes with powerpoint files
2014-05-26 18:04:27 -07:00
Stanislav Malyshev
5ce11c2698
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
Fix bug #67327 : fileinfo: CDF infinite loop in nelements DoS
2014-05-26 18:03:01 -07:00
Stanislav Malyshev
4005f06df6
Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
...
Upstream patch: b8acc83781
2014-05-26 18:01:17 -07:00
Stanislav Malyshev
57225f09ed
Fix bug #67327 : fileinfo: CDF infinite loop in nelements DoS
...
Upstream fix: f97486ef5d
2014-05-26 17:45:14 -07:00
Dmitry Stogov
449ea00a48
Fixed ext/fileinfo conversion mistakes
2014-05-07 17:58:28 +04:00
Xinchen Hui
9ef21b7606
Refactor fileinfo
2014-05-07 13:50:29 +08:00
Anatol Belski
06ae920165
updated libmagic.patch
2014-05-04 21:34:17 +02:00
Anatol Belski
031cafd4e2
added missing stdint header, bug #66907
2014-05-04 21:26:53 +02:00
Anatol Belski
5c34146104
updated libmagic.patch for 5.6+
2014-04-24 20:16:06 +02:00
Anatol Belski
db960e82b4
updated libmagic.patch
2014-04-24 20:13:47 +02:00
Anatol Belski
d7bb09cc1d
backport this piece from 5.6, related to the #66307 fix
2014-04-24 19:50:23 +02:00
Anatol Belski
74ce9da5dc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66307 Fileinfo crashes with powerpoint files
Conflicts:
ext/fileinfo/libmagic/readcdf.c
2014-04-24 19:33:54 +02:00
Anatol Belski
03fa5501a8
Fixed bug #66307 Fileinfo crashes with powerpoint files
2014-04-24 19:30:34 +02:00
Anatol Belski
aaf197180a
Fixed bug #66907 Solaris 10 is missing strcasestr and needs substitute
2014-04-15 10:26:49 -07:00
Anatol Belski
e265df460d
updated libmagic.patch
2014-03-31 17:24:15 +02:00
Remi Collet
62305edc5b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
NEWS
Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
2014-03-31 16:57:39 +02:00
Remi Collet
178eac6c98
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
2014-03-31 16:57:12 +02:00
Remi Collet
2c204a55af
Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
...
On little endian:
map->p == php_magic_database
map->magic[i] = pointer into the map
map->p == NULL
map->magic[i] = pointer to allocated memory
On big endian (ppc64, s390x, ...):
map->p != php_magic_database and map->p != NULL
map->magic[i] = pointer into a copy of the map
Trying to efree pointer in the later cause memory corruption
Thanks to dkatulek / Red Hat for the report.
2014-03-31 16:50:47 +02:00
Remi Collet
5f0428e8cc
fix merge issue
2014-03-25 12:07:15 +01:00
Remi Collet
64d7dd55d3
Fix merge (5.6 already have file 5.17)
2014-03-25 11:03:59 +01:00
Remi Collet
84b0ab6d8f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
2014-03-25 11:01:20 +01:00
Remi Collet
4374a52e9d
Fixed bug #66946 extensive backtracking in awk rule regular expression
...
CVE-2013-7345
Applied upstream patch:
ef2329cf71
Add the magicdata.patch to track patches applied to upstream data file.
2014-03-25 11:00:33 +01:00
Remi Collet
1df558c6a0
Fixed bug #66946 extensive backtracking in awk rule regular expression
...
CVE-2013-7345
Applied upstream patch:
ef2329cf71
Add the magicdata.patch to track patches applied to upstream data file.
2014-03-25 10:58:50 +01:00
Anatol Belski
62f6c5853f
Fixes to various stream cast on win64
...
This fixes further issues on win64 with casts from the streams.
Sockets/descriptors handling was unitized. This has an impact only on
win64, php_socket_t otherwise can be feed back to int datatype.
2014-03-19 06:33:46 +01:00
Anatol Belski
8bda4c685a
updated libmagic.patch
2014-03-10 14:17:47 +01:00
Anatol Belski
6dd80946a2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated libmagic.patch
2014-03-10 14:14:01 +01:00
Anatol Belski
c17fd65165
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2014-03-10 14:13:15 +01:00
Anatol Belski
b9d494a33b
updated libmagic.patch
2014-03-10 14:12:20 +01:00
Remi Collet
9a9add6b73
fix merge
2014-03-04 20:39:00 +01:00
Remi Collet
5d08cae346
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Bug #66820 out-of-bounds memory access in fileinfo
2014-03-04 20:36:08 +01:00
Remi Collet
a33759fd27
Fixed Bug #66820 out-of-bounds memory access in fileinfo
...
Upstream fix:
447558595a
Notice, test changed, with upstream agreement:
-define OFFSET_OOB(n, o, i) ((n) < (o) || (i) >= ((n) - (o)))
+define OFFSET_OOB(n, o, i) ((n) < (o) || (i) > ((n) - (o)))
2014-03-04 20:32:52 +01:00
Remi Collet
834b719cf5
fix merge
2014-03-04 13:46:21 +01:00
Remi Collet
bc0b6e02e4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Improves fix for memory leak, keep in sync with upstream.
2014-03-04 13:43:42 +01:00
Remi Collet
731013ee8e
Improves fix for memory leak, keep in sync with upstream.
...
Previous fix:
http://git.php.net/?p=php-src.git;a=commitdiff;h=10eb0070700382f966bf260e44135e1f724a15d2
Upstream fix:
c0c0032b9e
2014-03-04 13:41:37 +01:00
Anatol Belski
b67c8b8603
updated libmagic.patch for 5.6+
2014-02-20 19:05:59 +01:00
Anatol Belski
e244e2245b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch in 5.4/5
2014-02-20 19:00:36 +01:00
Anatol Belski
ce1fd72776
updated libmagic.patch in 5.4/5
2014-02-20 19:00:05 +01:00
Anatol Belski
67d281f093
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed leak introduced after CVE/upgrade
2014-02-20 18:55:05 +01:00
Anatol Belski
6d4d4155d2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed leak introduced after CVE/upgrade
2014-02-20 18:54:35 +01:00
Anatol Belski
10eb007070
fixed leak introduced after CVE/upgrade
2014-02-20 18:53:53 +01:00
Anatol Belski
6b5c9f6c5a
updated libmagic.patch
2014-02-19 11:20:24 +01:00
Anatol Belski
fdaf3996af
remove PHP_API_VERSION < 20100412 check
2014-02-19 11:01:42 +01:00
Anatol Belski
6d2cf0f2a4
expose correct libmagic version
2014-02-19 10:48:52 +01:00
Anatol Belski
4019531748
fixed tests in ext/fileinfo
2014-02-19 10:04:29 +01:00
Anatol Belski
967a6771d3
updated to libmagic-5.17
2014-02-19 10:02:36 +01:00
Anatol Belski
e95a2925fc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated libmagic.patch
2014-02-18 19:09:04 +01:00
Anatol Belski
8dd99dd2dc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2014-02-18 19:08:45 +01:00
Anatol Belski
a289b37f48
updated libmagic.patch
2014-02-18 19:08:16 +01:00
Remi Collet
aa84d906d8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Set fileinfo version to 1.0.5 (as in php 5.4, no diff)
NEWS
NEWS
Fixed Bug #66731 file: infinite recursion
2014-02-18 13:58:36 +01:00
Remi Collet
bd8cd98d6d
Set fileinfo version to 1.0.5 (as in php 5.4, no diff)
2014-02-18 13:57:53 +01:00
Remi Collet
bdd65b578c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fixed Bug #66731 file: infinite recursion
2014-02-18 13:57:10 +01:00
Remi Collet
89f864c547
Fixed Bug #66731 file: infinite recursion
...
Upstream commit (available in file-5.17)
3c081560c2
cc9e74dfec
2014-02-18 13:54:33 +01:00
Lior Kaplan
23d952ed60
Merge branch 'PHP-5.5' into PHP-5.6
2014-02-14 17:15:35 +02:00
Lior Kaplan
c09bd9def0
Merge branch 'PHP-5.4' into PHP-5.5
2014-02-14 15:30:00 +02:00
Veres Lajos
35101e9ef4
a few typofixes
2014-02-14 14:51:10 +02:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Stanislav Malyshev
68e8326e0e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
non living code related typo fixes
2013-08-04 16:07:13 -07:00
Stanislav Malyshev
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
Andrey Hristov
92d27ccb05
Constify streams API and a few other calls down the rabbit hole.
...
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
2013-07-30 12:49:36 +02:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Anatol Belski
b262787ef9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
reduced the file size even more
2013-05-25 00:10:49 +02:00
Anatol Belski
bcdac7526d
reduced the file size even more
...
the first second is what at least has to be
2013-05-25 00:09:32 +02:00
Anatol Belski
fbdce3b6f6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64916 finfo testcase contains copyrighted music.
2013-05-25 00:02:09 +02:00
Anatol Belski
2d386db878
Fixed bug #64916 finfo testcase contains copyrighted music.
...
I wasn't able to produce a file causing exactly the same crash.
However the first three seconds of the originally reported
file are pretty enough to repro bug #64830 . That reduces its
size to 72k.
2013-05-24 23:58:31 +02:00
Anatol Belski
75ee1a6113
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch after fix for #64830
2013-05-14 11:16:01 +02:00
Anatol Belski
1a46a102d9
updated libmagic.patch after fix for #64830
2013-05-14 11:14:37 +02:00
Anatol Belski
933e01bbac
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64830 mimetype detection segfaults on mp3 file
2013-05-14 09:41:38 +02:00
Anatol Belski
74555e7c26
Fixed bug #64830 mimetype detection segfaults on mp3 file
2013-05-14 09:40:43 +02:00
Anatol Belski
ca148c030f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2013-04-27 14:09:55 +02:00
Anatol Belski
e9b03c412b
updated libmagic.patch
2013-04-27 14:09:29 +02:00
Anatol Belski
d72307f1ca
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug bug #64713 Compilation warnings in finfo
2013-04-27 13:51:12 +02:00
Anatol Belski
cdc1a63790
Fixed bug bug #64713 Compilation warnings in finfo
2013-04-27 13:49:50 +02:00
David Soria Parra
cf5d7d9e73
Fix implicit declaration warning for cdf_timestamp_to_timespec
2013-04-26 12:28:58 +02:00
Anatol Belski
a9f9ff68a2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2013-04-08 16:24:20 +02:00
Anatol Belski
a35d386612
updated libmagic.patch
2013-04-08 16:23:43 +02:00
Anatol Belski
b810878e7d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix ident
2013-04-08 15:51:53 +02:00
Anatol Belski
9de5dcad1c
fix ident
2013-04-08 15:51:22 +02:00
Anatol Belski
a1f66c0b50
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Refactored the previous memleak fix
2013-04-08 14:34:09 +02:00
Anatol Belski
f3ca1155d6
Refactored the previous memleak fix
...
to avoid usage of a freed pointer. Thanks Laruence )
2013-04-08 14:32:37 +02:00
Anatol Belski
9f0bfed435
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix memory leak at apprentice.c:1095
2013-04-08 12:50:25 +02:00
Anatol Belski
28e26b0fad
fix memory leak at apprentice.c:1095
2013-04-08 12:49:53 +02:00
Anatol Belski
30fc3ac6aa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed EOL
2013-04-08 09:21:06 +02:00
Anatol Belski
b0b81c0a37
fixed EOL
2013-04-08 09:20:43 +02:00
Anatol Belski
b12f79cafb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
upgraded libmagic to 5.14
2013-04-07 22:18:53 +02:00
Anatol Belski
10367fa7c6
upgraded libmagic to 5.14
2013-04-07 22:15:56 +02:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Anatoliy Belsky
f094723852
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
Conflicts:
NEWS
2012-11-27 16:55:47 +01:00
Anatoliy Belsky
d88017e992
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
Conflicts:
NEWS
ext/fileinfo/libmagic.patch
ext/fileinfo/tests/finfo_open_error-win32.phpt
2012-11-27 16:45:25 +01:00
Anatoliy Belsky
e6b727d3b7
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
2012-11-27 16:33:58 +01:00
Anatoliy Belsky
8a84b1b5d9
Backported the fix for bug #63248 from 5.4+
2012-11-23 13:58:22 +01:00
Xinchen Hui
6444eef27b
Update libmagic.patch
2012-10-19 11:14:14 +08:00
Xinchen Hui
0d7965f0a3
Merge the fix for #61964 to 5.3, which will fix #63304
2012-10-18 23:29:33 +08:00
Johannes Schlüter
36e60436db
Merge branch 'PHP-5.4'
2012-10-17 18:27:03 +02:00
Anatoliy Belsky
6d019deee2
Fixed bug #63248 Load multiple magic files on win
...
- adapt config.w32 to not to use dirent lib anymore
- prevent libmagic from opening a dir handle under win
- reimplement the dir iteration functionality with streams
2012-10-16 11:03:32 +02:00
Xinchen Hui
7e64681740
Merge branch 'PHP-5.4'
2012-09-11 11:44:33 +08:00
Xinchen Hui
328a3d9f13
regenerate patch, and save a strlen
2012-09-11 11:43:47 +08:00
Xinchen Hui
b5c2f532af
Merge branch 'PHP-5.4'
2012-09-10 23:11:28 +08:00
Xinchen Hui
0a25a0241e
Fix the wrong use of snprintf which is introduced in 1d2f619049
2012-09-10 23:08:54 +08:00
Felipe Pena
6583f36a17
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu
2012-07-28 19:05:53 -03:00
Felipe Pena
b26749b4e9
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu
2012-07-28 19:05:46 -03:00
Felipe Pena
068fc008c6
- Fixed bug #57933 (Wrong table type used in phpinfo output) patch by: selsky at columbia dot edu
2012-07-28 19:05:13 -03:00
Xinchen Hui
6d10bdff9f
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Update libmagic.patch
2012-07-15 18:27:29 +08:00
Xinchen Hui
c8f285d190
Update libmagic.patch
2012-07-15 18:25:58 +08:00
Stanislav Malyshev
bbb5eba871
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #61964 (finfo_open with directory cause invalid free)
2012-07-14 18:53:30 -07:00
Stanislav Malyshev
1916bb223e
Merge branch 'pull-request/91' into PHP-5.4
...
* pull-request/91:
Fixed bug #61964 (finfo_open with directory cause invalid free)
2012-07-14 18:52:24 -07:00
Anatoliy Belsky
9cfb176116
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fixed the test for warnings changed
2012-07-12 18:30:09 +02:00
Anatoliy Belsky
cf91b163e1
fixed the test for warnings changed
2012-07-12 18:24:38 +02:00
Johannes Schlüter
b025b9d0cf
Fix #62432 ReflectionMethod random corrupt memory on high concurrent
...
This fixes the same issue in multiple extensions. This isn't needed
in later branches as 5.4 introduced object_properties_init()
2012-06-27 23:26:33 +02:00
Anatoliy Belsky
b04e8145c9
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #62270 Test bug - ext/fileinfo/tests/finfo_open_error-win32
2012-06-14 18:01:23 +02:00
Anatoliy Belsky
3faebe2bec
Fix bug #62270 Test bug - ext/fileinfo/tests/finfo_open_error-win32
2012-06-14 17:59:39 +02:00
Anatoliy Belsky
9a9362cb09
Merge branch 'PHP-5.4'
...
* PHP-5.4:
updated the libmagic patch after Felipes regex fix
2012-05-29 17:42:35 +02:00
Anatoliy Belsky
6074da9809
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
updated the libmagic patch after Felipes regex fix
2012-05-29 17:41:57 +02:00
Anatoliy Belsky
8d5e953a19
updated the libmagic patch after Felipes regex fix
2012-05-29 17:38:30 +02:00
Anatoliy Belsky
3a35479e59
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
Bug #62177 deactivate the linux test version on win
Fix bug #62177 Test Bug - finfo_file_regex.phpt
2012-05-29 16:43:40 +02:00
Anatoliy Belsky
c0e046a130
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
Bug #62177 deactivate the linux test version on win
Fix bug #62177 Test Bug - finfo_file_regex.phpt
2012-05-29 16:43:20 +02:00
Matt Ficken
ad0371ac7e
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
2012-05-29 16:38:57 +02:00
Matt Ficken
b4b0aaae93
Bug #62177 deactivate the linux test version on win
2012-05-29 16:37:19 +02:00
Matt Ficken
dbc727373c
Fix bug #62177 Test Bug - finfo_file_regex.phpt
2012-05-29 16:31:47 +02:00
Reeze Xia
1d2f619049
Fixed bug #61964 (finfo_open with directory cause invalid free)
2012-05-25 18:55:34 +08:00
Felipe Pena
3bd0a52468
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Fixed magic file regex support
2012-05-24 13:43:53 -03:00
Felipe Pena
84b2c39920
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed magic file regex support
2012-05-24 13:43:35 -03:00
Felipe Pena
11b4f3becd
- Fixed magic file regex support
2012-05-24 13:42:47 -03:00
Anatoliy Belsky
da1b534601
Fix bug #61811 three of finfo tests failed, see also #61812 .
...
The remaining two was assidentially merged back from 5.4
2012-04-22 19:26:54 +02:00
Xinchen Hui
c530fd9536
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed warning implicit declaration of function 'file_printedlen'
2012-04-22 20:00:07 +08:00
Xinchen Hui
0d115ca211
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed warning implicit declaration of function 'file_printedlen'
2012-04-22 19:59:46 +08:00
Xinchen Hui
f13b0ede07
Fixed warning implicit declaration of function 'file_printedlen'
2012-04-22 19:52:07 +08:00
Xinchen Hui
1b1e91167e
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Update NEWS
Fixed bug #61812 (Uninitialised value used in libmagic)
2012-04-22 19:40:22 +08:00
Xinchen Hui
b225330707
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #61812 (Uninitialised value used in libmagic)
2012-04-22 19:39:02 +08:00
Xinchen Hui
c06e92a533
Fixed bug #61812 (Uninitialised value used in libmagic)
2012-04-22 19:38:14 +08:00
Anatoliy Belsky
94d4bb86b4
Merge branch 'PHP-5.4'
...
* PHP-5.4:
updated the libmagic.patch
Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails
- update to openssl 0.9.8u
- update to openssl 0.9.8u
2012-04-02 17:43:23 +02:00
Anatoliy Belsky
374646c36b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
updated the libmagic.patch
Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails
- update to openssl 0.9.8u
Conflicts:
ext/fileinfo/tests/finfo_open_001.phpt
ext/fileinfo/tests/finfo_open_error.phpt
win32/build/libs_version.txt
2012-04-02 17:36:50 +02:00
Anatoliy Belsky
8684fb7fac
updated the libmagic.patch
2012-04-02 17:27:23 +02:00
Anatoliy Belsky
909713e233
Bug #61566 Fileinfo ext\fileinfo\tests\finfo_file_002.phpt fails
...
This patch fixes the failure caused by the
posix lseek and read versions under windows in cdf_read() .
Additionally all the occurences of lseek and read
was replaced by _lseek and _reed for windows.
2012-04-02 17:22:46 +02:00
Anatoliy Belsky
0cdba53aae
Fix bug #61565 Fileinfo ext\fileinfo\tests\finfo_file_001.phpt fails
2012-04-02 17:19:09 +02:00
Anatoliy Belsky
17241a9983
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Bug 61504 updated libmagic.patch
Bug #61504 TSRML_FETCH() must be last
2012-03-28 12:11:29 +02:00
Anatoliy Belsky
4f23ee8f5e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Bug 61504 updated libmagic.patch
Bug #61504 TSRML_FETCH() must be last
2012-03-28 12:10:25 +02:00
Anatoliy Belsky
11f04c3524
Bug 61504 updated libmagic.patch
2012-03-28 12:06:09 +02:00
Anatoliy Belsky
e7fa402c7c
Bug #61504 TSRML_FETCH() must be last
2012-03-28 12:05:20 +02:00
Gustavo André dos Santos Lopes
067603106e
Restored the good part of 74ee335
that was just reverted.
2012-03-28 08:43:41 +01:00
Gustavo André dos Santos Lopes
c6e15455a3
Revert "- fix bug #61504 , fix build errors on windows and possibly other"
...
This reverts commit 74ee335e3a
.
2012-03-28 08:41:18 +01:00
Pierre Joye
13bd9c2c3d
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- fix bug #61504 , fix build errors on windows and possibly other
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
2012-03-28 02:15:02 +02:00
Pierre Joye
c195596280
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- fix bug #61504 , fix build errors on windows and possibly other
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
2012-03-28 02:11:06 +02:00
Pierre Joye
74ee335e3a
- fix bug #61504 , fix build errors on windows and possibly other
2012-03-28 01:59:41 +02:00
Pierre Joye
63e58b6f3f
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- fix test for 5.11
Fix bug #61504 , potential vuln. in fileinfo. update to 5.11
2012-03-27 14:02:35 +02:00
Pierre Joye
a8174653e3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- fix test for 5.11
Fix bug #61504 , potential vuln. in fileinfo. update to 5.11
2012-03-27 14:02:07 +02:00
Pierre Joye
d0e3289d12
- fix test for 5.11
2012-03-27 14:01:38 +02:00
Pierre Joye
12cf930a40
Fix bug #61504 , potential vuln. in fileinfo. update to 5.11
2012-03-27 13:34:46 +02:00
Xinchen Hui
f6e7320da8
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix test, which was broken by the fix for #61173
2012-03-22 17:18:16 +08:00
Xinchen Hui
2dbced096a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix test, which was broken by the fix for #61173
Conflicts:
ext/fileinfo/tests/finfo_open_error.phpt
2012-03-22 17:17:42 +08:00
Xinchen Hui
e96a172114
Fix test, which was broken by the fix for #61173
2012-03-22 17:10:03 +08:00
Stanislav Malyshev
5e80c05deb
MFH: Fixed bug #61173 (Unable to detect error from finfo constructor).
2012-03-07 07:38:57 +00:00
Stanislav Malyshev
f43330a371
remove -dev for release
2012-02-28 18:43:44 +00:00
Gustavo André dos Santos Lopes
48666d9ffc
- Fixed bug #61173 (Unable to detect error from finfo constructor).
...
- Tidied up NEWS
2012-02-24 10:01:39 +00:00
Gustavo André dos Santos Lopes
f434afe236
- Fixed bug #61173 (Unable to detect error from finfo constructor).
...
- Tidied up NEWS
2012-02-24 10:01:39 +00:00
Felipe Pena
e4ca0ed09f
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281
- Year++
2012-01-01 13:15:04 +00:00
Felipe Pena
90cd6482b3
- Fixed memory leak when calling the Finfo constructor twice
2011-11-23 01:20:49 +00:00
Felipe Pena
b6137f4cb1
- Fixed memory leak when calling the Finfo constructor twice
2011-11-23 01:20:49 +00:00
Felipe Pena
9a98ccff5e
- Fixed memory leak when calling the Finfo constructor twice
2011-11-23 01:20:49 +00:00
Felipe Pena
d881b055c8
- Fix the fix
2011-11-22 15:12:44 +00:00
Felipe Pena
72ad61733a
- Fix the fix
2011-11-22 15:12:44 +00:00
Felipe Pena
b370f94866
- Fix the fix
2011-11-22 15:12:44 +00:00
Felipe Pena
39d0c5e202
- Fixed possible memory leak in finfo_open()
2011-11-22 15:04:19 +00:00
Felipe Pena
8a4d75fe85
- Fixed possible memory leak in finfo_open()
2011-11-22 15:04:19 +00:00
Felipe Pena
718374ac2a
- Fixed possible memory leak in finfo_open()
2011-11-22 15:04:19 +00:00
Xinchen Hui
dc31f1e99e
Fixed bug #60094 (C++ comment fails in c89)
2011-10-19 15:08:50 +00:00
Xinchen Hui
b873f0ebf0
Fixed bug #60094 (C++ comment fails in c89)
2011-10-19 15:08:50 +00:00
Xinchen Hui
380a1ea142
Fixed bug #60094 (C++ comment fails in c89)
2011-10-19 15:08:50 +00:00
Xinchen Hui
991c018131
Update libmagic.patch (patch reversed base on -r296679)
2011-09-15 15:53:49 +00:00
Xinchen Hui
610fabf414
Update libmagic.patch (patch reversed base on -r296679)
2011-09-15 15:53:49 +00:00
Xinchen Hui
f265c5a573
Fix warning "implicit declaration of function `vasprintf'"
...
If There is a better fix, plz fixme.
2011-09-15 07:09:43 +00:00
Xinchen Hui
c32aa35d58
Fix warning "implicit declaration of function `vasprintf'"
...
If There is a better fix, plz fixme.
2011-09-15 07:09:43 +00:00
Xinchen Hui
1acb5b2b0c
Fix warning "implicit declaration of function `vasprintf'"
2011-09-14 02:19:22 +00:00
Xinchen Hui
872ff4f8c9
Fix warning "implicit declaration of function `vasprintf'"
2011-09-14 02:19:22 +00:00
Xinchen Hui
17ff990ef0
Fix warning "implicit declaration of function `vasprintf'"
2011-09-14 02:19:22 +00:00
Xinchen Hui
d09d0c83cb
Eliminated compiler's warnings and make static analyzer silent
2011-08-09 05:11:19 +00:00
Xinchen Hui
a60513240f
Eliminated compiler's warnings and make static analyzer silent
2011-08-09 05:11:19 +00:00
Xinchen Hui
956e163784
Eliminated compiler's warnings and make static analyzer silent
2011-08-09 05:11:19 +00:00
Xinchen Hui
fa161f96fa
Remove unnecessary(no sense) memset and making the static analyzer silent
2011-08-08 16:57:46 +00:00
Xinchen Hui
e21e854bc4
Remove unnecessary(no sense) memset and making the static analyzer silent
2011-08-08 16:57:46 +00:00
Xinchen Hui
61f80c9b08
Remove unnecessary(no sense) memset and making the static analyzer silent
2011-08-08 16:57:46 +00:00
Stanislav Malyshev
3b7cdd0227
fix failing tests
2011-08-01 01:00:57 +00:00
Stanislav Malyshev
553a08c4e1
fix failing tests
2011-08-01 01:00:57 +00:00
Pierre Joye
7b9071f71d
- do safemode/open basedir checks 1st, and use only expand not realpath (it is done by the safemode/openbasedir check already)
2011-07-27 14:58:30 +00:00
Pierre Joye
15383e046e
- do safemode/open basedir checks 1st, and use only expand not realpath (it is done by the safemode/openbasedir check already)
2011-07-27 14:58:30 +00:00
Felipe Pena
23e438594d
- Make usage of new PHP_FE_END macro
2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50
- Make usage of new PHP_FE_END macro
2011-07-25 11:35:02 +00:00
Felipe Pena
da376383e8
- Make usage of new PHP_FE_END macro
2011-07-25 11:35:02 +00:00
Felipe Pena
744ce6af65
- Fix test
2011-06-19 12:58:56 +00:00
Felipe Pena
6765a19d23
- Fix test
2011-06-19 12:58:56 +00:00
Felipe Pena
32b5f8a1a3
- Added new parameter parsing option (p - for valid path (string without null byte in the middle))
...
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
Felipe Pena
4737910b69
- Added new parameter parsing option (p - for valid path (string without null byte in the middle))
...
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
Felipe Pena
8199f8dcfc
- Fixed bug #54934 (Unresolved symbol strtoull in HP-UX 11.11)
2011-05-27 23:31:30 +00:00
Felipe Pena
3dcb256919
- Fixed bug #54934 (Unresolved symbol strtoull in HP-UX 11.11)
2011-05-27 23:31:30 +00:00
Felipe Pena
490b75d170
- Fixed bug #54934 (Unresolved symbol strtoull in HP-UX 11.11)
2011-05-27 23:31:30 +00:00
Hannes Magnusson
d1d61ce612
Bug#54016 (finfo_file() Cannot determine filetype in archives)
2011-02-14 15:32:02 +00:00
Hannes Magnusson
7c1a9e37ca
Bug#54016 (finfo_file() Cannot determine filetype in archives)
2011-02-14 15:32:02 +00:00
Felipe Pena
914152d6d8
- Year++
2011-01-01 02:51:27 +00:00
Felipe Pena
7ae96bcf35
- Year++
2011-01-01 02:51:18 +00:00
Pierre Joye
ce96fd6b07
- fix #39863 , do not accept paths with NULL in them. See http://news.php.net/php.internals/50191 , trunk will have the patch later (adding a macro and/or changing (some) APIs. Patch by Rasmus
2010-11-18 15:22:22 +00:00
Dmitry Stogov
c5237d82bf
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 14:11:39 +00:00
Pierre Joye
cdadeed834
- Fixed bug #51732 , Fileinfo __construct or open does not work with NULL
2010-05-04 08:48:58 +00:00
Pierre Joye
fdf0395e49
- Fixed bug #51732 , Fileinfo __construct or open does not work with NULL
2010-05-04 08:48:58 +00:00
Kalle Sommer Nielsen
cb30330800
Merge safe_mode changes into extensions that are in sync in both branches
2010-04-26 23:55:03 +00:00
Kalle Sommer Nielsen
dd8e59da8f
Removed safe_mode
...
* Removed ini options, safe_mode*
* Removed --enable-safe-mode --with-exec-dir configure options on Unix
* Updated extensions, SAPI's and core
* php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
2010-04-26 23:53:30 +00:00
Johannes Schlüter
26b08f9857
Remove main/php3_compat.h, for that a few references to function_entry
have
...
to be replaced by `zend_function_entry`.
2010-03-30 23:03:02 +00:00
Mikko Koppanen
0a445f4f08
Update the libmagic.patch to reflect the current situation. Contains a diff against upstream 5.03
2010-01-31 22:54:00 +00:00
Felipe Pena
0d5a318090
- Fixed ZTS build
2009-12-27 18:13:37 +00:00
Mikko Koppanen
1e6695feb7
spprintf the dbname
...
use VCWD_ACCESS instead of access
2009-12-27 00:43:33 +00:00
Mikko Koppanen
1496161f01
Upgrade bundled libmagic to 5.03 (fixes CDF parsing related issues)
...
Clean up / remove whitespace differences to make next merge easier
Removed unnecessary files from trunk
2009-12-26 15:00:21 +00:00
Pierre Joye
e0b392f028
- fix #49732 , fix crash when timestamp conversion fails
2009-10-01 13:55:16 +00:00
Scott MacVicar
a090cd733a
Fix BC break in mime_content_type()
2009-08-11 23:05:13 +00:00
Pierre Joye
68a3c3f952
- add license
2009-06-26 07:24:41 +00:00
Felipe Pena
219c2603bb
- MFH: Fixed bug #48578 (Can't build 5.3 on FBSD 4.11) (Rasmus)
2009-06-17 16:20:04 +00:00
Scott MacVicar
2d183dcc1d
MFH Update bundled libmagic to 5.03
2009-05-09 20:34:37 +00:00
Scott MacVicar
c48241a569
MFH Update libmagic data file to 5.02
2009-05-04 20:56:13 +00:00
Scott MacVicar
c3b88aec15
MFH Update libmagic to 5.02
2009-05-04 20:54:53 +00:00
Pierre Joye
8e202b40a0
- fix the build for win (vc6 or vc9)
...
- fix logic in time convertion
- force shared on windows, will fix the dirent issue later (no, it is not enough to simply remove the dep or header include)
- add myself before I forget again
2009-03-16 15:03:06 +00:00
Ilia Alshanetsky
ea27fd2ba3
Fixed compiler warnings
2009-03-16 12:52:39 +00:00
Scott MacVicar
e10b18693c
MFH fileinfo tests are missing skipif
2009-03-15 23:17:28 +00:00
Scott MacVicar
7a29c8f386
MFH Update fileinfo to libmagic 5.00 and remove dependency on dirent.h on Windows
2009-03-15 23:04:19 +00:00
Andrei Zmievski
d7b6f0103b
memset() requires a pointer.
2009-01-12 19:09:34 +00:00
Scott MacVicar
372256b002
MFH Remove all of the stuff we have in here for pre PHP 5.2 support and memset the fileinfo struct.
2008-12-22 16:45:07 +00:00
Derick Rethans
9d1eca8ee1
*** empty log message ***
2008-12-04 14:55:19 +00:00
Scott MacVicar
ceabdbb483
MFH Add asprintf, use regular system malloc and free and add checks in configure.in for the functions
2008-11-27 19:45:27 +00:00
Scott MacVicar
3a93ef37c4
MFH Warnings from libmagic should be notices rather than sent to stderr, this fixes a test on Windows
2008-11-22 10:29:05 +00:00
Felipe Pena
fc2fb50d09
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
2008-11-17 11:28:01 +00:00
Scott MacVicar
a94ac5d436
MFH: Fix buffer overread in libmagic and sync a skipped change from 4.26
2008-11-06 03:00:04 +00:00
Felipe Pena
7a37fa2d6b
- Revert ZEND_BEGIN_ARG_INFO change
2008-11-02 21:19:39 +00:00
Scott MacVicar
3e543f2464
MFH: Sync libmagic with 4.26 and add support for the new v6 magic file format
2008-11-02 16:13:49 +00:00
Felipe Pena
df10005563
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
2008-10-24 14:35:40 +00:00
Scott MacVicar
a8c8963bc0
MFH: Fix a stat on a null when the internal database is used.
2008-10-22 16:34:40 +00:00
Scott MacVicar
a6ec097f68
MFH: When using the internal database and there is an error it could try free some invalid things. This was causing a bus error on ppc.
2008-10-22 14:15:47 +00:00
Scott MacVicar
55a965f793
MFH Fix bug #46331 - The internal magic db is const memory and segfaults when you try to do byte swapping
...
on big endian machines. This fixes it by copying the memory for those processors, but this isn't ideal as
it wastes memory. Perhaps using a static cache would be better.
2008-10-20 23:36:14 +00:00
Pierre Joye
144527b190
- support for VC6 and some other platforms (before some other cleanup)
2008-10-20 14:45:59 +00:00
Ilia Alshanetsky
5a28412ad2
Removed dead-code
2008-10-15 22:56:57 +00:00