View | Details | Raw Unified | Return to bug 34841
Collapse All | Expand All

(-)mod_php4/files/patch-ext_cyrus_config.m4 (+11 lines)
Line 0 Link Here
1 
--- ext/cyrus/config.m4~	Mon Feb 11 16:37:17 2002
2 
+++ ext/cyrus/config.m4	Mon Feb 11 16:37:29 2002
3 
@@ -14,7 +14,7 @@
4 
 			PHP_ADD_LIBRARY_WITH_PATH(cyrus, $i/lib, CYRUS_SHARED_LIBADD)
5 
 			found_cyrus=yes
6 
 		fi
7 
-		if test -r $i/include/sasl.h && test "$found_sasl" = "no"; then
8 
+		if test -r $i/include/sasl/sasl.h && test "$found_sasl" = "no"; then
9 
 			PHP_ADD_INCLUDE($i/include)
10 
 			PHP_SUBST(SASL_SHARED_LIBADD)
11 
 			PHP_ADD_LIBRARY_WITH_PATH(sasl, $i/lib, SASL_SHARED_LIBADD)
(-)mod_php4/files/patch-ext_cyrus_cyrus.c (+23 lines)
Line 0 Link Here
1 
--- ext/cyrus/cyrus.c~	Fri Oct 12 01:51:14 2001
2 
+++ ext/cyrus/cyrus.c	Mon Feb 11 17:27:13 2002
3 
@@ -86,8 +86,8 @@
4 
 	                                             le_cyrus_name, module_number);
5
6 
 	REGISTER_LONG_CONSTANT("CYRUS_CONN_NOSYNCLITERAL",
7 
-	                       IMCLIENT_CONN_NOSYNCLITERAL,
8 
-	                       CONST_CS_ | CONST_PERSISTENT);
9 
+	                       IMCLIENT_CONN_NONSYNCLITERAL,
10 
+	                       CONST_CS | CONST_PERSISTENT);
11 
 	REGISTER_LONG_CONSTANT("CYRUS_CONN_INITIALRESPONSE",
12 
 	                       IMCLIENT_CONN_INITIALRESPONSE,
13 
 	                       CONST_CS | CONST_PERSISTENT);
14 
@@ -464,8 +464,7 @@
15 
 	ZEND_FETCH_RESOURCE(conn, php_cyrus *, z_conn, -1, le_cyrus_name, le_cyrus);
16 
 	convert_to_string_ex(query);
17
18 
-	if (imclient_send(conn->client, NULL, NULL, Z_STRVAL_PP(query)) != 0)
19 
-		RETURN_FALSE;
20 
+	imclient_send(conn->client, NULL, NULL, Z_STRVAL_PP(query))
21
22 
 	RETURN_TRUE;
23 
 }
(-)mod_php4/scripts/configure.php (+6 lines)
Lines 37-42 Link Here
37 
XML		"XML support" OFF \
 37 
XML		"XML support" OFF \
38 
XSLT		"Sablotron support (implies XML and iconv)" OFF \
 38 
XSLT		"Sablotron support (implies XML and iconv)" OFF \
39 
DOMXML		"DOM support" OFF \
 39 
DOMXML		"DOM support" OFF \
40 
CYRUS		"Cyrus admin support" OFF \
40 
FTP		"File Transfer Protocol support" OFF \
 41 
FTP		"File Transfer Protocol support" OFF \
41 
CURL		"CURL support" OFF \
 42 
CURL		"CURL support" OFF \
42 
gettext		"gettext library support" OFF \
 43 
gettext		"gettext library support" OFF \
Lines 228-233 Link Here
228 
		\"DOMXML\")
 229 
		\"DOMXML\")
229 
			echo "LIB_DEPENDS+=	xml2.5:\${PORTSDIR}/textproc/libxml2"
 230 
			echo "LIB_DEPENDS+=	xml2.5:\${PORTSDIR}/textproc/libxml2"
230 
			echo "CONFIGURE_ARGS+=--with-dom=\${LOCALBASE}"
 231 
			echo "CONFIGURE_ARGS+=--with-dom=\${LOCALBASE}"
232 
			;;
233 
		\"CYRUS\")
234 
			echo "BUILD_DEPENDS+=	\${LOCALBASE}/include/cyrus/imclient.h:\${PORTSDIR}/mail/cyrus-imapd"
235 
			echo "CFLAGS+=	-I/usr/local/include/sasl"
236 
			echo "CONFIGURE_ARGS+=--with-cyrus"
231 
			;;
 237 
			;;
232 
		\"FTP\")
 238 
		\"FTP\")
233 
			echo "CONFIGURE_ARGS+=--enable-ftp"
 239 
			echo "CONFIGURE_ARGS+=--enable-ftp"

Return to bug 34841