- release 2 (by relup.sh)

[packages/php.git] / php-imap-myrights.patch

diff --git a/php-imap-myrights.patch b/php-imap-myrights.patch
index 2bb91b3325d5d8dd43574917c1d8ac95eb3c2af4..ddadbd3f25ce4b2c50c0c410e4ffb5e5cd8abba5 100644 (file)
--- a/php-imap-myrights.patch
+++ b/php-imap-myrights.patch
@@ -1,15 +1,27 @@
-diff -r 591dd6329e97 ext/imap/php_imap.c
---- a/ext/imap/php_imap.c      Mon Dec 22 06:35:22 2008 +0100
-+++ b/ext/imap/php_imap.c      Mon Dec 22 06:35:27 2008 +0100
-@@ -157,6 +157,7 @@
-       PHP_FE(imap_set_quota,                                                  NULL)
-       PHP_FE(imap_setacl,                                                             NULL)
-       PHP_FE(imap_getacl,                                                             NULL)
-+      PHP_FE(imap_myrights,                                                   NULL)
+diff -r 5daa8cce8706 ext/imap/php_imap.c
+--- a/ext/imap/php_imap.c      Wed Dec 23 22:46:34 2009 +0100
++++ b/ext/imap/php_imap.c      Wed Dec 23 22:49:02 2009 +0100
+@@ -157,6 +157,11 @@
+ ZEND_END_ARG_INFO()
+ 
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getacl, 0, 0, 2)
++      ZEND_ARG_INFO(0, stream_id)
++      ZEND_ARG_INFO(0, mailbox)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_myrights, 0, 0, 2)
+       ZEND_ARG_INFO(0, stream_id)
+       ZEND_ARG_INFO(0, mailbox)
+ ZEND_END_ARG_INFO()
+@@ -555,6 +560,7 @@
+       PHP_FE(imap_set_quota,                                                  arginfo_imap_set_quota)
+       PHP_FE(imap_setacl,                                                             arginfo_imap_setacl)
+       PHP_FE(imap_getacl,                                                             arginfo_imap_getacl)
++      PHP_FE(imap_myrights,                                                   arginfo_imap_myrights)
  #endif
  #if defined(HAVE_IMAP2005)
-       PHP_FE(imap_setannotation,                                                      NULL)
-@@ -417,6 +418,20 @@
+       PHP_FE(imap_setannotation,                                              arginfo_imap_setannotation)
+@@ -817,6 +823,20 @@
        for(; alist; alist = alist->next) {
                add_assoc_stringl(IMAPG(imap_acl_list), alist->identifier, alist->rights, strlen(alist->rights), 1);
        }
@@ -29,11 +41,12 @@ diff -r 591dd6329e97 ext/imap/php_imap.c
 +
  }
  /* }}} */
- 
-@@ -1130,6 +1145,35 @@
+ #endif
+@@ -1525,6 +1545,36 @@
+       IMAPG(imap_acl_list) = NIL;
  }
  /* }}} */
- 
++
 +/* {{{ proto string imap_myrights(resource stream_id, string mailbox)
 +      Gets my rights (ACL) for a given mailbox */
 +PHP_FUNCTION(imap_myrights)
@@ -64,12 +77,12 @@ diff -r 591dd6329e97 ext/imap/php_imap.c
 +/* }}} */
 +
  #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */
- 
+  
  #if defined(HAVE_IMAP2005)
-diff -r 591dd6329e97 ext/imap/php_imap.h
---- a/ext/imap/php_imap.h      Mon Dec 22 06:35:22 2008 +0100
-+++ b/ext/imap/php_imap.h      Mon Dec 22 06:35:27 2008 +0100
-@@ -178,6 +178,7 @@
+diff -r 5daa8cce8706 ext/imap/php_imap.h
+--- a/ext/imap/php_imap.h      Wed Dec 23 22:46:34 2009 +0100
++++ b/ext/imap/php_imap.h      Wed Dec 23 22:49:02 2009 +0100
+@@ -183,6 +183,7 @@
  PHP_FUNCTION(imap_set_quota);
  PHP_FUNCTION(imap_setacl);
  PHP_FUNCTION(imap_getacl);