gunnar: server/patches/php/php-5.2.6 KOLAB_php-5.2.6_Annotations.patch, 1.1, 1.2 KOLAB_php-5.2.6_myrights.patch, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Mon Jun 9 10:40:38 CEST 2008
Author: gunnar
Update of /kolabrepository/server/patches/php/php-5.2.6
In directory doto:/tmp/cvs-serv8976
Modified Files:
KOLAB_php-5.2.6_Annotations.patch
KOLAB_php-5.2.6_myrights.patch
Log Message:
Patch updates for PHP from Thomas Jarosch.
Index: KOLAB_php-5.2.6_Annotations.patch
===================================================================
RCS file: /kolabrepository/server/patches/php/php-5.2.6/KOLAB_php-5.2.6_Annotations.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- KOLAB_php-5.2.6_Annotations.patch 2 May 2008 09:24:24 -0000 1.1
+++ KOLAB_php-5.2.6_Annotations.patch 9 Jun 2008 08:40:36 -0000 1.2
@@ -2,8 +2,8 @@
diff -r 4f78d3c907b7 ext/imap/php_imap.c
--- a/ext/imap/php_imap.c Fri May 02 11:21:11 2008 +0200
-+++ b/ext/imap/php_imap.c Fri May 02 11:22:09 2008 +0200
-@@ -129,6 +129,7 @@ zend_function_entry imap_functions[] = {
++++ b/ext/imap/php_imap.c Mon Jun 09 10:35:56 2008 +0200
+@@ -129,6 +129,7 @@
PHP_FE(imap_binary, NULL)
PHP_FE(imap_utf8, NULL)
PHP_FE(imap_status, NULL)
@@ -11,7 +11,7 @@
PHP_FE(imap_mailboxmsginfo, NULL)
PHP_FE(imap_setflag_full, NULL)
PHP_FE(imap_clearflag_full, NULL)
-@@ -155,6 +156,10 @@ zend_function_entry imap_functions[] = {
+@@ -155,6 +156,10 @@
PHP_FE(imap_setacl, NULL)
PHP_FE(imap_getacl, NULL)
#endif
@@ -22,11 +22,10 @@
PHP_FE(imap_mail, NULL)
-@@ -415,6 +420,30 @@ void mail_getacl(MAILSTREAM *stream, cha
-
+@@ -416,6 +421,30 @@
#endif
-+
+
+#if defined(HAVE_IMAP2005)
+/* {{{ mail_getannotation
+ *
@@ -50,10 +49,19 @@
+}
+/* }}} */
+#endif
-
++
/* {{{ PHP_GINIT_FUNCTION
*/
-@@ -1097,6 +1126,122 @@ PHP_FUNCTION(imap_getacl)
+ static PHP_GINIT_FUNCTION(imap)
+@@ -441,6 +470,7 @@
+ #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+ imap_globals->quota_return = NIL;
+ imap_globals->imap_acl_list = NIL;
++ imap_globals->imap_annotation_list = NIL;
+ #endif
+ imap_globals->gets_stream = NIL;
+ }
+@@ -1097,6 +1127,117 @@
#endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */
@@ -142,18 +150,13 @@
+ cur->next = NIL;
+
+ STRINGLIST *attributes = mail_newstringlist();
++ if (!attributes)
++ RETURN_FALSE;
+ cur = attributes;
+ cur->text.data = (unsigned char *)cpystr (Z_STRVAL_PP(attr));
+ cur->text.size = Z_STRLEN_PP(attr);
+ cur->next = NIL;
+
-+ /* initializing the special array for the return values */
-+ if (array_init(return_value) == FAILURE) {
-+ mail_free_stringlist(&entries);
-+ mail_free_stringlist(&attributes);
-+ RETURN_FALSE;
-+ }
-+
+ IMAPG(imap_annotation_list) = return_value;
+
+ /* set the callback for the GET_ANNOTATION function */
@@ -176,7 +179,7 @@
/* {{{ proto bool imap_expunge(resource stream_id)
Permanently delete all messages marked for deletion */
-@@ -2707,6 +2852,42 @@ PHP_FUNCTION(imap_msgno)
+@@ -2707,6 +2848,42 @@
}
/* }}} */
@@ -221,8 +224,8 @@
PHP_FUNCTION(imap_status)
diff -r 4f78d3c907b7 ext/imap/php_imap.h
--- a/ext/imap/php_imap.h Fri May 02 11:21:11 2008 +0200
-+++ b/ext/imap/php_imap.h Fri May 02 11:22:09 2008 +0200
-@@ -152,6 +152,7 @@ PHP_FUNCTION(imap_lsub_full);
++++ b/ext/imap/php_imap.h Mon Jun 09 10:35:56 2008 +0200
+@@ -152,6 +152,7 @@
PHP_FUNCTION(imap_lsub_full);
PHP_FUNCTION(imap_create);
PHP_FUNCTION(imap_rename);
@@ -230,7 +233,7 @@
PHP_FUNCTION(imap_status);
PHP_FUNCTION(imap_bodystruct);
PHP_FUNCTION(imap_fetch_overview);
-@@ -168,6 +169,9 @@ PHP_FUNCTION(imap_thread);
+@@ -168,6 +169,9 @@
PHP_FUNCTION(imap_thread);
PHP_FUNCTION(imap_timeout);
@@ -240,7 +243,7 @@
#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
PHP_FUNCTION(imap_get_quota);
PHP_FUNCTION(imap_get_quotaroot);
-@@ -175,7 +179,10 @@ PHP_FUNCTION(imap_setacl);
+@@ -175,7 +179,10 @@
PHP_FUNCTION(imap_setacl);
PHP_FUNCTION(imap_getacl);
#endif
@@ -252,7 +255,7 @@
ZEND_BEGIN_MODULE_GLOBALS(imap)
char *imap_user;
-@@ -206,6 +213,9 @@ ZEND_BEGIN_MODULE_GLOBALS(imap)
+@@ -206,6 +213,9 @@
zval **quota_return;
zval *imap_acl_list;
#endif
Index: KOLAB_php-5.2.6_myrights.patch
===================================================================
RCS file: /kolabrepository/server/patches/php/php-5.2.6/KOLAB_php-5.2.6_myrights.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- KOLAB_php-5.2.6_myrights.patch 13 May 2008 13:44:51 -0000 1.1
+++ KOLAB_php-5.2.6_myrights.patch 9 Jun 2008 08:40:36 -0000 1.2
@@ -1,7 +1,7 @@
-diff -r 63c608b3e283 ext/imap/php_imap.c
---- a/ext/imap/php_imap.c Fri May 02 11:22:09 2008 +0200
-+++ b/ext/imap/php_imap.c Tue May 13 15:36:56 2008 +0200
-@@ -155,6 +155,7 @@ zend_function_entry imap_functions[] = {
+diff -r daa11c358bd5 ext/imap/php_imap.c
+--- a/ext/imap/php_imap.c Mon Jun 09 10:36:42 2008 +0200
++++ b/ext/imap/php_imap.c Mon Jun 09 10:37:25 2008 +0200
+@@ -155,6 +155,7 @@
PHP_FE(imap_set_quota, NULL)
PHP_FE(imap_setacl, NULL)
PHP_FE(imap_getacl, NULL)
@@ -9,7 +9,7 @@
#endif
#if defined(HAVE_IMAP2005)
PHP_FE(imap_setannotation, NULL)
-@@ -415,6 +416,20 @@ void mail_getacl(MAILSTREAM *stream, cha
+@@ -415,6 +416,20 @@
for(; alist; alist = alist->next) {
add_assoc_stringl(IMAPG(imap_acl_list), alist->identifier, alist->rights, strlen(alist->rights), 1);
}
@@ -30,12 +30,12 @@
}
/* }}} */
-@@ -1124,6 +1139,38 @@ PHP_FUNCTION(imap_getacl)
+@@ -1125,6 +1140,35 @@
}
/* }}} */
-+/* {{{ proto array imap_getacl(resource stream_id, string mailbox)
-+ Gets the ACL for a given mailbox */
++/* {{{ proto string imap_myrights(resource stream_id, string mailbox)
++ Gets my rights (ACL) for a given mailbox */
+PHP_FUNCTION(imap_myrights)
+{
+ zval **streamind, **mailbox;
@@ -49,9 +49,6 @@
+
+ convert_to_string_ex(mailbox);
+
-+ /* initializing the special array for the return values */
-+ array_init(return_value);
-+
+ IMAPG(imap_acl_list) = return_value;
+
+ /* set the callback for the GET_ACL function */
@@ -69,10 +66,10 @@
#endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */
#if defined(HAVE_IMAP2005)
-diff -r 63c608b3e283 ext/imap/php_imap.h
---- a/ext/imap/php_imap.h Fri May 02 11:22:09 2008 +0200
-+++ b/ext/imap/php_imap.h Tue May 13 15:36:56 2008 +0200
-@@ -178,6 +178,7 @@ PHP_FUNCTION(imap_set_quota);
+diff -r daa11c358bd5 ext/imap/php_imap.h
+--- a/ext/imap/php_imap.h Mon Jun 09 10:36:42 2008 +0200
++++ b/ext/imap/php_imap.h Mon Jun 09 10:37:25 2008 +0200
+@@ -178,6 +178,7 @@
PHP_FUNCTION(imap_set_quota);
PHP_FUNCTION(imap_setacl);
PHP_FUNCTION(imap_getacl);
More information about the commits
mailing list