- obsolete

Changed files:
    php-session-unregister.patch -> 1.3
    php-xmlrpc-fix.patch -> 1.3
    php_bug34435.patch -> 1.2

diff --git a/php-session-unregister.patch b/php-session-unregister.patch
deleted file mode 100644 (file)
index 5a7b5d0..0000000
--- a/php-session-unregister.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- php-4.3.0/ext/session/php_session.h.orig   Thu Oct  3 08:45:15 2002
-+++ php-4.3.0/ext/session/php_session.h        Tue Jan  7 12:45:39 2003
-@@ -181,6 +181,7 @@
- int php_get_session_var(char *name, size_t namelen, zval ***state_var TSRMLS_DC);
- 
- PHPAPI int php_session_register_module(ps_module *);
-+PHPAPI int php_session_unregister_module(const char *name);
- 
- PHPAPI int php_session_register_serializer(const char *name,
-               int (*encode)(PS_SERIALIZER_ENCODE_ARGS),
---- php-4.3.0/ext/session/session.c.orig       Thu Dec  5 21:42:05 2002
-+++ php-4.3.0/ext/session/session.c    Tue Jan  7 12:45:38 2003
-@@ -208,12 +208,33 @@
-                       ps_modules[i] = ptr;
-                       ret = 0;
-                       break;
--              }       
-+              } else if((ps_modules[i]->s_name != NULL) && (ptr->s_name != NULL) && 
-+                              !strcasecmp(ps_modules[i]->s_name, ptr->s_name)) {
-+                      /* avoid double registration */
-+                      ret = 0;
-+                      break;
-+              }
-       }
-       
-       return ret;
- }
- 
-+PHPAPI int php_session_unregister_module(const char *name)
-+{
-+      int ret = -1;
-+      int i;
-+
-+      for (i = 0; i < MAX_MODULES; i++) {
-+              if (ps_modules[i] && ps_modules[i]->s_name && !strcasecmp(ps_modules[i]->s_name, name)) {
-+                      ps_modules[i] = 0;
-+                      ret = 0;
-+                      break;
-+              }
-+      }
-+
-+      return ret;
-+}
-+
- PHP_MINIT_FUNCTION(session);
- PHP_RINIT_FUNCTION(session);
- PHP_MSHUTDOWN_FUNCTION(session);
---- php-4.3.0/ext/session/mod_mm.c.orig        Thu Dec  5 21:42:05 2002
-+++ php-4.3.0/ext/session/mod_mm.c     Tue Jan  7 12:46:21 2003
-@@ -291,6 +291,7 @@
- 
- PHP_MSHUTDOWN_FUNCTION(ps_mm)
- {
-+      php_session_unregister_module("mm");
-       if (ps_mm_instance) {
-               ps_mm_destroy(ps_mm_instance);
-               return SUCCESS;
---- php-4.3.0/ext/msession/msession.c.orig     Thu Aug 22 15:29:50 2002
-+++ php-4.3.0/ext/msession/msession.c  Tue Jan  7 12:46:50 2003
-@@ -188,6 +188,9 @@
- 
- PHP_MSHUTDOWN_FUNCTION(msession)
- {
-+#ifdef HAVE_PHP_SESSION
-+      php_session_unregister_module("msession");
-+#endif
-       return SUCCESS;
- }
- 

diff --git a/php-xmlrpc-fix.patch b/php-xmlrpc-fix.patch
deleted file mode 100644 (file)
index 52e699b..0000000
--- a/php-xmlrpc-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- php-4.3.0/ext/xmlrpc/config.m4.orig        Wed Sep  4 20:47:25 2002
-+++ php-4.3.0/ext/xmlrpc/config.m4     Thu Jan  2 21:29:53 2003
-@@ -85,6 +85,8 @@
-     AC_MSG_ERROR(Please reinstall the XMLRPC-EPI distribution)
-   fi
- 
-+  PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c,$ext_shared)
-+  XMLRPC_MODULE_TYPE=external
-   PHP_ADD_INCLUDE($XMLRPC_DIR)
-   PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD)
-   

diff --git a/php_bug34435.patch b/php_bug34435.patch
deleted file mode 100644 (file)
index 716a029..0000000
--- a/php_bug34435.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- ./ext/standard/incomplete_class.c.bug34435 2004-11-25 20:28:37.000000000 +0000
-+++ ./ext/standard/incomplete_class.c  2005-09-09 13:00:39.000000000 +0100
-@@ -122,7 +122,7 @@
- 
- /* {{{ php_lookup_class_name
-  */
--char *php_lookup_class_name(zval *object, size_t *nlen)
-+char *php_lookup_class_name(zval *object, zend_uint *nlen)
- {
-       zval **val;
-       char *retval = NULL;
-@@ -144,7 +144,7 @@
- 
- /* {{{ php_store_class_name
-  */
--void php_store_class_name(zval *object, const char *name, size_t len)
-+void php_store_class_name(zval *object, const char *name, zend_uint len)
- {
-       zval *val;
-       TSRMLS_FETCH();
---- ./ext/standard/php_incomplete_class.h.bug34435     2005-06-29 10:29:08.000000000 +0100
-+++ ./ext/standard/php_incomplete_class.h      2005-09-09 13:00:31.000000000 +0100
-@@ -42,7 +42,7 @@
- 
- #define PHP_CLASS_ATTRIBUTES                                                                                  \
-       char *class_name;                                                                                                       \
--      size_t name_len;                                                                                                        \
-+      zend_uint name_len;                                                                                                     \
-       zend_bool free_class_name = 0;                                                                          \
-       zend_bool incomplete_class = 0
- 
-@@ -55,8 +55,8 @@
-       
- zend_class_entry *php_create_incomplete_class(TSRMLS_D);
- 
--char *php_lookup_class_name(zval *object, size_t *nlen);
--void  php_store_class_name(zval *object, const char *name, size_t len);
-+char *php_lookup_class_name(zval *object, zend_uint *nlen);
-+void  php_store_class_name(zval *object, const char *name, zend_uint len);
- 
- #ifdef __cplusplus
- };