| author | Craig Mohrman <craig.mohrman@oracle.com> |
| Tue, 03 Feb 2015 15:20:15 -0800 | |
| changeset 3727 | 425608dcd0e3 |
| parent 1984 | components/php-5_3/php-sapi/patches/172_php_zlib.patch@00f4f2142725 |
| permissions | -rw-r--r-- |
|
1984
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
Patch origin: upstream |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
Patch status: unclear; patch attached to bug |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
https://bugs.php.net/bug.php?id=53829 |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
|
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
--- php-5.3.17/ext/zlib/zlib.c |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
+++ php-5.3.17/ext/zlib/zlib.c |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
@@ -58,6 +58,18 @@ |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
# endif |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
#endif |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
|
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
+/* |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+ * zlib include files can define the following preprocessor defines which rename |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
+ * the corresponding PHP functions to gzopen64, gzseek64 and gztell64 and thereby |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
+ * breaking some software, most notably PEAR's Archive_Tar, which halts execution |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
+ * without error message on gzip compressed archivesa. |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
+ * |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
+ * This only seems to happen on 32bit systems with large file support. |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
+ */ |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
+#undef gzopen |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
+#undef gzseek |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
+#undef gztell |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
+ |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
#if defined(HAVE_UNISTD_H) && defined(PHP_WIN32) |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
# undef HAVE_UNISTD_H |
|
00f4f2142725
18938882 PHP 5.2 and 5.3 need some changes to build with zlib 1.2.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
#endif |