sniper Sun Oct 9 16:39:48 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/ftp config.m4
/php-src NEWS
Log:
MFH: - Fixed bug #34796 (missing SSL linking in ext/ftp when configured as
shared).
http://cvs.php.net/diff.php/php-src/ext/ftp/config.m4?r1=1.7&r2=1.7.20.1&ty=u
Index: php-src/ext/ftp/config.m4
diff -u php-src/ext/ftp/config.m4:1.7 php-src/ext/ftp/config.m4:1.7.20.1
--- php-src/ext/ftp/config.m4:1.7 Tue Mar 12 11:18:33 2002
+++ php-src/ext/ftp/config.m4 Sun Oct 9 16:39:42 2005
@@ -1,11 +1,19 @@
dnl
-dnl $Id: config.m4,v 1.7 2002/03/12 16:18:33 sas Exp $
+dnl $Id: config.m4,v 1.7.20.1 2005/10/09 20:39:42 sniper Exp $
dnl
PHP_ARG_ENABLE(ftp,whether to enable FTP support,
[ --enable-ftp Enable FTP support])
+PHP_ARG_WITH(openssl-dir,OpenSSL dir for SNMP,
+[ --with-openssl-dir[=DIR] SNMP: openssl install prefix], no, no)
+
if test "$PHP_FTP" = "yes"; then
AC_DEFINE(HAVE_FTP,1,[Whether you want FTP support])
PHP_NEW_EXTENSION(ftp, php_ftp.c ftp.c, $ext_shared)
+
+ if test "$PHP_OPENSSL" != "no" || test "$PHP_OPENSSL_DIR" != "no"; then
+ PHP_SETUP_OPENSSL(FTP_SHARED_LIBADD)
+ PHP_SUBST(FTP_SHARED_LIBADD)
+ fi
fi
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.105&r2=1.2027.2.106&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.105 php-src/NEWS:1.2027.2.106
--- php-src/NEWS:1.2027.2.105 Sun Oct 9 15:00:33 2005
+++ php-src/NEWS Sun Oct 9 16:39:42 2005
@@ -43,6 +43,8 @@
- Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
- Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
(Andrey)
+- Fixed bug #34796 (missing SSL linking in ext/ftp when configured as shared).
+ (Patch by: glen at delfi dot ee)
- Fixed bug #34788 (SOAP Client not applying correct namespace to generated
values). (Dmitry)
- Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
