- fpm: catch_workers_output=yes in default config

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

diff --git a/php-imap-annotations.patch b/php-imap-annotations.patch
index 623dbaf604c940d3ecc235b177a4257c98e58036..d94dcbd637f937778ac12bf116047ca5fdca52e5 100644 (file)
--- a/php-imap-annotations.patch
+++ b/php-imap-annotations.patch
@@ -1,30 +1,65 @@
 Provides get/set ANNOTATIONS support to PHP. [Version: 5.2.6]
 
-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      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)
-+      PHP_FE(imap_status_current,                                                     NULL)
-       PHP_FE(imap_mailboxmsginfo,                                             NULL)
-       PHP_FE(imap_setflag_full,                                               NULL)
-       PHP_FE(imap_clearflag_full,                                             NULL)
-@@ -155,6 +156,10 @@
-       PHP_FE(imap_setacl,                                                             NULL)
-       PHP_FE(imap_getacl,                                                             NULL)
+diff -r 76412c484360 ext/imap/php_imap.c
+--- a/ext/imap/php_imap.c      Wed Dec 23 22:18:41 2009 +0100
++++ b/ext/imap/php_imap.c      Wed Dec 23 22:46:34 2009 +0100
+@@ -161,6 +161,22 @@
+       ZEND_ARG_INFO(0, mailbox)
+ ZEND_END_ARG_INFO()
  #endif
 +#if defined(HAVE_IMAP2005)
-+      PHP_FE(imap_setannotation,                                                      NULL)
-+      PHP_FE(imap_getannotation,                                                      NULL)
++ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_setannotation, 0, 0, 5)
++      ZEND_ARG_INFO(0, stream_id)
++      ZEND_ARG_INFO(0, mailbox)
++      ZEND_ARG_INFO(0, entry)
++      ZEND_ARG_INFO(0, attr)
++      ZEND_ARG_INFO(0, value)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_getannotation, 0, 0, 4)
++      ZEND_ARG_INFO(0, stream_id)
++      ZEND_ARG_INFO(0, mailbox)
++      ZEND_ARG_INFO(0, entry)
++      ZEND_ARG_INFO(0, attr)
++ZEND_END_ARG_INFO()
 +#endif
  
-       PHP_FE(imap_mail,                                                               NULL)
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_expunge, 0, 0, 1)
+       ZEND_ARG_INFO(0, stream_id)
+@@ -402,6 +418,11 @@
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_status, 0, 0, 3)
+       ZEND_ARG_INFO(0, stream_id)
+       ZEND_ARG_INFO(0, mailbox)
++      ZEND_ARG_INFO(0, options)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_imap_status_current, 0, 0, 2)
++      ZEND_ARG_INFO(0, stream_id)
+       ZEND_ARG_INFO(0, options)
+ ZEND_END_ARG_INFO()
  
-@@ -416,6 +421,30 @@
+@@ -504,6 +525,7 @@
+       PHP_FE(imap_binary,                                                             arginfo_imap_binary)
+       PHP_FE(imap_utf8,                                                               arginfo_imap_utf8)
+       PHP_FE(imap_status,                                                             arginfo_imap_status)
++      PHP_FE(imap_status_current,                                             arginfo_imap_status_current)
+       PHP_FE(imap_mailboxmsginfo,                                             arginfo_imap_mailboxmsginfo)
+       PHP_FE(imap_setflag_full,                                               arginfo_imap_setflag_full)
+       PHP_FE(imap_clearflag_full,                                             arginfo_imap_clearflag_full)
+@@ -534,6 +556,10 @@
+       PHP_FE(imap_setacl,                                                             arginfo_imap_setacl)
+       PHP_FE(imap_getacl,                                                             arginfo_imap_getacl)
  #endif
++#if defined(HAVE_IMAP2005)
++      PHP_FE(imap_setannotation,                                              arginfo_imap_setannotation)
++      PHP_FE(imap_getannotation,                                              arginfo_imap_getannotation)
++#endif
  
+       PHP_FE(imap_mail,                                                               arginfo_imap_mail)
+ 
+@@ -795,6 +821,30 @@
+ /* }}} */
+ #endif
  
 +#if defined(HAVE_IMAP2005)
 +/* {{{ mail_getannotation
@@ -53,7 +88,7 @@ diff -r 4f78d3c907b7 ext/imap/php_imap.c
  /* {{{ PHP_GINIT_FUNCTION
   */
  static PHP_GINIT_FUNCTION(imap)
-@@ -441,6 +470,7 @@
+@@ -820,6 +870,7 @@
  #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
        imap_globals->quota_return = NIL;
        imap_globals->imap_acl_list = NIL;
@@ -61,10 +96,12 @@ diff -r 4f78d3c907b7 ext/imap/php_imap.c
  #endif
        imap_globals->gets_stream = NIL;
  }
-@@ -1097,6 +1127,117 @@
- 
+@@ -1475,7 +1526,119 @@
+ }
+ /* }}} */
  #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */
- 
+-
++ 
 +#if defined(HAVE_IMAP2005)
 +
 +/* {{{ proto bool imap_setannotation(resource stream_id, string mailbox, string entry, string attr, string value)
@@ -176,10 +213,11 @@ diff -r 4f78d3c907b7 ext/imap/php_imap.c
 +/* }}} */
 +
 +#endif /* HAVE_IMAP2005 */
- 
++ 
  /* {{{ proto bool imap_expunge(resource stream_id)
     Permanently delete all messages marked for deletion */
-@@ -2707,6 +2848,42 @@
+ PHP_FUNCTION(imap_expunge)
+@@ -3118,6 +3281,42 @@
  }
  /* }}} */
  
@@ -222,10 +260,10 @@ diff -r 4f78d3c907b7 ext/imap/php_imap.c
  /* {{{ proto object imap_status(resource stream_id, string mailbox, int options)
     Get status info from a mailbox */
  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      Mon Jun 09 10:35:56 2008 +0200
-@@ -152,6 +152,7 @@
+diff -r 76412c484360 ext/imap/php_imap.h
+--- a/ext/imap/php_imap.h      Wed Dec 23 22:18:41 2009 +0100
++++ b/ext/imap/php_imap.h      Wed Dec 23 22:46:34 2009 +0100
+@@ -153,6 +153,7 @@
  PHP_FUNCTION(imap_lsub_full);
  PHP_FUNCTION(imap_create);
  PHP_FUNCTION(imap_rename);
@@ -233,7 +271,7 @@ diff -r 4f78d3c907b7 ext/imap/php_imap.h
  PHP_FUNCTION(imap_status);
  PHP_FUNCTION(imap_bodystruct);
  PHP_FUNCTION(imap_fetch_overview);
-@@ -168,6 +169,9 @@
+@@ -173,6 +174,9 @@
  PHP_FUNCTION(imap_thread);
  PHP_FUNCTION(imap_timeout);
  
@@ -243,7 +281,7 @@ diff -r 4f78d3c907b7 ext/imap/php_imap.h
  #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
  PHP_FUNCTION(imap_get_quota);
  PHP_FUNCTION(imap_get_quotaroot);
-@@ -175,7 +179,10 @@
+@@ -180,7 +184,10 @@
  PHP_FUNCTION(imap_setacl);
  PHP_FUNCTION(imap_getacl);
  #endif
@@ -255,7 +293,7 @@ diff -r 4f78d3c907b7 ext/imap/php_imap.h
  
  ZEND_BEGIN_MODULE_GLOBALS(imap)
        char *imap_user;
-@@ -206,6 +213,9 @@
+@@ -211,6 +218,9 @@
        zval **quota_return;
        zval *imap_acl_list;
  #endif