-diff -Naur php-4.1.2.orig/ext/ext_skel php-4.1.2/ext/ext_skel
---- php-4.1.2.orig/ext/ext_skel Fri May 31 11:10:30 2002
-+++ php-4.1.2/ext/ext_skel Fri May 31 11:52:10 2002
-@@ -65,8 +65,8 @@
- givup "Directory $extname already exists."
- fi
-
--test -f ext_skel || givup "ext_skel must be in the current directory"
--test -d skeleton || givup "subdirectory skeleton does not exist or is not directory"
-+#test -f ext_skel || givup "ext_skel must be in the current directory"
-+test -d /usr/include/php/ext/skeleton || givup "/usr/include/php/ext/skeleton does not exist or is not directory"
-
- if echo '\c' | grep -s c >/dev/null 2>&1
- then
-@@ -84,7 +84,7 @@
- fi
-
- if test -n "$proto"; then
-- cat $proto | awk -v extname=$extname -v stubs=$stubs -v stubfile=$stubfile -v xml=$xml -v full_xml=$full_xml -v i_know_what_to_do_shut_up_i_dont_need_your_help_mode=$no_help -f ./skeleton/create_stubs
-+ cat $proto | awk -v extname=$extname -v stubs=$stubs -v stubfile=$stubfile -v xml=$xml -v full_xml=$full_xml -v i_know_what_to_do_shut_up_i_dont_need_your_help_mode=$no_help -f /usr/include/php/ext/skeleton/create_stubs
- fi
-
- if test -z "$stubs"; then
-@@ -198,7 +198,7 @@
- echo '/^[[:space:]]*\/\*/,/^[[:space:]]*\*\//D' >> sedscript
- fi
-
--sed -f sedscript <../skeleton/skeleton.c > $extname.c
-+sed -f sedscript </usr/include/php/ext/skeleton/skeleton.c > $extname.c
-
-
- $ECHO_N " php_$extname.h$ECHO_C"
-@@ -216,26 +216,26 @@
- echo 's/^\/\*.*\*\/$//' >> sedscript
- echo '/^[[:space:]]*\/\*/,/^[[:space:]]*\*\//D' >> sedscript
- fi
--sed -f sedscript <../skeleton/php_skeleton.h > php_$extname.h
-+sed -f sedscript </usr/include/php/ext/skeleton/php_skeleton.h > php_$extname.h
-
- $ECHO_N " CREDITS$ECHO_C"
- echo "s/extname/$extname/g" > sedscript
--sed -f sedscript <../skeleton/CREDITS > CREDITS
-+sed -f sedscript </usr/include/php/ext/skeleton/CREDITS > CREDITS
-
- $ECHO_N " EXPERIMENTAL$ECHO_C"
- echo "s/extname/$extname/g" > sedscript
--sed -f sedscript <../skeleton/EXPERIMENTAL > EXPERIMENTAL
-+sed -f sedscript </usr/include/php/ext/skeleton/EXPERIMENTAL > EXPERIMENTAL
-
- $ECHO_N " tests/001.phpt$ECHO_C"
- mkdir tests || givup "Cannot create tests directory"
- chmod 755 tests
--sed -f sedscript <../skeleton/tests/001.phpt > tests/001.phpt
-+sed -f sedscript </usr/include/php/ext/skeleton/tests/001.phpt > tests/001.phpt
-
- if test -z "$stubs" && test -z "$no_help"; then
- $ECHO_N " $extname.php$ECHO_C"
- sed \
- -e "s/extname/$extname/g" \
-- <../skeleton/skeleton.php \
-+ </usr/include/php/ext/skeleton/skeleton.php \
- > $extname.php
- fi
-
diff -Naur php-4.1.2.orig/ext/skeleton/create_stubs php-4.1.2/ext/skeleton/create_stubs
--- php-4.1.2.orig/ext/skeleton/create_stubs Fri May 31 11:50:08 2002
+++ php-4.1.2/ext/skeleton/create_stubs Fri May 31 11:52:00 2002
-diff -Nur php-4.2.0.orig/ext/cpdf/Makefile.in php-4.2.0/ext/cpdf/Makefile.in
---- php-4.2.0.orig/ext/cpdf/Makefile.in Tue May 2 00:35:17 2000
-+++ php-4.2.0/ext/cpdf/Makefile.in Wed May 1 19:01:09 2002
-@@ -1,5 +1,7 @@
-
- LTLIBRARY_NAME = libcpdf.la
- LTLIBRARY_SOURCES = cpdf.c
-+LTLIBRARY_SHARED_NAME = cpdf.la
-+LTLIBRARY_SHARED_LIBADD = $(CPDF_SHARED_LIBADD)
-
- include $(top_srcdir)/build/dynlib.mk
-diff -Nur php-4.2.0.orig/ext/cpdf/config.m4 php-4.2.0/ext/cpdf/config.m4
---- php-4.2.0.orig/ext/cpdf/config.m4 Fri Nov 30 19:59:27 2001
-+++ php-4.2.0/ext/cpdf/config.m4 Wed May 1 19:15:34 2002
-@@ -1,70 +1,100 @@
+--- php-4.3.0/ext/cpdf/config.m4.orig Wed Mar 13 10:18:53 2002
++++ php-4.3.0/ext/cpdf/config.m4 Thu Jan 2 13:12:16 2003
+@@ -1,70 +1,97 @@
dnl $Id$
-AC_MSG_CHECKING(for cpdflib support)
+
+if test "$PHP_CPDFLIB" != "no"; then
+
-+ PHP_EXTENSION(cpdf, $ext_shared)
-+ PHP_SUBST(CPDF_SHARED_LIBADD)
++ PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared)
++ PHP_SUBST(CPDF_SHARED_LIBADD)
+
+ dnl # libjpeg
+
+ case $PHP_CPDFLIB in
yes)
- AC_MSG_RESULT(yes)
-- PHP_EXTENSION(cpdf)
-- AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
-- [AC_MSG_ERROR([Cpdf module requires cpdflib >= 2.])])
+- PHP_NEW_EXTENSION(cpdf, cpdf.c)
+ AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
+ [AC_MSG_ERROR([Cpdf module requires cpdflib >= 2.])])
++ PHP_ADD_LIBRARY(cpdf,, CPDF_SHARED_LIBADD)
- PHP_ADD_LIBRARY(cpdf)
- PHP_ADD_LIBRARY(tiff)
- PHP_ADD_LIBRARY(jpeg)
-- ;;
-+ AC_CHECK_LIB(cpdf, cpdf_open, [
-+ AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])
-+ PHP_ADD_LIBRARY(cpdf,, CPDF_SHARED_LIBADD)
-+ ],[AC_MSG_ERROR([Cpdf module requires cpdflib >= 2.])])
-+ ;;
+ ;;
*)
- test -f $withval/include/cpdflib.h && CPDFLIB_INCLUDE=$withval/include
- if test -n "$CPDFLIB_INCLUDE" ; then
- AC_MSG_RESULT(yes)
-- PHP_EXTENSION(cpdf)
+- PHP_NEW_EXTENSION(cpdf, cpdf.c)
- old_LIBS=$LIBS
- old_withval=$withval
-
- LIBS="$LIBS -L$withval/lib"
- AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_RESULT(no)],)
- PHP_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib)
-+ if test -f "$PHP_CPDFLIB/include/cpdflib.h" ; then
-+
-+ PHP_CHECK_LIBRARY(cpdf, cpdf_open,
-+ [
-+ AC_DEFINE(HAVE_PDFLIB,1,[ ])
-+ PHP_ADD_LIBRARY_WITH_PATH(cpdf, $PHP_CPDFLIB/lib, CPDF_SHARED_LIBADD)
-+ PHP_ADD_INCLUDE($PHP_CPDFLIB/include)
- ],[
+- ],[
- AC_MSG_RESULT(no)
- AC_MSG_WARN(If configure fails try --with-jpeg-dir=<DIR>)
- ])
- LIBS="$LIBS -L$withval/lib"
- AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_RESULT(no)],)
- PHP_ADD_LIBRARY_WITH_PATH(tiff, $withval/lib)
-+ AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
- ],[
+- ],[
- AC_MSG_RESULT(no)
- AC_MSG_WARN(If configure fails try --with-tiff-dir=<DIR>)
- ])
- LIBS=$old_LIBS
- PHP_ADD_LIBRARY_WITH_PATH(cpdf, $withval/lib)
- PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
-+ -L$PHP_PDFLIB/lib
-+ ])
++ if test -f "$PHP_CPDFLIB/include/cpdflib.h"; then
++ PHP_CHECK_LIBRARY(cpdf, cpdf_open,[
++ AC_DEFINE(HAVE_PDFLIB,1,[ ])
++ PHP_ADD_LIBRARY_WITH_PATH(cpdf, $PHP_CPDFLIB/lib, CPDF_SHARED_LIBADD)
++ PHP_ADD_INCLUDE($PHP_CPDFLIB/include)
++ ],[
++ AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
++ ],[
++ -L$PHP_PDFLIB/lib
++ ])
else
- AC_MSG_RESULT(no)
- fi ;;
+ AC_MSG_ERROR([cpdflib.h not found! Check the path passed to --with-cpdflib=<PATH>. PATH should be the install prefix directory.])
+ fi
-+ ;;
++ ;;
esac
-],[
- AC_MSG_RESULT(no)
AC_ARG_WITH(dbm,
[ --with-dbm[=DIR] Include DBM support],[
if test "$withval" != "no"; then
---- php-4.2.3/ext/dba/dba_db3.c.orig Thu Apr 18 14:31:19 2002
-+++ php-4.2.3/ext/dba/dba_db3.c Tue Dec 24 14:52:20 2002
-@@ -74,7 +74,11 @@
- }
-
- if (db_create(&dbp, NULL, 0) == 0 &&
-+#if (DB_VERSION_MAJOR > 4) || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
-+ dbp->open(dbp, NULL, info->path, NULL, type, gmode, filemode) == 0) {
-+#else
- dbp->open(dbp, info->path, NULL, type, gmode, filemode) == 0) {
-+#endif
- dba_db3_data *data;
-
- data = malloc(sizeof(*data));
-diff -Nur php-4.2.0/ext/hyperwave.orig/Makefile.in php-4.2.0/ext/hyperwave/Makefile.in
---- php-4.2.0/ext/hyperwave.orig/Makefile.in Tue May 2 00:38:28 2000
-+++ php-4.2.0/ext/hyperwave/Makefile.in Wed May 1 22:50:03 2002
-@@ -1,5 +1,6 @@
-
- LTLIBRARY_NAME = libhyperwave.la
- LTLIBRARY_SOURCES = hw.c hg_comm.c
-+LTLIBRARY_SHARED_NAME = hyperwave.la
-
- include $(top_srcdir)/build/dynlib.mk
-diff -Nur php-4.2.0/ext/hyperwave.orig/config.m4 php-4.2.0/ext/hyperwave/config.m4
---- php-4.2.0/ext/hyperwave.orig/config.m4 Fri Nov 30 19:59:37 2001
-+++ php-4.2.0/ext/hyperwave/config.m4 Wed May 1 22:50:44 2002
+--- php-4.3.0/ext/hyperwave/config.m4.orig Tue Mar 12 17:47:14 2002
++++ php-4.3.0/ext/hyperwave/config.m4 Thu Jan 2 13:18:32 2003
@@ -9,7 +9,7 @@
if test "$withval" != "no"; then
AC_DEFINE(HYPERWAVE,1,[ ])
AC_MSG_RESULT(yes)
-- PHP_EXTENSION(hyperwave)
-+ PHP_EXTENSION(hyperwave, $ext_shared)
+- PHP_NEW_EXTENSION(hyperwave, hw.c hg_comm.c)
++ PHP_NEW_EXTENSION(hyperwave, hw.c hg_comm.c, $ext_shared)
else
AC_DEFINE(HYPERWAVE,0,[ ])
AC_MSG_RESULT(no)
-diff -durN php-4.2.2.orig/php.ini php-4.2.2/php.ini
---- php-4.2.2.orig/php.ini Wed Aug 7 18:24:45 2002
-+++ php-4.2.2/php.ini Wed Aug 7 18:30:27 2002
+diff -durN php-4.3.0.orig/php.ini php-4.3.0/php.ini
+--- php-4.3.0.orig/php.ini Wed Aug 7 18:24:45 2002
++++ php-4.3.0/php.ini Wed Aug 7 18:30:27 2002
@@ -74,7 +74,7 @@
asp_tags = Off
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
@@ -692,7 +692,7 @@
- ; Argument passed to save_handler. In the case of files, this is the path
- ; where data files are stored. Note: Windows users have to change this
- ; variable in order to use PHP's session functions.
+ ; You can use the script in the ext/session dir for that purpose.
+ ; NOTE 2: See the section on garbage collection below if you choose to
+ ; use subdirectories for session storage
-session.save_path = /tmp
+session.save_path = /var/run/php
---- php-4.1.1/ext/pgsql/php_pgsql.h~ Mon Feb 25 15:16:28 2002
-+++ php-4.1.1/ext/pgsql/php_pgsql.h Mon Feb 25 15:16:28 2002
-@@ -35,7 +35,7 @@
- #define INV_WRITE 0x00020000
- #define INV_READ 0x00040000
+--- php-4.3.0/ext/pgsql/php_pgsql.h~ Mon Feb 25 15:16:28 2002
++++ php-4.3.0/ext/pgsql/php_pgsql.h Mon Feb 25 15:16:28 2002
+@@ -43,7 +43,7 @@
+ #define PHPAPI __declspec(dllimport)
+ #endif
#else
-#include <libpq/libpq-fs.h>
+#include <postgresql/server/libpq/libpq-fs.h>
#endif
-
- #ifdef PHP_WIN32
+
+ #ifdef HAVE_PG_CONFIG_H
-diff -urN php-4.2.3.org/ext/standard/mail.c php-4.2.3/ext/standard/mail.c
---- php-4.2.3.org/ext/standard/mail.c Tue Oct 29 21:35:04 2002
-+++ php-4.2.3/ext/standard/mail.c Tue Oct 29 21:33:03 2002
+--- php-4.3.0/ext/standard/mail.c.orig Fri Nov 29 12:15:43 2002
++++ php-4.3.0/ext/standard/mail.c Thu Jan 2 12:37:54 2003
@@ -21,6 +21,8 @@
#include <stdlib.h>
#include <ctype.h>
+#include <string.h>
#include "php.h"
#include "ext/standard/info.h"
- #if !defined(PHP_WIN32)
-@@ -37,6 +39,10 @@
+
+@@ -36,6 +38,9 @@
#include "safe_mode.h"
#include "exec.h"
+#include "zend_operators.h"
-+
+#include "zend_globals.h"
+
#if HAVE_SENDMAIL
#ifdef PHP_WIN32
#include "win32/sendmail.h"
-@@ -166,8 +172,42 @@
- efree (sendmail_cmd);
-
- if (sendmail) {
+@@ -196,8 +201,42 @@
+ return 0;
+ }
+ #endif
- fprintf(sendmail, "To: %s\n", to);
- fprintf(sendmail, "Subject: %s\n", subject);
+ TSRMLS_FETCH();
-diff -urN php-4.2.1RC2.org/ext/standard/info.c php-4.2.1RC2/ext/standard/info.c
---- php-4.2.1RC2.org/ext/standard/info.c Sat May 11 20:49:24 2002
-+++ php-4.2.1RC2/ext/standard/info.c Sat May 11 20:49:40 2002
-@@ -229,7 +229,20 @@
- php_printf("This program makes use of the Zend Scripting Language Engine:<br />");
- php_html_puts(zend_version, strlen(zend_version) TSRMLS_CC);
+--- php-4.3.0/ext/standard/info.c.orig Thu Nov 14 22:17:00 2002
++++ php-4.3.0/ext/standard/info.c Thu Jan 2 12:19:36 2003
+@@ -478,6 +478,21 @@
+ PUTS(PG(html_errors)?"<br />":"\n");
+ PUTS(zend_version);
php_info_print_box_end();
-- efree(php_uname);
-+ /* PLD Linux */
-+ php_info_print_box_start(0);
-+ if (expose_php) {
-+ PUTS("<a href=\"http://www.pld.org.pl/\"><img src=\"");
-+ if (SG(request_info).request_uri) {
-+ PUTS(SG(request_info).request_uri);
-+ }
-+ PUTS("?="PLD_LOGO_GUID"\" border=\"0\" align=\"right\" alt=\"PLD logo\"></a>\n");
-+ }
-+ php_printf("This server is using PLD Linux. <BR>");
-+ php_printf("More information at <a href=\"http://www.pld.org.pl/\">http://www.pld.org.pl/</a>.");
-+ php_printf("</BR>\n");
-+ php_info_print_box_end();
-+ efree(php_uname);
++ /* PLD Linux */
++ php_info_print_box_start(0);
++ if (expose_php && PG(html_errors)) {
++ PUTS("<a href=\"http://www.pld.org.pl/\"><img src=\"");
++ if (SG(request_info).request_uri) {
++ PUTS(SG(request_info).request_uri);
++ }
++ PUTS("?="PLD_LOGO_GUID"\" border=\"0\" align=\"right\" alt=\"PLD logo\"></a>\n");
++ }
++ PUTS("This server is using PLD Linux.");
++ if (PG(html_errors))
++ PUTS("<br />More information at <a href=\"http://www.pld.org.pl/\">http://www.pld.org.pl/</a>.<br />\n");
++ else
++ PUTS("\nMore information at http://www.pld.org.pl/.\n");
++ php_info_print_box_end();
+ efree(php_uname);
}
- if ((flag & PHP_INFO_CREDITS) && expose_php) {
diff -urN php-4.2.1RC2.org/ext/standard/info.h php-4.2.1RC2/ext/standard/info.h
--- php-4.2.1RC2.org/ext/standard/info.h Sat May 11 20:49:24 2002
+++ php-4.2.1RC2/ext/standard/info.h Sat May 11 20:49:40 2002
PHP_FUNCTION(phpversion);
PHP_FUNCTION(phpinfo);
-diff -urN php-4.2.1RC2.org/main/logos.h php-4.2.1RC2/main/logos.h
---- php-4.2.1RC2.org/main/logos.h Sat May 11 20:49:24 2002
-+++ php-4.2.1RC2/main/logos.h Sat May 11 20:50:32 2002
-@@ -1057,3 +1057,127 @@
- 4, 0, 59, 0 };
-
-
+--- php-4.3.0.org/main/logos.h Sat May 11 20:49:24 2002
++++ php-4.3.0/main/logos.h Sat May 11 20:50:32 2002
+@@ -1503,1 +1503,127 @@
+ 249, 249, 207, 233, 5, 4, 0, 59 };
++
++
+unsigned char pld_logo[] = {
+ 137, 80, 78, 71, 13, 10, 26, 10, 0, 0,
+ 0, 13, 73, 72, 68, 82, 0, 0, 0, 80,
projects / packages / php.git / commitdiff