com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/fileinfo/libmagic.patch ext/fileinfo/libmagic/apprentice.c
ext/fileinfo/tests/finfo_open_error.phpt
| From: | Anatoliy Belsky | Date: | Tue, 27 Nov 2012 15:45:25 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.3' into PHP-5.4: NEWS ext/fileinfo/libmagic.patch ext/fileinfo/libmagic/apprentice.c ext/fileinfo/tests/finfo_open_error.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70604@lists.php.net to get a copy of this message | ||
Commit: d88017e992d03dc6909b1a1c120668b90f52ae39
Author: Anatoliy Belsky <ab@php.net> Tue, 27 Nov 2012 16:45:25 +0100
Parents: e0ad33c24aa874dd31053829414f45a9d95ad46a e6b727d3b7eef06d8b7b6a4638a95e7a571d97b5
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d88017e992d03dc6909b1a1c120668b90f52ae39
Log:
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
Bugs:
https://bugs.php.net/63590
Changed paths:
MM NEWS
MM ext/fileinfo/libmagic.patch
MM ext/fileinfo/libmagic/apprentice.c
MM ext/fileinfo/tests/finfo_open_error.phpt
Diff:
diff --cc NEWS
index e587eb6,eb4238a..d5a63c9
--- a/NEWS
+++ b/NEWS
@@@ -6,22 -8,21 +6,26 @@@ PH
. Fixed bug #63468 (wrong called method as callback with inheritance).
(Laruence)
-- Core:
- . Fixed bug #63451 (config.guess file does not have AIX 7 defined,
- shared objects are not created). (kemcline at au1 dot ibm dot com)
+- Imap:
+ . Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array (Remi)
-- Apache2 Handler SAPI:
- . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
+- Json:
+ . Fixed bug #63588 use php_next_utf8_char and remove duplicate
+ implementation. (Remi)
+
+- mysqli:
+ . Fixed bug #63361 missing header. (Remi)
+ - Fileinfo:
- . Fixed bug #63248 (Load multiple magic files from a directory under Windows).
- (Anatoliy)
+ . Fixed bug #63590 (Different results in TS and NTS under Windows).
+ (Anatoliy)
+
-- Imap:
- . Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array (Remi)
+- Pdo_sqlite:
+ . Fixed Bug #63149 getColumnMeta should return the table name
+ when system SQLite used. (Remi)
+
+- Apache2 Handler SAPI:
+ . Enabled Apache 2.4 configure option for Windows (Pierre, Anatoliy)
- Reflection:
. Fixed Bug #63614 (Fatal error on Reflection). (Laruence)
diff --cc ext/fileinfo/libmagic.patch
index ecb178f,9be317b..ded9490
--- a/ext/fileinfo/libmagic.patch
+++ b/ext/fileinfo/libmagic.patch
@@@ -1,6 -1,6 +1,6 @@@
- diff -u libmagic.origin/apprentice.c libmagic/apprentice.c
- --- libmagic.origin/apprentice.c Sat Dec 17 18:17:18 2011
- +++ libmagic/apprentice.c Tue Oct 16 10:21:49 2012
+ diff -u libmagic.orig/apprentice.c libmagic/apprentice..c
+ --- libmagic.orig/apprentice.c Sat Dec 17 18:17:18 2011
-+++ libmagic/apprentice.c Tue Nov 27 16:25:57 2012
+++++ libmagic/apprentice.c Tue Nov 27 16:35:47 2012
@@ -29,6 +29,8 @@
* apprentice - make one pass through /etc/magic, learning its secrets.
*/
@@@ -269,11 -269,11 +269,11 @@@
+ size_t lineno = 0;
+
+ php_stream *stream;
+++
+++ TSRMLS_FETCH();
- FILE *f = fopen(ms->file = fn, "r");
- if (f == NULL) {
--+ TSRMLS_FETCH();
--+
+#if PHP_API_VERSION < 20100412
+ stream = php_stream_open_wrapper((char *)fn, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE,
NULL);
+#else
@@@ -765,7 -765,7 +765,7 @@@
if (strip) {
if ((p = strrchr(fn, '/')) != NULL)
- @@ -2370,14 +2406,14 @@
-@@ -2370,14 +2405,18 @@
++@@ -2370,14 +2406,18 @@
q++;
/* Compatibility with old code that looked in .mime */
if (ms->flags & MAGIC_MIME) {
@@@ -784,7 -788,7 +788,7 @@@
/* Compatibility with old code that looked in .mime */
if (strstr(p, ".mime") != NULL)
- @@ -2467,7 +2503,7 @@
-@@ -2467,7 +2506,7 @@
++@@ -2467,7 +2507,7 @@
m->offset = swap4((uint32_t)m->offset);
m->in_offset = swap4((uint32_t)m->in_offset);
m->lineno = swap4((uint32_t)m->lineno);
@@@ -2336,10 -2340,10 +2340,10 @@@ diff -u libmagic.orig/magic.h libmagic/
int magic_list(magic_t, const char *);
int magic_errno(magic_t);
- diff -u libmagic.origin/print.c libmagic/print.c
- --- libmagic.origin/print.c Tue Sep 20 17:28:09 2011
- +++ libmagic/print.c Tue Oct 16 10:13:39 2012
+ diff -u libmagic.orig/print.c libmagic/print.c
+ --- libmagic.orig/print.c Tue Sep 20 17:28:09 2011
-+++ libmagic/print.c Tue Nov 27 16:24:35 2012
-@@ -29,6 +29,9 @@
+++++ libmagic/print.c Tue Nov 27 16:34:56 2012
+@@ -29,12 +29,16 @@
* print.c - debugging printout routines
*/