Mercurial Mercurial > sustaining > oi_151a > sfw-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
usr/src/cmd/php5/patches/php_6818228.patch
author Jon Tibble <meths@btinternet.com>
Mon, 04 May 2015 14:04:39 +0100
branchoi_151a
changeset 254 9c2a4ac793f0
parent 5 d07534556b03
permissions -rw-r--r--
Bash patch catchup including shellshock
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     1
 
--- php-5.2.11/ext/zlib/my_zlib.h	Thu Jan 25 04:13:36 2007
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     2
 
+++ php-5.2.11/ext/zlib/my_zlib.h	Tue Oct 20 13:55:01 2009
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     3
 
@@ -1180,8 +1180,8 @@
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     4
 
    degrade compression.
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     5
 
 */
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     6
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     7
 
-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     8
 
-                                      z_off_t offset, int whence));
5
d07534556b03 Import sfw build 131
Cyril Plisko <cyril.plisko@grigale.com>
parents: 2
diff changeset 
     9
 
+ZEXTERN int ZEXPORT      gzseek OF((gzFile file,
d07534556b03 Import sfw build 131
Cyril Plisko <cyril.plisko@grigale.com>
parents: 2
diff changeset 
    10
 
+                                      int offset, int whence));
2
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    11
 
 /*
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    12
 
       Sets the starting position for the next gzread or gzwrite on the
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    13
 
    given compressed file. The offset represents a number of bytes in the
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    14
 
@@ -1205,7 +1205,7 @@
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    15
 
    gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    16
 
 */
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    17
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    18
 
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
5
d07534556b03 Import sfw build 131
Cyril Plisko <cyril.plisko@grigale.com>
parents: 2
diff changeset 
    19
 
+ZEXTERN int ZEXPORT    gztell OF((gzFile file));
2
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    20
 
 /*
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    21
 
      Returns the starting position for the next gzread or gzwrite on the
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    22
 
    given compressed file. This position represents a number of bytes in the
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    23
 
@@ -1274,7 +1274,7 @@
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    24
 
 */
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    25
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    26
 
 ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    27
 
-                                          z_off_t len2));
5
d07534556b03 Import sfw build 131
Cyril Plisko <cyril.plisko@grigale.com>
parents: 2
diff changeset 
    28
 
+                                          int len2));
2
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    29
 
 /*
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    30
 
      Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    31
 
    and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    32
 
@@ -1298,7 +1298,7 @@
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    33
 
      if (crc != original_crc) error();
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    34
 
 */
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    35
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    36
 
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
5
d07534556b03 Import sfw build 131
Cyril Plisko <cyril.plisko@grigale.com>
parents: 2
diff changeset 
    37
 
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, int len2));
2
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    38
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    39
 
 /*
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    40
 
      Combine two CRC-32 check values into one.  For two sequences of bytes,
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    41
 
--- php-5.2.11/ext/zlib/php_zlib.h.ORIG	Tue Oct 20 13:56:27 2009
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    42
 
+++ php-5.2.11/ext/zlib/php_zlib.h	Tue Oct 20 13:56:38 2009
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    43
 
@@ -22,7 +22,7 @@
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    44
 
 #ifndef PHP_ZLIB_H
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    45
 
 #define PHP_ZLIB_H
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    46
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    47
 
-#include <zlib.h>
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    48
 
+#include "my_zlib.h"
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    49
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    50
 
 ZEND_BEGIN_MODULE_GLOBALS(zlib)
8f1801a322e9 Import sfw build 128
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    51
 
 	/* variables for transparent gzip encoding */
sustaining/oi_151a/sfw-gate