SOURCES: php4-namespace.patch (NEW) - save work

glen glen at pld-linux.org
Wed Jan 4 15:56:32 CET 2006


Author: glen                         Date: Wed Jan  4 14:56:32 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- save work

---- Files affected:
SOURCES:
   php4-namespace.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/php4-namespace.patch
diff -u /dev/null SOURCES/php4-namespace.patch:1.1
--- /dev/null	Wed Jan  4 15:56:32 2006
+++ SOURCES/php4-namespace.patch	Wed Jan  4 15:56:27 2006
@@ -0,0 +1,96 @@
+--- ./Zend/zend.h~	2005-01-25 15:08:41.000000000 +0200
++++ ./Zend/zend.h	2005-07-25 01:35:29.000000000 +0300
+@@ -33,6 +33,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include "php4_namespace.h"
+ 
+ /*
+  * general definitions
+#--- ./TSRM/tsrm_config.h~	2005-07-25 01:43:34.000000000 +0300
+#+++ ./TSRM/tsrm_config.h	2005-07-25 02:01:27.000000000 +0300
+#@@ -1 +1,2 @@
+#+#include "php4_namespace.h"
+# #include <../main/php_config.h>
+--- ../TSRM/TSRM.h~	2005-02-11 05:34:04.000000000 +0200
++++ ../TSRM/TSRM.h	2005-07-25 02:07:04.000000000 +0300
+@@ -13,6 +13,8 @@
+ #ifndef TSRM_H
+ #define TSRM_H
+ 
++#include "php4_namespace.h"
++
+ /* #ifndef WIN32 */
+ #if !defined(WIN32) && !defined(NETWARE)
+ # include <tsrm_config.h>
+--- ../regex/utils.h~	1999-11-13 18:51:32.000000000 +0200
++++ ../regex/utils.h	2005-07-25 02:32:05.000000000 +0300
+@@ -1,6 +1,7 @@
+ /* utility definitions */
+ 
+ #include "regex_extra.h"
++#include "php4_namespace.h"
+ 
+ #ifdef _POSIX2_RE_DUP_MAX
+ #define	DUPMAX	_POSIX2_RE_DUP_MAX
+--- ../main/strlcpy.c~	2001-09-09 15:29:28.000000000 +0200
++++ ../main/strlcpy.c	2005-07-25 02:45:42.000000000 +0300
+@@ -37,6 +37,7 @@
+ 
+ #include <sys/types.h>
+ #include <string.h>
++#include "php4_namespace.h"
+ 
+ /*
+  * Copy src to string dst of size siz.  At most siz-1 characters
+#--- ./TSRM/tsrm_virtual_cwd.c~	2005-02-11 05:34:04.000000000 +0200
+#+++ ./TSRM/tsrm_virtual_cwd.c	2005-07-25 02:48:10.000000000 +0300
+#@@ -28,6 +28,7 @@
+# #include <stdlib.h>
+# #include <fcntl.h>
+# 
+#+#include "php4_namespace.h"
+# #include "tsrm_virtual_cwd.h"
+# #include "tsrm_strtok_r.h"
+# 
+#--- ../TSRM/tsrm_strtok_r.c~	2000-09-11 17:15:29.000000000 +0200
+#+++ ../TSRM/tsrm_strtok_r.c	2005-07-25 02:56:34.000000000 +0300
+#@@ -2,6 +2,7 @@
+# 
+# #include "tsrm_config_common.h"
+# #include "tsrm_strtok_r.h"
+#+#include "php4_namespace.h"
+# 
+# static inline int in_character_class(char ch, const char *delim)
+# {
+--- ../TSRM/tsrm_config_common.h~	2005-02-11 05:34:04.000000000 +0200
++++ ../TSRM/tsrm_config_common.h	2005-07-25 02:57:45.000000000 +0300
+@@ -1,6 +1,8 @@
+ #ifndef TSRM_CONFIG_COMMON_H
+ #define TSRM_CONFIG_COMMON_H
+ 
++#include "php4_namespace.h"
++
+ #if WINNT|WIN32
+ # define TSRM_WIN32
+ #endif
+--- ./sapi/cgi/libfcgi/include/fcgi_config.h~	2005-01-09 23:05:32.000000000 +0200
++++ ./sapi/cgi/libfcgi/include/fcgi_config.h	2005-07-25 03:15:15.000000000 +0300
+@@ -5,3 +5,4 @@
+ #include <php_config.h>
+ #endif
+ 
++#include "php4_namespace.h"
+--- ./sapi/apache/mod_php4.c~	2005-07-25 11:46:58.000000000 +0300
++++ ./sapi/apache/mod_php4.c	2005-07-25 11:57:45.000000000 +0300
+@@ -910,7 +910,9 @@
+ handler_rec php_handlers[] =
+ {
+ 	{"application/x-httpd-php", send_parsed_php},
++	{"application/x-httpd-php4", send_parsed_php},
+ 	{"application/x-httpd-php-source", send_parsed_php_source},
++	{"application/x-httpd-php4-source", send_parsed_php_source},
+ 	{"text/html", php_xbithack_handler},
+ 	{NULL}
+ };
================================================================


More information about the pld-cvs-commit mailing list