head 1.18; access; symbols pkgsrc-2013Q2:1.18.0.8 pkgsrc-2013Q2-base:1.18 pkgsrc-2012Q4:1.18.0.6 pkgsrc-2012Q4-base:1.18 pkgsrc-2011Q4:1.18.0.4 pkgsrc-2011Q4-base:1.18 pkgsrc-2011Q2:1.18.0.2 pkgsrc-2011Q2-base:1.18 pkgsrc-2009Q4:1.17.0.46 pkgsrc-2009Q4-base:1.17 pkgsrc-2009Q3:1.17.0.44 pkgsrc-2009Q3-base:1.17 pkgsrc-2009Q2:1.17.0.42 pkgsrc-2009Q2-base:1.17 pkgsrc-2009Q1:1.17.0.40 pkgsrc-2009Q1-base:1.17 pkgsrc-2008Q4:1.17.0.38 pkgsrc-2008Q4-base:1.17 pkgsrc-2008Q3:1.17.0.36 pkgsrc-2008Q3-base:1.17 cube-native-xorg:1.17.0.34 cube-native-xorg-base:1.17 pkgsrc-2008Q2:1.17.0.32 pkgsrc-2008Q2-base:1.17 cwrapper:1.17.0.30 pkgsrc-2008Q1:1.17.0.28 pkgsrc-2008Q1-base:1.17 pkgsrc-2007Q4:1.17.0.26 pkgsrc-2007Q4-base:1.17 pkgsrc-2007Q3:1.17.0.24 pkgsrc-2007Q3-base:1.17 pkgsrc-2007Q2:1.17.0.22 pkgsrc-2007Q2-base:1.17 pkgsrc-2007Q1:1.17.0.20 pkgsrc-2007Q1-base:1.17 pkgsrc-2006Q4:1.17.0.18 pkgsrc-2006Q4-base:1.17 pkgsrc-2006Q3:1.17.0.16 pkgsrc-2006Q3-base:1.17 pkgsrc-2006Q2:1.17.0.14 pkgsrc-2006Q2-base:1.17 pkgsrc-2006Q1:1.17.0.12 pkgsrc-2006Q1-base:1.17 pkgsrc-2005Q4:1.17.0.10 pkgsrc-2005Q4-base:1.17 pkgsrc-2005Q3:1.17.0.8 pkgsrc-2005Q3-base:1.17 pkgsrc-2005Q2:1.17.0.6 pkgsrc-2005Q2-base:1.17 pkgsrc-2005Q1:1.17.0.4 pkgsrc-2005Q1-base:1.17 pkgsrc-2004Q4:1.17.0.2 pkgsrc-2004Q4-base:1.17 pkgsrc-2004Q3:1.16.0.8 pkgsrc-2004Q3-base:1.16 pkgsrc-2004Q2:1.16.0.6 pkgsrc-2004Q2-base:1.16 pkgsrc-2004Q1:1.16.0.4 pkgsrc-2004Q1-base:1.16 pkgsrc-2003Q4:1.16.0.2 pkgsrc-2003Q4-base:1.16 netbsd-1-6-1:1.13.0.2 netbsd-1-6-1-base:1.13 netbsd-1-6:1.7.0.8 netbsd-1-6-RELEASE-base:1.7 pkgviews:1.7.0.4 pkgviews-base:1.7 buildlink2:1.7.0.2 buildlink2-base:1.7 netbsd-1-5-PATCH003:1.7 netbsd-1-5-PATCH001:1.3; locks; strict; comment @# @; 1.18 date 2010.02.10.18.08.33; author joerg; state dead; branches; next 1.17; 1.17 date 2004.12.09.14.50.23; author jlam; state Exp; branches; next 1.16; 1.16 date 2003.09.01.08.41.31; author jdolecek; state dead; branches; next 1.15; 1.15 date 2003.06.07.14.37.02; author cjep; state Exp; branches; next 1.14; 1.14 date 2003.06.03.19.17.20; author epg; state Exp; branches; next 1.13; 1.13 date 2003.01.12.14.31.58; author christos; state Exp; branches; next 1.12; 1.12 date 2003.01.08.01.52.44; author jlam; state Exp; branches; next 1.11; 1.11 date 2002.10.14.06.21.19; author martti; state Exp; branches; next 1.10; 1.10 date 2002.08.26.00.42.34; author grant; state Exp; branches; next 1.9; 1.9 date 2002.08.26.00.32.22; author grant; state Exp; branches; next 1.8; 1.8 date 2002.08.25.18.40.26; author jlam; state Exp; branches; next 1.7; 1.7 date 2002.02.28.06.14.47; author jlam; state Exp; branches 1.7.2.1; next 1.6; 1.6 date 2001.12.31.23.54.26; author jlam; state Exp; branches; next 1.5; 1.5 date 2001.10.16.04.54.24; author jlam; state Exp; branches; next 1.4; 1.4 date 2001.05.14.14.12.29; author jlam; state Exp; branches; next 1.3; 1.3 date 2001.03.14.00.10.00; author jlam; state Exp; branches; next 1.2; 1.2 date 2000.12.25.21.03.47; author jlam; state Exp; branches; next 1.1; 1.1 date 2000.12.17.18.59.44; author jlam; state Exp; branches; next ; 1.7.2.1 date 2002.06.21.23.02.55; author jlam; state Exp; branches; next ; desc @@ 1.18 log @Retire PHP 4. @ text @$NetBSD: patch-ad,v 1.17 2004/12/09 14:50:23 jlam Exp $ --- configure.orig 2004-09-20 18:31:33.000000000 -0400 +++ configure @@@@ -90314,13 +90314,8 @@@@ old_CC=$CC if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" + CFLAGS="$CFLAGS $ac_cv_pthreads_cflags" INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" - cat >meta_ccld<&2; exit 1; } fi - enable_experimental_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + enable_experimental_zts=no + else + enable_experimental_zts=yes fi @@@@ -3772,9 +3773,10 @@@@ php_build_target=shared - enable_experimental_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + enable_experimental_zts=no + else + enable_experimental_zts=yes fi echo "$ac_t""yes" 1>&6 @@@@ -3794,6 +3796,7 @@@@ PHP_VAR_SUBST="$PHP_VAR_SUBST APXS" + INCLUDES="$INCLUDES `apr-config --includes`" @@@@ -3951,9 +3954,10 @@@@ *** Pike include dir(s) used: $PIKE_INCLUDE_DIR *** Pike version: $PIKE_VERSION" - enable_experimental_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + enable_experimental_zts=no + else + enable_experimental_zts=yes fi @@@@ -4304,9 +4308,10 @@@@ fi test -f "$ZEUSPATH/web/include/httpext.h" || { echo "configure: error: Unable to find httpext.h in $ZEUSPATH/web/include" 1>&2; exit 1; } - enable_experimental_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + enable_experimental_zts=no + else + enable_experimental_zts=yes fi cat >> confdefs.h <<\EOF @@@@ -4424,9 +4429,10 @@@@ fi - enable_experimental_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + enable_experimental_zts=no + else + enable_experimental_zts=yes fi cat >> confdefs.h <<\EOF @@@@ -4454,9 +4460,10 @@@@ { echo "configure: error: You did not specify a directory" 1>&2; exit 1; } fi - enable_experimental_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + enable_experimental_zts=no + else + enable_experimental_zts=yes fi PHTTPD_DIR=$withval @@@@ -4565,9 +4572,10 @@@@ fi test -f "$PI3PATH/PiAPI/PiAPI.h" || { echo "configure: error: Unable to find PiAPI.h in $PI3PATH/PiAPI" 1>&2; exit 1; } - enable_experimental_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + enable_experimental_zts=no + else + enable_experimental_zts=yes fi cat >> confdefs.h <<\EOF @@@@ -4855,9 +4863,10 @@@@ php_build_target=shared - enable_experimental_zts=yes if test "$pthreads_working" != "yes"; then - { echo "configure: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." 1>&2; exit 1; } + enable_experimental_zts=no + else + enable_experimental_zts=yes fi echo "$ac_t""yes" 1>&6 @@@@ -5396,10 +5405,6 @@@@ fi -if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then - CPPFLAGS="$CPPFLAGS -I/usr/pkg/include" - LDFLAGS="$LDFLAGS -L/usr/pkg/lib" -fi INCLUDES="$INCLUDES -I\$(top_builddir)/Zend" test -d /usr/ucblib && if test "/usr/ucblib" != "/usr/lib"; then @@@@ -26847,19 +26852,10 @@@@ else - cat >> confdefs.h <<\EOF -#define HYPERWAVE 0 -EOF - echo "$ac_t""no" 1>&6 fi else - - cat >> confdefs.h <<\EOF -#define HYPERWAVE 0 d15 2 a16 31 - echo "$ac_t""no" 1>&6 fi @@@@ -67729,8 +67725,8 @@@@ if test "$lib_build_shared" != "yes"; then enable_shared=no fi - PHP_COMPILE='$(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -c $< && touch $@@' - CXX_PHP_COMPILE='$(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) -c $< && touch $@@' + PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<' + CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<' ;; shared) enable_static=no @@@@ -72831,7 +72827,7 @@@@ TSRM_LIB='TSRM/libtsrm.la' TSRM_DIR=TSRM -CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/TSRM" +INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then cat >> confdefs.h <<\EOF @@@@ -73625,7 +73621,7 @@@@ if test "$enable_debug" != "yes"; then - LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' + LIBTOOL='$(SHELL) $(top_builddir)/libtool' d19 1 @ 1.15 log @Add NetBSD RCS tags. @ text @d1 1 a1 1 $NetBSD$ @ 1.14 log @Teach ap2-perl and ap2-php4 how to find apr's includes. They need to find this separately now that apr is provided in a separate package. @ text @d1 1 @ 1.13 log @PR/19207, PR/19681, PR/19367: package does not compile because threads are required for ZTS. Disable ZTS if no threads. @ text @d1 2 a2 4 $NetBSD$ --- configure.orig Thu Sep 5 19:40:53 2002 +++ configure Sun Jan 12 09:17:58 2003 d29 9 a37 1 @@@@ -3951,9 +3953,10 @@@@ d50 1 a50 1 @@@@ -4304,9 +4307,10 @@@@ d63 1 a63 1 @@@@ -4424,9 +4428,10 @@@@ d76 1 a76 1 @@@@ -4454,9 +4459,10 @@@@ d89 1 a89 1 @@@@ -4565,9 +4571,10 @@@@ d102 1 a102 1 @@@@ -4855,9 +4862,10 @@@@ d115 1 a115 1 @@@@ -5396,10 +5404,6 @@@@ d126 1 a126 1 @@@@ -26847,19 +26851,10 @@@@ d146 1 a146 1 @@@@ -67729,8 +67724,8 @@@@ d157 1 a157 1 @@@@ -72831,7 +72826,7 @@@@ d166 1 a166 1 @@@@ -73625,7 +73620,7 @@@@ @ 1.12 log @Make php4 and ap-php4 actually use our libtool again. @ text @d3 107 a109 3 --- configure.orig Thu Sep 5 16:40:53 2002 +++ configure @@@@ -5396,10 +5396,6 @@@@ EOF d120 1 a120 1 @@@@ -26847,19 +26843,10 @@@@ EOF d140 1 a140 1 @@@@ -67729,8 +67716,8 @@@@ program|static) d151 1 a151 1 @@@@ -72831,7 +72818,7 @@@@ esac d160 1 a160 1 @@@@ -73625,7 +73612,7 @@@@ fi @ 1.11 log @Updated php to 4.2.3 * lots of bug fixes * experimental apache2 support * added IPv6 support to gethostbyaddr() ATTENTION!! register_globals defaults to 'off' now @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.10 2002/08/26 00:42:34 grant Exp $ d3 3 a5 3 --- configure.orig Thu Sep 5 23:40:53 2002 +++ configure Sat Oct 12 09:27:49 2002 @@@@ -5396,10 +5396,6 @@@@ d16 1 a16 1 @@@@ -26847,19 +26843,10 @@@@ d36 12 a47 1 @@@@ -72831,7 +72818,7 @@@@ d56 1 a56 1 @@@@ -73625,7 +73612,7 @@@@ @ 1.10 log @backout previous, the problem seems to lie with our Apache pkg on Solaris. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.8 2002/08/25 18:40:26 jlam Exp $ d3 4 a6 3 --- configure.orig Wed Feb 27 04:18:32 2002 +++ configure @@@@ -5138,11 +5138,6 @@@@ a8 1 a12 1 - d14 3 a16 14 @@@@ -16148,10 +16143,6 @@@@ else echo "$ac_t""no" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_DBA 0 -EOF - fi @@@@ -23572,19 +23563,10 @@@@ d36 1 a36 1 @@@@ -58680,7 +58662,7 @@@@ d45 1 a45 1 @@@@ -63418,7 +63400,7 @@@@ @ 1.9 log @fix configure problem on Solaris while calling apxs. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- configure.orig Wed Feb 27 20:18:32 2002 d5 1 a5 19 @@@@ -3074,7 +3074,7 @@@@ if test "${with_apxs+set}" = set; then if test "$withval" = "yes"; then APXS=apxs - $APXS -q CFLAGS >/dev/null 2>&1 + $APXS -q CFLAGS= >/dev/null 2>&1 if test "$?" != "0" && test -x /usr/sbin/apxs; then #SUSE 6.x APXS=/usr/sbin/apxs fi @@@@ -3092,7 +3092,7 @@@@ if test "${with_apxs+set}" = set; then fi - $APXS -q CFLAGS >/dev/null 2>&1 + $APXS -q CFLAGS= >/dev/null 2>&1 if test "$?" != "0"; then echo "$ac_t""" 1>&6 echo "$ac_t""" 1>&6 @@@@ -5138,11 +5138,6 @@@@ EOF d17 1 a17 1 @@@@ -16148,10 +16143,6 @@@@ EOF d28 1 a28 1 @@@@ -23572,19 +23563,10 @@@@ EOF d48 1 a48 1 @@@@ -58680,7 +58662,7 @@@@ esac d57 1 a57 1 @@@@ -63418,7 +63400,7 @@@@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo @ 1.8 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.7.2.1 2002/06/21 23:02:55 jlam Exp $ d3 1 a3 1 --- configure.orig Wed Feb 27 04:18:32 2002 d5 19 a23 1 @@@@ -5138,11 +5138,6 @@@@ d35 1 a35 1 @@@@ -16148,10 +16143,6 @@@@ d46 1 a46 1 @@@@ -23572,19 +23563,10 @@@@ d66 1 a66 1 @@@@ -58680,7 +58662,7 @@@@ d75 1 a75 1 @@@@ -63418,7 +63400,7 @@@@ @ 1.7 log @Update php4 and ap-php4 to 4.1.2. Changes from version 4.1.1 include: - Fixed start up failure when mm save handler is used and there is multiple SAPIs are working at the same time. (Yasuo) - Fixed a buffer overflow in the RFC-1867 file upload code (Stefan) <===> SECURITY NOTE <===> Note that the buffer overflow fix is a major security fix. Quoting from the security advisory at: http://security.e-matters.de/advisories/012002.html "PHP supports multipart/form-data POST requests (as described in RFC1867) known as POST fileuploads. Unfourtunately there are several flaws in the php_mime_split function that could be used by an attacker to execute arbitrary code. During our research we found out that not only PHP4 but also older versions from the PHP3 tree are vulnerable. [...] "If you are running PHP 4.0.3 or above one way to workaround these bugs is to disable the fileupload support within your php.ini (file_uploads = Off). If you are running php as module keep in mind to restart the webserver. Anyway you should better install the fixed or a properly patched version to be safe." @ text @d1 1 a1 1 $NetBSD$ d48 9 @ 1.7.2.1 log @Convert to use the buildlink2 framework and fix the configure script so that the correct make variable gets -I$(top_builddir)/TSRM and won't interfere with invoking the compiler for tests during the configure process. @ text @a47 9 @@@@ -58680,7 +58662,7 @@@@ TSRM_LIB='TSRM/libtsrm.la' TSRM_DIR=TSRM -CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/TSRM" +INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM" if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then cat >> confdefs.h <<\EOF @ 1.6 log @Update www/php4 to 4.1.0. Major changes from version 4.0.6 include: - Introduced a new $_REQUEST array, which includes any GET, POST or COOKIE variables. Like the other new variables, this variable is also available regardless of the context. - Introduced $_GET, $_POST, $_COOKIE, $_SERVER and $_ENV variables, which deprecate the old $HTTP_*_VARS arrays. In addition to be much shorter to type - these variables are also available regardless of the scope, and there's no need to import them using the 'global' statement. Other relevant changes include: - Bug fixes to prevent crashes on unexpected input. - Huge performance improvements, especially in thread-safe code. - Introduced extension version numbers. - Added support for single dimensional SafeArrays and Enumerations. Added an is_enum() function to check if a component implements an enumeration. - Improved speed of the serializer/deserializer. - Floating point numbers are better detected when converting from strings. - Added import_request_variables(), to allow users to safely import form variables to the global scope - Add config option (always_populate_raw_post_data) which when enabled will always populate $HTTP_RAW_POST_DATA regardless of the post mime type - Added getmygid() and safe_mode_gid ini directive to allow safe mode to do a gid check instead of a uid check. - Assigning to a string offset beyond the end of the string now automatically increases the string length by padding it with spaces, and performs the assignment. @ text @d3 1 a3 1 --- configure.orig Sat Dec 8 14:40:35 2001 d5 1 a5 1 @@@@ -5132,11 +5132,6 @@@@ d17 1 a17 1 @@@@ -16142,10 +16137,6 @@@@ d28 1 a28 1 @@@@ -23549,19 +23540,10 @@@@ d48 1 a48 1 @@@@ -63204,7 +63186,7 @@@@ @ 1.5 log @Update ap-php and php to 4.0.6. Changes from version 4.0.5 include: - Bug fixes (memory leaks and other errors) - Made $HTTP_SESSION_VARS['foo'] and $foo be references to the same value when register_globals is on. (Andrei) - Added is_callable() function that can be used to find out whether its argument is a valid callable construct. (Andrei) - Added pg_last_notice() function. (Rasmus from suggestion by Dirk@@rackspace.com) - Added support to getimagesize to return dimensions of BMP and PSD files. (Derick) - Added Japanese multibyte string functions support. (Rui) - Added key_exists() to check if a given key or index exists in an array or object. (David Croft) - Added -C command-line option to avoid chdir to the script's directory. (Stig) - printf argnum (parameter swapping) support. (Morten Poulsen, Rasmus) - Modified get_parent_class() and get_class_methods() to accept a class name as well as a class instance. (Andrei, Zend Engine) - Added array_map() function that applies a callback to the elements of given arrays and returns the result. It can also be used with a null callback to transpose arrays. (Andrei) - Added array_filter(), which allows filtering of array elements via the specified callback. (Andrei) @ text @d3 1 a3 1 --- configure.orig Thu Jun 21 02:28:57 2001 d5 13 a17 1 @@@@ -14903,10 +14903,6 @@@@ d28 1 a28 1 @@@@ -21394,19 +21390,10 @@@@ d48 1 a48 1 @@@@ -55797,7 +55784,7 @@@@ a54 11 fi @@@@ -55815,8 +55802,8 @@@@ $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool' else - PHP_COMPILE='$(COMPILE) -c $< && touch $@@' - CXX_PHP_COMPILE='$(CXX_COMPILE) -c $< && touch $@@' + PHP_COMPILE='$(LIBTOOL) --mode=compile $(COMPILE) -c $<' + CXX_PHP_COMPILE='$(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $<' fi @ 1.4 log @Update php4 and modules to 4.0.5. Changes from version 4.0.4.1nb1 include many general bugfixes, important fixes to the pgsql module to support PostgreSQL transactions correctly, speedups, and a zlib output compressor. @ text @d3 3 a5 4 --- ext/imap/php_imap.c.orig Tue Apr 24 10:17:41 2001 +++ ext/imap/php_imap.c @@@@ -427,7 +427,11 @@@@ ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL) d7 48 a55 9 -#if 1 +/* + * Use the installed c-client linkage.c to determine which drivers and + * authenticators are linked in. + */ +#if 0 #ifndef PHP_WIN32 mail_link(&unixdriver); /* link in the unix driver */ #endif @ 1.3 log @Update php4-imap to 4.0.4.1nb2. The only change from version 4.0.4.1nb1 is a security fix for a buffer overflow problem. The fix was provided in private email by Anil Madhavapeddy . @ text @d3 1 a3 1 --- ext/imap/php_imap.c.orig Wed Oct 25 13:43:52 2000 d5 1 a5 21 @@@@ -183,7 +183,19 @@@@ void mail_close_it(zend_rsrc_list_entry *rsrc) { pils *imap_le_struct = (pils *)rsrc->ptr; + IMAPLS_FETCH(); + mail_close_full(imap_le_struct->imap_stream, imap_le_struct->flags); + + if (IMAPG(imap_user)) { + efree(IMAPG(imap_user)); + IMAPG(imap_user) = 0; + } + if (IMAPG(imap_password)) { + efree(IMAPG(imap_password)); + IMAPG(imap_password) = 0; + } + efree(imap_le_struct); } @@@@ -392,7 +404,11 @@@@ a17 56 @@@@ -633,6 +649,14 @@@@ } } + if (IMAPG(imap_user)) { + efree(IMAPG(imap_user)); + } + + if (IMAPG(imap_password)) { + efree(IMAPG(imap_password)); + } + IMAPG(imap_user) = estrndup(Z_STRVAL_PP(user), Z_STRLEN_PP(user)); IMAPG(imap_password) = estrndup(Z_STRVAL_PP(passwd), Z_STRLEN_PP(passwd)); @@@@ -712,6 +736,8 @@@@ } } efree(hashed_details); + efree(IMAPG(imap_user)); IMAPG(imap_user) = 0; + efree(IMAPG(imap_password)); IMAPG(imap_password) = 0; RETURN_FALSE; } @@@@ -721,6 +747,8 @@@@ node = malloc(sizeof(pils)); if (node == NULL) { efree(hashed_details); + efree(IMAPG(imap_user)); IMAPG(imap_user) = 0; + efree(IMAPG(imap_password)); IMAPG(imap_password) = 0; RETURN_FALSE; } @@@@ -757,6 +785,8 @@@@ free(headp); efree(hashed_details); + efree(IMAPG(imap_user)); IMAPG(imap_user) = 0; + efree(IMAPG(imap_password)); IMAPG(imap_password) = 0; RETURN_FALSE; } @@@@ -766,11 +796,11 @@@@ } else { #endif imap_stream = mail_open(NIL, Z_STRVAL_PP(mailbox), flags); - efree(IMAPG(imap_user)); - efree(IMAPG(imap_password)); if (imap_stream == NIL) { php_error(E_WARNING, "Couldn't open stream %s\n", (*mailbox)->value.str.val); + efree(IMAPG(imap_user)); IMAPG(imap_user) = 0; + efree(IMAPG(imap_password)); IMAPG(imap_password) = 0; RETURN_FALSE; } @ 1.2 log @Update php4 to the latest stable release 4.0.4. Relevant changes from version 4.0.3 include many bugfixes (including one bad interaction with mod_perl which caused segfaults) and additions of several new functions. Several new PHP modules were also added to the main distribution, including new database extensions and OpenSSL, and some bugs with improperly closing database connections was fixed. @ text @d5 21 a25 1 @@@@ -392,7 +392,11 @@@@ d38 56 @ 1.1 log @Use the installed c-client linkage.c to determine which drivers and authenticators are linked into the imap extension module. @ text @d3 1 a3 1 --- ext/imap/php_imap.c.orig Sat Sep 9 16:26:15 2000 d5 1 a5 1 @@@@ -389,7 +389,11 @@@@ @