usr/src/cmd/php5/patches/php_6818228.patch
author Cyril Plisko <cyril.plisko@grigale.com>
Sat, 16 Jan 2010 18:11:20 +0200
changeset 5 d07534556b03
parent 2 8f1801a322e9
permissions -rw-r--r--
Import sfw build 131 Bugs Fixed ---------- 6818295 [nvb110] Mysql server core dump when running tests 'execution_constants' 6826438 Update S-Lang to version 2.2.2 6865279 guile-config configures with guile 6886529 fixed rrset-order is not enabled in BIND 9.6.1 as was the intention. 6891703 Tor should use newer release 6891913 deliver httpd conf file for PHP integration via FastCGI when mod_php can't be used 6893187 CVE-2009-2820 Web Interface of CUPS 1.4.1 is susceptible to Cross-Site Scripting and CRLF injection 6899209 Compile zend_execute.c with -W2,-Ainline:inc=100 for performance gains. 6900557 CVE-2009-3553 cupsd crash due to a pointer use-after-free flaw 6902877 [nvb127] subselect test generates crash of the server. 6902912 DNS Cache Poisoning 6903940 [nvb127] zlib extension not delivered 6905246 CUPS upgrade to 1.4.2 6905928 PostgreSQL 8.2, 8.3 Makefiles need some love 6907454 apache22 fcgid fails to load, daemon starts, stops and restarts ad nauseum 6908140 gpgconf and gpgme-config report incorrect pathnames 6908543 sfw updates expose new package dependencies 6908980 bad links for /usr/postgres/8.3/share/locale(s) in osol_128a for SUNWpostgr-83-libs 6909121 SFW METADATA files need updates for SUPPORT data 6909137 cups 1.4.2 does not deliver dbus notifier 6909139 Update PostgreSQL to 8.3.9 6909140 Update PostgreSQL to 8.2.15 6909141 Update PostgreSQL to 8.4.2 6909592 print/service-selector races with manifest-import 6910254 upgrade php to 5.2.12 6910945 Tomcat shouldn't give 404 when SUNWtcat-examples is not installed 6911455 gpgconf still reports wrong directory for libexec 6911767 back port 6.0 php dtrace to track object creation in php 5.2 6911775 Wireshark update to version 1.2.5 6912139 seek return value can be -1 within zlib streams 6912354 core dump while running ldap_next_reference functions 6912643 add libproxy support to 64-bit libneon 6913465 opensolaris b130 PHP problems with session_start();

--- php-5.2.11/ext/zlib/my_zlib.h	Thu Jan 25 04:13:36 2007
+++ php-5.2.11/ext/zlib/my_zlib.h	Tue Oct 20 13:55:01 2009
@@ -1180,8 +1180,8 @@
    degrade compression.
 */
 
-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-                                      z_off_t offset, int whence));
+ZEXTERN int ZEXPORT      gzseek OF((gzFile file,
+                                      int offset, int whence));
 /*
       Sets the starting position for the next gzread or gzwrite on the
    given compressed file. The offset represents a number of bytes in the
@@ -1205,7 +1205,7 @@
    gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
 */
 
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+ZEXTERN int ZEXPORT    gztell OF((gzFile file));
 /*
      Returns the starting position for the next gzread or gzwrite on the
    given compressed file. This position represents a number of bytes in the
@@ -1274,7 +1274,7 @@
 */
 
 ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
+                                          int len2));
 /*
      Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
    and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
@@ -1298,7 +1298,7 @@
      if (crc != original_crc) error();
 */
 
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, int len2));
 
 /*
      Combine two CRC-32 check values into one.  For two sequences of bytes,
--- php-5.2.11/ext/zlib/php_zlib.h.ORIG	Tue Oct 20 13:56:27 2009
+++ php-5.2.11/ext/zlib/php_zlib.h	Tue Oct 20 13:56:38 2009
@@ -22,7 +22,7 @@
 #ifndef PHP_ZLIB_H
 #define PHP_ZLIB_H
 
-#include <zlib.h>
+#include "my_zlib.h"
 
 ZEND_BEGIN_MODULE_GLOBALS(zlib)
 	/* variables for transparent gzip encoding */